Allow update employee if no occupied positions defined

r7-labs · Mar 13, 2014 · e254ade · e254ade
1 parent 239fe79
commit e254ade
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/R7.University.Launchpad/EditEmployee.ascx.cs b/R7.University.Launchpad/EditEmployee.ascx.cs
@@ -270,16 +270,20 @@ protected void buttonUpdate_Click (object sender, EventArgs e)
 					item.CreatedByUserID = item.LastModifiedByUserID = this.UserId;
 					item.CreatedOnDate = item.LastModifiedOnDate = DateTime.Now;
 
-
-
 					var occupiedPositions = ViewState["occupiedPositions"] as List<OccupiedPositionView>;
-					var occupiedPositionInfos = new List<OccupiedPositionInfo>();
+					// check if we have positions defined
+					if (occupiedPositions != null)
+					{
+						var occupiedPositionInfos = new List<OccupiedPositionInfo>();
 
-					foreach (var op in occupiedPositions)
-						occupiedPositionInfos.Add(op.NewOccupiedPositionInfo());
+						foreach (var op in occupiedPositions)
+							occupiedPositionInfos.Add(op.NewOccupiedPositionInfo());
 
-					// add item
-					ctrl.AddEmployee(item, occupiedPositionInfos);
+						// add item
+						ctrl.AddEmployee(item, occupiedPositionInfos);
+					}
+					else
+						ctrl.Add<EmployeeInfo>(item);
 				}
 				else
 				{
@@ -324,15 +328,20 @@ protected void buttonUpdate_Click (object sender, EventArgs e)
 					item.LastModifiedByUserID = this.UserId;
 					item.LastModifiedOnDate = DateTime.Now;
 
-
 					var occupiedPositions = ViewState["occupiedPositions"] as List<OccupiedPositionView>;
-					var occupiedPositionInfos = new List<OccupiedPositionInfo>();
+					// check if we have positions defined
+					if (occupiedPositions != null)
+					{
+						var occupiedPositionInfos = new List<OccupiedPositionInfo>();
 
-					foreach (var op in occupiedPositions)
-						occupiedPositionInfos.Add(op.NewOccupiedPositionInfo());
+						foreach (var op in occupiedPositions)
+							occupiedPositionInfos.Add(op.NewOccupiedPositionInfo());
 
-					// update item
-					ctrl.UpdateEmployee(item, occupiedPositionInfos);
+						// update
+						ctrl.UpdateEmployee(item, occupiedPositionInfos);
+					}
+					else
+						ctrl.Update<EmployeeInfo>(item);
 				}
 
 				Utils.SynchronizeModule(this);