Moving 2.0 development version to main trunk.

[fa-stable.git] / manufacturing / manage / work_centres.php

diff --git a/manufacturing/manage/work_centres.php b/manufacturing/manage/work_centres.php
index 865fecd818e7dcfeb94da58583b5ec2ba6f2beec..4155fae8680a1e7c06cc1948dd3c5df0d3df4355 100644 (file)
--- a/manufacturing/manage/work_centres.php
+++ b/manufacturing/manage/work_centres.php
@@ -10,18 +10,10 @@ include($path_to_root . "/manufacturing/includes/manufacturing_db.inc");
 
 include($path_to_root . "/includes/ui.inc");
 
-if (isset($_GET['selected_id']))
-{
-       $selected_id = $_GET['selected_id'];
-} 
-elseif(isset($_POST['selected_id']))
-{
-       $selected_id = $_POST['selected_id'];
-}
-
+simple_page_mode(true);
 //-----------------------------------------------------------------------------------
 
-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
@@ -31,23 +23,23 @@ if (isset($_POST['ADD_ITEM']) || isset($_POST['UPDATE_ITEM']))
        {
                $input_error = 1;
                display_error(_("The work centre name cannot be empty."));
+               set_focus('name');
        }
 
        if ($input_error != 1) 
        {
                
-       if (isset($selected_id)) 
+       if ($selected_id != -1) 
        {
-               
                update_work_centre($selected_id, $_POST['name'], $_POST['description']);
-    
+                       display_notification(_('Selected work center has been updated'));
        } 
        else 
        {
-    
                add_work_centre($_POST['name'], $_POST['description']);
+                       display_notification(_('New work center has been added'));
        }
-               meta_forward($_SERVER['PHP_SELF']);     
+               $Mode = 'RESET';
        }
 } 
 
@@ -79,20 +71,27 @@ function can_delete($selected_id)
 
 //-----------------------------------------------------------------------------------
 
-if (isset($_GET['delete'])) 
+if ($Mode == 'Delete')
 {
 
        if (can_delete($selected_id))
        {
                delete_work_centre($selected_id);
-               meta_forward($_SERVER['PHP_SELF']);             
+               display_notification(_('Selected work center has been deleted'));
        }
+       $Mode = 'RESET';
 }
 
+if ($Mode == 'RESET')
+{
+       $selected_id = -1;
+       unset($_POST);
+}
 //-----------------------------------------------------------------------------------
 
 $result = get_all_work_centres();
 
+start_form();
 start_table("$table_style width=50%");
 $th = array(_("Name"), _("description"), "", "");
 table_header($th);
@@ -105,30 +104,29 @@ while ($myrow = db_fetch($result))
 
        label_cell($myrow["name"]);
        label_cell($myrow["description"]);
-       edit_link_cell("selected_id=" . $myrow["id"]);
-       delete_link_cell("selected_id=" . $myrow["id"]. "&delete=1");
+       edit_button_cell("Edit".$myrow['id'], _("Edit"));
+       edit_button_cell("Delete".$myrow['id'], _("Delete"));
        end_row();
 }
 
 end_table();
-
+end_form();
+echo '<br>';
 //-----------------------------------------------------------------------------------
 
-hyperlink_no_params($_SERVER['PHP_SELF'], _("New Work Centre"));
-
 start_form();
 
 start_table($table_style2);
 
-if (isset($selected_id)) 
+if ($selected_id != -1) 
 {
-       //editing an existing status code
-
-       $myrow = get_work_centre($selected_id);
-
-       $_POST['name']  = $myrow["name"];
-       $_POST['description']  = $myrow["description"];
-
+       if ($Mode == 'Edit') {
+               //editing an existing status code
+               $myrow = get_work_centre($selected_id);
+               
+               $_POST['name']  = $myrow["name"];
+               $_POST['description']  = $myrow["description"];
+       }
        hidden('selected_id', $selected_id);
 } 
 
@@ -137,7 +135,7 @@ text_row_ex(_("Description:"), 'description', 50);
 
 end_table(1);
 
-submit_add_or_update_center(!isset($selected_id));
+submit_add_or_update_center($selected_id == -1, '', true);
 
 end_form();