Small table view fix.

[fa-stable.git] / inventory / manage / item_units.php

diff --git a/inventory/manage/item_units.php b/inventory/manage/item_units.php
index 3798bfe30f24f94e62720645c2f196766787eb70..61e4e685d6de346f3a37e5b3e4ab819556f8a46f 100644 (file)
--- a/inventory/manage/item_units.php
+++ b/inventory/manage/item_units.php
@@ -10,18 +10,10 @@ include_once($path_to_root . "/includes/ui.inc");
 
 include_once($path_to_root . "/inventory/includes/db/items_units_db.inc");
 
-if (isset($_GET['selected_id']))
-{
-       $selected_id = $_GET['selected_id'];
-}
-else if (isset($_POST['selected_id']))
-{
-       $selected_id = $_POST['selected_id'];
-}
-
+simple_page_mode(false);
 //----------------------------------------------------------------------------------
 
-if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
+if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') 
 {
 
        //initialise no input errors assumed initially before we test
@@ -39,42 +31,47 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
                display_error(_("The unit of measure description cannot be empty."));
                set_focus('description');
        }
-       if (!is_numeric($_POST['decimals']))
-       {
-               $input_error = 1;
-               display_error(_("The number of decimal places must be integer."));
-               set_focus('decimals');
-       }
-
 
        if ($input_error !=1) {
-       write_item_unit(isset($selected_id) ? $selected_id : '', $_POST['abbr'], $_POST['description'], $_POST['decimals'] );
-               meta_forward($_SERVER['PHP_SELF']);
+       write_item_unit($selected_id, $_POST['abbr'], $_POST['description'], $_POST['decimals'] );
+               if($selected_id != '')
+                       display_notification(_('Selected unit has been updated'));
+               else
+                       display_notification(_('New unit has been added'));
+               $Mode = 'RESET';
        }
 }
 
 //----------------------------------------------------------------------------------
 
-if (isset($_GET['delete']))
+if ($Mode == 'Delete')
 {
 
        // PREVENT DELETES IF DEPENDENT RECORDS IN 'stock_master'
 
        if (item_unit_used($selected_id))
        {
-               display_error(_("Cannot delete this unit of measure because items have been created using this units."));
+               display_error(_("Cannot delete this unit of measure because items have been created using this unit."));
 
        }
        else
        {
                delete_item_unit($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);
+               display_notification(_('Selected unit has been deleted'));
+               $Mode = 'RESET';
        }
 }
 
+if ($Mode == 'RESET')
+{
+       $selected_id = '';
+       unset($_POST);
+}
+
 //----------------------------------------------------------------------------------
 
 $result = get_all_item_units();
+start_form();
 start_table("$table_style width=50%");
 $th = array(_('Unit'), _('Description'), _('Decimals'), "", "");
 
@@ -88,49 +85,49 @@ while ($myrow = db_fetch($result))
 
        label_cell($myrow["abbr"]);
        label_cell($myrow["name"]);
-       label_cell($myrow["decimals"]);
+       label_cell(($myrow["decimals"]==-1?_("User Quantity Decimals"):$myrow["decimals"]));
 
-       edit_link_cell(SID."selected_id=$myrow[0]");
-       delete_link_cell(SID."selected_id=$myrow[0]&delete=yes");
+       edit_button_cell("Edit".$myrow[0], _("Edit"));
+       edit_button_cell("Delete".$myrow[0], _("Delete"));
        end_row();
 }
 
 end_table();
+end_form();
+echo '<br>';
 
 //----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Unit of Measure"));
-
 start_form();
 
 start_table("class='tablestyle_noborder'");
 
-if (isset($selected_id))
+if ($selected_id != '') 
 {
-       //editing an existing item category
+       if ($Mode == 'Edit') {
+               //editing an existing item category
 
-       $myrow = get_item_unit($selected_id);
-
-       $_POST['abbr'] = $myrow["abbr"];
-       $_POST['description']  = $myrow["name"];
-       $_POST['decimals']  = $myrow["decimals"];
+               $myrow = get_item_unit($selected_id);
 
+               $_POST['abbr'] = $myrow["abbr"];
+               $_POST['description']  = $myrow["name"];
+               $_POST['decimals']  = $myrow["decimals"];
+       }
        hidden('selected_id', $selected_id);
 }
 
-if (isset($selected_id) && item_unit_used($selected_id)) {
+if ($selected_id != '' && item_unit_used($selected_id)) {
     label_row(_("Unit Abbreviation:"), $_POST['abbr']);
     hidden('abbr', $_POST['abbr']);
 } else
     text_row(_("Unit Abbreviation:"), 'abbr', null, 20, 20);
 text_row(_("Descriptive Name:"), 'description', null, 40, 40);
 
-//text_row(_("Decimal Places:"), 'decimals', null, 3, 3);
 number_list_row(_("Decimal Places:"), 'decimals', null, 0, 6, _("User Quantity Decimals"));
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == '', '', true);
 
 end_form();