X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fdimension_entry.php;h=3a11e6656a156fc4141ec047e44a9bce2112ffc2;hb=48589f9ce6c51bb25e2fa8ed83c57d9dfa485e44;hp=bf6fe3eeb1b179e0513486c869870d3b984f7823;hpb=8cac19c37c960e50f7c11964510c0d09a530e7b5;p=fa-stable.git
diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php
index bf6fe3ee..3a11e665 100644
--- a/dimensions/dimension_entry.php
+++ b/dimensions/dimension_entry.php
@@ -1,21 +1,29 @@
.
+***********************************************************************/
+$page_security = 'SA_DIMENSION';
+$path_to_root = "..";
include_once($path_to_root . "/includes/session.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");
+include_once($path_to_root . "/admin/db/tags_db.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)
+if (user_use_date_picker())
$js .= get_js_date_picker();
-page(_("Dimension Entry"), false, false, "", $js);
+page(_($help_context = "Dimension Entry"), false, false, "", $js);
//---------------------------------------------------------------------------------------
@@ -70,15 +78,25 @@ if (isset($_GET['ClosedID']))
safe_exit();
}
+//---------------------------------------------------------------------------------------
+
+if (isset($_GET['ReopenedID']))
+{
+ $id = $_GET['ReopenedID'];
+
+ display_notification_centered(_("The dimension has been re-opened. ") . " #$id");
+ safe_exit();
+}
+
//-------------------------------------------------------------------------------------------------
function safe_exit()
{
- global $path_to_root;
+ global $path_to_root, $id;
- hyperlink_no_params("", _("Enter a new dimension"));
- echo "
";
- hyperlink_no_params($path_to_root . "/dimensions/inquiry/search_dimensions.php", _("Select an existing dimension"));
+ hyperlink_no_params("", _("Enter a &new dimension"));
+ hyperlink_no_params($path_to_root . "/dimensions/inquiry/search_dimensions.php", _("&Select an existing dimension"));
+ hyperlink_no_params($path_to_root . "/admin/attachments.php?filterType=40&trans_no=$id", _("&Add Attachment"));
display_footer_exit();
}
@@ -87,21 +105,12 @@ function safe_exit()
function can_process()
{
- global $selected_id;
+ global $selected_id, $Refs;
if ($selected_id == -1)
{
-
- 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()))
+ if (!check_reference($_POST['ref'], ST_DIMENSION))
{
- display_error(_("The entered reference is already in use."));
set_focus('ref');
return false;
}
@@ -135,21 +144,23 @@ function can_process()
if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
{
-
+ if (!isset($_POST['dimension_tags']))
+ $_POST['dimension_tags'] = array();
+
if (can_process())
{
if ($selected_id == -1)
{
-
$id = add_dimension($_POST['ref'], $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']);
-
+ add_tag_associations($id, $_POST['dimension_tags']);
meta_forward($_SERVER['PHP_SELF'], "AddedID=$id");
}
else
{
update_dimension($selected_id, $_POST['name'], $_POST['type_'], $_POST['date_'], $_POST['due_date'], $_POST['memo_']);
+ update_tag_associations(TAG_DIMENSION, $selected_id, $_POST['dimension_tags']);
meta_forward($_SERVER['PHP_SELF'], "UpdatedID=$selected_id");
}
@@ -176,6 +187,7 @@ if (isset($_POST['delete']))
// delete
delete_dimension($selected_id);
+ delete_tag_associations(TAG_DIMENSION,$selected_id, true);
meta_forward($_SERVER['PHP_SELF'], "DeletedID=$selected_id");
}
}
@@ -190,28 +202,35 @@ if (isset($_POST['close']))
meta_forward($_SERVER['PHP_SELF'], "ClosedID=$selected_id");
}
+if (isset($_POST['reopen']))
+{
+
+ // update the closed flag
+ reopen_dimension($selected_id);
+ meta_forward($_SERVER['PHP_SELF'], "ReopenedID=$selected_id");
+}
//-------------------------------------------------------------------------------------
start_form();
-start_table($table_style2);
+start_table(TABLESTYLE2);
if ($selected_id != -1)
{
- $myrow = get_dimension($selected_id);
+ $myrow = get_dimension($selected_id, true);
- if (strlen($myrow[0]) == 0)
+ if ($myrow === false)
{
display_error(_("The dimension sent is not valid."));
display_footer_exit();
}
// if it's a closed dimension can't edit it
- if ($myrow["closed"] == 1)
- {
- display_error(_("This dimension is closed and cannot be edited."));
- display_footer_exit();
- }
+ //if ($myrow["closed"] == 1)
+ //{
+ // display_error(_("This dimension is closed and cannot be edited."));
+ // display_footer_exit();
+ //}
$_POST['ref'] = $myrow["reference"];
$_POST['closed'] = $myrow["closed"];
@@ -219,7 +238,13 @@ if ($selected_id != -1)
$_POST['type_'] = $myrow["type_"];
$_POST['date_'] = sql2date($myrow["date_"]);
$_POST['due_date'] = sql2date($myrow["due_date"]);
- $_POST['memo_'] = get_comments_string(systypes::dimension(), $selected_id);
+ $_POST['memo_'] = get_comments_string(ST_DIMENSION, $selected_id);
+
+ $tags_result = get_tags_associated_with_record(TAG_DIMENSION, $selected_id);
+ $tagids = array();
+ while ($tag = db_fetch($tags_result))
+ $tagids[] = $tag['id'];
+ $_POST['dimension_tags'] = $tagids;
hidden('ref', $_POST['ref']);
@@ -229,7 +254,8 @@ if ($selected_id != -1)
}
else
{
- ref_row(_("Dimension Reference:"), 'ref', '', references::get_next(systypes::dimension()));
+ $_POST['dimension_tags'] = array();
+ ref_row(_("Dimension Reference:"), 'ref', '', $Refs->get_next(ST_DIMENSION), false, ST_DIMENSION);
}
text_row_ex(_("Name") . ":", 'name', 50, 75);
@@ -240,22 +266,30 @@ number_list_row(_("Type"), 'type_', null, 1, $dim);
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, $SysPrefs->default_dimension_required_by());
+
+tag_list_row(_("Tags:"), 'dimension_tags', 5, TAG_DIMENSION, true);
textarea_row(_("Memo:"), 'memo_', null, 40, 5);
end_table(1);
+if (isset($_POST['closed']) && $_POST['closed'] == 1)
+ display_note(_("This Dimension is closed."), 0, 0, "class='currentfg'");
+
if ($selected_id != -1)
{
echo "
";
- submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), true);
- submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true);
+ submit_center_first('UPDATE_ITEM', _("Update"), _('Save changes to dimension'), 'default');
+ if ($_POST['closed'] == 1)
+ submit('reopen', _("Re-open This Dimension"), true, _('Mark this dimension as re-opened'), true);
+ else
+ submit('close', _("Close This Dimension"), true, _('Mark this dimension as closed'), true);
submit_center_last('delete', _("Delete This Dimension"), _('Delete unused dimension'), true);
}
else
{
- submit_center('ADD_ITEM', _("Add"), true, '', true);
+ submit_center('ADD_ITEM', _("Add"), true, '', 'default');
}
end_form();
@@ -263,4 +297,3 @@ end_form();
end_page();
-?>