Changeset 6451 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs

Timestamp:

06/20/11 14:06:33 (13 years ago)

Author:

ascheibe

Message:

#1233
Admin UI:

• added subgroups
• groups can now have calendars
• calendar bugfixes

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs (modified) (7 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administration/3.4/Views/ScheduleView.cs

@@ -72 +72 @@
 
       foreach (HiveAppointment app in offlineTimes) {
-        if (app.StartDate >= e.StartDate && app.StartDate <= e.EndDate) {
+        if (app.StartDate >= e.StartDate && app.StartDate <= e.EndDate && !app.Deleted) {
           apps.Add(app);
         }
@@ -103 +103 @@
           Locked = true,
           Subject = "Offline",
-          Changed = false
+          Changed = false,
+          Id = app.Id
         });
       }
@@ -169 +170 @@
 
     private void DeleteRecurringAppointment(Guid recurringId) {
-      offlineTimes.RemoveAll(a => a.RecurringId.ToString() == ((HiveAppointment)dvOnline.SelectedAppointment).RecurringId.ToString());
+      foreach (HiveAppointment app in offlineTimes) {
+        if (app.RecurringId == recurringId) {
+          app.Deleted = true;
+        }
+      }
     }
 
@@ -217 +222 @@
 
     private void DeleteAppointment() {
-      offlineTimes.Remove((HiveAppointment)dvOnline.SelectedAppointment);
+      try {
+        HiveAppointment app = offlineTimes.First(s => s.Equals((HiveAppointment)dvOnline.SelectedAppointment));
+        app.Deleted = true;
+      }
+      catch (InvalidOperationException) {
+        // this is a ui bug where a selected all day appointment is not properly selected :-/
+      }
     }
 
@@ -246 +257 @@
 
     private void btnClearCal_Click(object sender, System.EventArgs e) {
-      offlineTimes.Clear();
+      foreach (HiveAppointment app in offlineTimes) {
+        app.Deleted = true;
+      }
+      dvOnline.Invalidate();
     }
 
@@ -319 +333 @@
       List<Appointment> appointments = new List<Appointment>();
       foreach (HiveAppointment app in offlineTimes) {
-        if (app.Changed) {
+        if (app.Deleted) {
+          ServiceLocator.Instance.CallHiveService(service => {
+            if (app.Id != Guid.Empty) {
+              service.DeleteAppointment(app.Id);
+            }
+          });
+        } else if (app.Changed) {
           Appointment apdto = new Appointment {
             AllDayEvent = app.AllDayEvent,
@@ -339 +359 @@
           }
         });
-
-        //TODO: refresh Content
       }
     }