Fixed more admin panel bugs

rrk12005 · Apr 6, 2017 · 5589bd1 · 5589bd1
1 parent 1bdb3a8
commit 5589bd1
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 39 deletions.
diff --git a/Enigma/StationsGUI/AdminStationView.cs b/Enigma/StationsGUI/AdminStationView.cs
@@ -186,55 +186,69 @@ namespace Enigma.StationsGUI
         }
 
         private void openMenu(int id) {
-            EnigmaMenu menu = enigmaMenus[id];
-            menuListBox.ClearSelected();
-            menuDisplayedOnListBox.ClearSelected();
-            menuTitleTextBox.ResetText();
-
-            menuTitleTextBox.Text = menu.Title;
-            foreach (EnigmaMenuItem item in menu.Items) {
-                Predicate<EnigmaMenuItem> itemFinder = (EnigmaMenuItem p) => { return p.Id == item.Id; };
-                menuListBox.SetSelected(enigmaMenuItems.FindIndex(itemFinder), true);
+            if (id != -1)
+            {
+                EnigmaMenu menu = enigmaMenus[id];
+                menuListBox.ClearSelected();
+                menuDisplayedOnListBox.ClearSelected();
+                menuTitleTextBox.ResetText();
+
+                menuTitleTextBox.Text = menu.Title;
+                foreach (EnigmaMenuItem item in menu.Items)
+                {
+                    Predicate<EnigmaMenuItem> itemFinder = (EnigmaMenuItem p) => { return p.Id == item.Id; };
+                    menuListBox.SetSelected(enigmaMenuItems.FindIndex(itemFinder), true);
+                }
             }
         }
 
         private void openItem(int id) {
-            EnigmaMenuItem item = enigmaMenuItems[id];
-            itemCategoryListBox.ClearSelected();
-            itemDescriptionTextbox.ResetText();
-            itemPrice.ResetText();
-            itemPrintingListBox.ClearSelected();
-            itemNameTextBox.ResetText();
-
-            itemPrice.Value = decimal.Parse(item.Price.ToString());
-            itemDescriptionTextbox.Text = item.Description;
-            itemCategoryListBox.SetSelected((int)item.ItemType, true);
-            itemPrintingListBox.SetSelected((int)item.PrintingType, true);
-            itemNameTextBox.Text = item.Title;
+            if (id != -1)
+            {
+                EnigmaMenuItem item = enigmaMenuItems[id];
+                itemCategoryListBox.ClearSelected();
+                itemDescriptionTextbox.ResetText();
+                itemPrice.ResetText();
+                itemPrintingListBox.ClearSelected();
+                itemNameTextBox.ResetText();
+
+                itemPrice.Value = decimal.Parse(item.Price.ToString());
+                itemDescriptionTextbox.Text = item.Description;
+                itemCategoryListBox.SetSelected((int)item.ItemType, true);
+                itemPrintingListBox.SetSelected((int)item.PrintingType, true);
+                itemNameTextBox.Text = item.Title;
+            }
         }
 
         private void openEmployee(int id) {
-            Employee employee = enigmaEmployees[id];
-            employeeFirstNameTextBox.ResetText();
-            employeeLastNameTextBox.ResetText();
-            employeePinNumber.ResetText();
-            employeeRoleListBox.ClearSelected();
-
-            employeeFirstNameTextBox.Text = employee.FirstName;
-            employeeLastNameTextBox.Text = employee.LastName;
-            employeePinNumber.Value = employee.Pin;
-
-            foreach (EmployeeRole role in employee.Roles) {
-                int index = (int)role;
-                employeeRoleListBox.SetSelected(index, true);
+            if (id != -1)
+            {
+                Employee employee = enigmaEmployees[id];
+                employeeFirstNameTextBox.ResetText();
+                employeeLastNameTextBox.ResetText();
+                employeePinNumber.ResetText();
+                employeeRoleListBox.ClearSelected();
+
+                employeeFirstNameTextBox.Text = employee.FirstName;
+                employeeLastNameTextBox.Text = employee.LastName;
+                employeePinNumber.Value = employee.Pin;
+
+                foreach (EmployeeRole role in employee.Roles)
+                {
+                    int index = (int)role;
+                    employeeRoleListBox.SetSelected(index, true);
+                }
             }
 
         }
 
         private void openStation(int id) {
-            Station station = enigmaStations[id];
-            stationTypeListBox.ClearSelected();
-            stationTypeListBox.SetSelected((int)station.StationType, true);
+            if (id != -1)
+            {
+                Station station = enigmaStations[id];
+                stationTypeListBox.ClearSelected();
+                stationTypeListBox.SetSelected((int)station.StationType, true);
+            }
 
         }
 
@@ -283,7 +297,7 @@ namespace Enigma.StationsGUI
             employee.FirstName = employeeFirstNameTextBox.Text;
             employee.LastName = employeeLastNameTextBox.Text;
             employee.Pin = Convert.ToInt32(employeePinNumber.Value);
-            employee.Roles = employeeRoleListBox.SelectedItems.Cast<EmployeeRole>().ToList();
+            employee.Roles = employeeRoleListBox.SelectedIndices.Cast<EmployeeRole>().ToList();
             uploadEmployee();
         }
 

diff --git a/EnigmaX/Classes/Station.cs b/EnigmaX/Classes/Station.cs
@@ -7,7 +7,7 @@ using System.Windows.Forms;
 
 namespace EnigmaX.Classes
 {
-    public enum StationTypeDef { chef, waiter, admin, host };
+    public enum StationTypeDef { chef, waiter, host, admin };
     public class Station
     {
         private string _stationId = "";