Merge pull request #27 from StevenKight/Finalize-Iteration-2

RentMeFurnitureRentalSystem/RentMeFurnitureRentalSystem/DAL/EmployeeDAL.cs

@@ -38,14 +38,21 @@ public static bool CreateEmployee(Employee employee)
         connection.Open();
 
         var query =
-            "insert into employee(username,password,fname,lname,gender,phone,email,dob,address,city,state,zip,role_name) values(@username,@password,@firstname,@lastname,@gender,@phone,@email,@dob,@address,@city,@state,@zipcode,@role)";
+            "insert into employee(username,fname,lname,gender,phone,email,dob,address,city,state,zip,role_name) values(@username,@firstname,@lastname,@gender,@phone,@email,@dob,@address,@city,@state,@zipcode,@role_name)";
         var command = new MySqlCommand(query, connection);
 
         employee.FillCommand(command);
 
-        var rowsAffected = command.ExecuteNonQuery();
+        try
+        {
+            var rowsAffected = command.ExecuteNonQuery();
 
-        return rowsAffected > 0;
+            return rowsAffected > 0;
+        }
+        catch (Exception ex)
+        {
+            return false;
+        }
     }
 
     public static Employee GetEmployeeFromUsername(string username)

RentMeFurnitureRentalSystem/RentMeFurnitureRentalSystem/View/addUserForm.cs

@@ -137,6 +137,7 @@ private void displayCustomerData()
         this.passwordInput.Hide();
         this.passwordInput.Enabled = false;
         this.passwordInput.Validating -= this.textInput_Validating;
+        this.showPasswordCheckBox.Hide();
 
         this.roleLabel.Hide();
         this.roleComboBox.Hide();
@@ -170,23 +171,16 @@ private void addCustomerButton_Click(object sender, EventArgs e)
             Zipcode = this.zipcodeInput.Text
         };
 
-        // TODO: Add Customer
-        try
-        {
-            var added = CustomerDal.CreateCustomer(customer);
-
-            if (!added)
-            {
-                throw new Exception("User not added");
-            }
+        var added = CustomerDal.CreateCustomer(customer);
 
-            MessageBox.Show("Customer Added");
-            Close();
-        }
-        catch
+        if (!CustomerDal.CreateCustomer(customer))
         {
             MessageBox.Show("Error Adding Customer");
+            return;
         }
+
+        MessageBox.Show("Customer Added");
+        this.Close();
     }
 
     private void addEmployeeButton_Click(object sender, EventArgs e)
@@ -231,12 +225,13 @@ private void addEmployeeButton_Click(object sender, EventArgs e)
         }
 
         MessageBox.Show("Employee created sucessfully");
+        this.Close();
     }
 
     private void cancelButton_Click(object sender, EventArgs e)
     {
         AutoValidate = AutoValidate.Disable;
-        Close();
+        this.Close();
     }
 
     private void populateGenderComboBox()
@@ -370,7 +365,7 @@ private void roleComboBox_Validating(object sender, CancelEventArgs e)
     private static readonly string[] genderOptions = { "O", "M", "F" };
 
     // TODO: Make a request to db
-    private static readonly string[] roleOptions = { "admin", "employee" };
+    private static readonly string[] roleOptions = { "administrator", "employee" };
 
     #endregion
 
@@ -380,8 +375,14 @@ private void zipcodeInput_Validating(object sender, CancelEventArgs e)
 
         if (!Regex.IsMatch(zip, ZIPREGEX))
         {
+            e.Cancel = true;
             this.addUserError.SetError(this.zipcodeInput,
                 "Given zipcode is invalid.");
         }
+        else
+        {
+            e.Cancel = false;
+            this.addUserError.SetError(this.zipcodeInput, "");
+        }
     }
 }

RentMeFurnitureRentalSystem/RentMeFurnitureRentalSystem/model/Employee.cs

@@ -45,6 +45,7 @@ public void FillCommand(MySqlCommand query)
 
     public void SelectCommand(MySqlDataReader reader)
     {
+        var idOrdinal = reader.GetOrdinal("employee_num");
         var usernameOrdinal = reader.GetOrdinal("username");
         var nameOrdinal = reader.GetOrdinal("fname");
         var lnameOrdinal = reader.GetOrdinal("lname");
@@ -58,6 +59,7 @@ public void SelectCommand(MySqlDataReader reader)
         var zipOrdinal = reader.GetOrdinal("zip");
         var roleOrdinal = reader.GetOrdinal("role_name");
 
+        this.EmployeeNum = reader.GetInt16(idOrdinal);
         this.Username = reader.GetString(usernameOrdinal);
         this.Firstname = reader.GetString(nameOrdinal);
         this.Lastname = reader.GetString(lnameOrdinal);

RentMeFurnitureRentalSystem/RentMeFurnitureRentalSystem/view/MainScreenForm.cs

@@ -40,7 +40,8 @@ public MainScreenForm(Employee employee)
         Location = new Point(x, y);
 
         this.LoggedInEmployee = employee;
-        this.employeeDisplay.Text = employee.Firstname + " " + employee.Lastname;
+        this.employeeDisplay.Text = employee.EmployeeNum + " " + employee.Username + @": " + 
+                                    employee.Firstname + " " + employee.Lastname;
         this.checkIfAdmin();
 
         this.getData();

RentMeFurnitureRentalSystem/RentMeFurnitureRentalSystem/view/MainScreenForm.resx

@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="employeeDisplay.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>