projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more fixes to selects
[fa-stable.git]
/
dimensions
/
dimension_entry.php
diff --git
a/dimensions/dimension_entry.php
b/dimensions/dimension_entry.php
index 6474ac1482aee51cbc82cc30d4c67b189d060a4d..8912c11cd2fc1a4b4af8d7e84928008e6925f3d3 100644
(file)
--- a/
dimensions/dimension_entry.php
+++ b/
dimensions/dimension_entry.php
@@
-5,8
+5,6
@@
$page_security = 10;
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
$path_to_root="..";
include_once($path_to_root . "/includes/session.inc");
-page(_("Dimension Entry"));
-
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/manufacturing.inc");
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/includes/date_functions.inc");
include_once($path_to_root . "/includes/manufacturing.inc");
include_once($path_to_root . "/includes/data_checks.inc");
@@
-14,6
+12,11
@@
include_once($path_to_root . "/includes/data_checks.inc");
include_once($path_to_root . "/dimensions/includes/dimensions_db.inc");
include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
include_once($path_to_root . "/dimensions/includes/dimensions_db.inc");
include_once($path_to_root . "/dimensions/includes/dimensions_ui.inc");
+$js = "";
+if ($use_date_picker)
+ $js .= get_js_date_picker();
+page(_("Dimension Entry"), false, false, "", $js);
+
//---------------------------------------------------------------------------------------
if (isset($_GET['trans_no']))
//---------------------------------------------------------------------------------------
if (isset($_GET['trans_no']))
@@
-95,12
+98,14
@@
function can_process()
if (!references::is_valid($_POST['ref']))
{
display_error( _("The dimension reference must be entered."));
if (!references::is_valid($_POST['ref']))
{
display_error( _("The dimension reference must be entered."));
+ set_focus('ref');
return false;
}
if (!is_new_reference($_POST['ref'], systypes::dimension()))
{
display_error(_("The entered reference is already in use."));
return false;
}
if (!is_new_reference($_POST['ref'], systypes::dimension()))
{
display_error(_("The entered reference is already in use."));
+ set_focus('ref');
return false;
}
}
return false;
}
}
@@
-108,18
+113,21
@@
function can_process()
if (strlen($_POST['name']) == 0)
{
display_error( _("The dimension name must be entered."));
if (strlen($_POST['name']) == 0)
{
display_error( _("The dimension name must be entered."));
+ set_focus('name');
return false;
}
if (!is_date($_POST['date_']))
{
display_error( _("The date entered is in an invalid format."));
return false;
}
if (!is_date($_POST['date_']))
{
display_error( _("The date entered is in an invalid format."));
+ set_focus('date_');
return false;
}
if (!is_date($_POST['due_date']))
{
display_error( _("The required by date entered is in an invalid format."));
return false;
}
if (!is_date($_POST['due_date']))
{
display_error( _("The required by date entered is in an invalid format."));
+ set_focus('due_date');
return false;
}
return false;
}
@@
-162,6
+170,7
@@
if (isset($_POST['delete']))
if (dimension_has_payments($selected_id) || dimension_has_deposits($selected_id))
{
display_error(_("This dimension cannot be deleted because it has already been processed."));
if (dimension_has_payments($selected_id) || dimension_has_deposits($selected_id))
{
display_error(_("This dimension cannot be deleted because it has already been processed."));
+ set_focus('ref');
$cancel_delete = true;
}
$cancel_delete = true;
}
@@
-223,7
+232,7
@@
if ($selected_id != -1)
}
else
{
}
else
{
- ref_row(_("Dimension Reference:"), 'ref', references::get_next(systypes::dimension()));
+ ref_row(_("Dimension Reference:"), 'ref',
'',
references::get_next(systypes::dimension()));
}
text_row_ex(_("Name") . ":", 'name', 50, 75);
}
text_row_ex(_("Name") . ":", 'name', 50, 75);
@@
-234,7
+243,7
@@
number_list_row(_("Type"), 'type_', null, 1, $dim);
date_row(_("Start Date") . ":", 'date_');
date_row(_("Start Date") . ":", 'date_');
-date_row(_("Date Required By") . ":", 'due_date', null, sys_prefs::default_dimension_required_by());
+date_row(_("Date Required By") . ":", 'due_date',
'',
null, sys_prefs::default_dimension_required_by());
textarea_row(_("Memo:"), 'memo_', null, 40, 5);
textarea_row(_("Memo:"), 'memo_', null, 40, 5);