X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Fdimension_entry.php;h=8ee8fb8a90e45ec0171fffd93854f89aba5b158c;hb=3c86c7b18ecf3f294c2e8b897c8a95fcb3f7f5d9;hp=91904b53034a90d738630c021a69d9655ffe597d;hpb=c1ab12ce9d688466f26ac4ca3b0e11ddc0c4b8e2;p=fa-stable.git

diff --git a/dimensions/dimension_entry.php b/dimensions/dimension_entry.php
index 91904b53..8ee8fb8a 100644
--- a/dimensions/dimension_entry.php
+++ b/dimensions/dimension_entry.php
@@ -17,13 +17,14 @@ 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)
 	$js .= get_js_date_picker();
-page(_("Dimension Entry"), false, false, "", $js);
+page(_($help_context = "Dimension Entry"), false, false, "", $js);
 
 //---------------------------------------------------------------------------------------
 
@@ -105,19 +106,19 @@ function safe_exit()
 
 function can_process()
 {
-	global $selected_id;
+	global $selected_id, $Refs;
 
 	if ($selected_id == -1) 
 	{
 
-    	if (!references::is_valid($_POST['ref'])) 
+    	if (!$Refs->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 (!is_new_reference($_POST['ref'], ST_DIMENSION)) 
     	{
     		display_error(_("The entered reference is already in use."));
 			set_focus('ref');
@@ -153,21 +154,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");
 		}
@@ -194,6 +197,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");
 	}
 }
@@ -219,7 +223,7 @@ if (isset($_POST['reopen']))
 
 start_form();
 
-start_table($table_style2);
+start_table(TABLESTYLE2);
 
 if ($selected_id != -1)
 {
@@ -244,7 +248,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']);
 
@@ -254,7 +264,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));
 }
 
 text_row_ex(_("Name") . ":", 'name', 50, 75);
@@ -265,7 +276,9 @@ 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);