Changeset 9363 for branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs (copied) (copied from trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs (modified) (9 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (19 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

@@ -1 @@
-namespace HeuristicLab.Clients.Hive.Administrator.Views {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Clients.Hive.Administrator.Views {
   partial class Recurrence {
     /// <summary>
@@ -42 +63 @@
       this.cbTuesday = new System.Windows.Forms.CheckBox();
       this.cbMonday = new System.Windows.Forms.CheckBox();
+      this.appointmentTypeView = new HeuristicLab.Clients.Hive.Administrator.Views.DowntimeTypeView();
+      this.gbDowntimeType = new System.Windows.Forms.GroupBox();
       this.gbAppointment.SuspendLayout();
       this.gbWeekly.SuspendLayout();
+      this.gbDowntimeType.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -82 +106 @@
       // dtpToTime
       // 
-      this.dtpToTime.CustomFormat = "HH:00";
+      this.dtpToTime.CustomFormat = "HH:mm";
       this.dtpToTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
       this.dtpToTime.Location = new System.Drawing.Point(226, 56);
@@ -109 +133 @@
       // dtpFromTime
       // 
-      this.dtpFromTime.CustomFormat = "HH:00";
+      this.dtpFromTime.CustomFormat = "HH:mm";
       this.dtpFromTime.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
       this.dtpFromTime.Location = new System.Drawing.Point(226, 19);
@@ -128 +152 @@
       // btSaveRecurrence
       // 
-      this.btSaveRecurrence.Location = new System.Drawing.Point(2, 217);
+      this.btSaveRecurrence.Location = new System.Drawing.Point(2, 298);
       this.btSaveRecurrence.Name = "btSaveRecurrence";
       this.btSaveRecurrence.Size = new System.Drawing.Size(147, 23);
@@ -138 +162 @@
       // btCancelRecurrence
       // 
-      this.btCancelRecurrence.Location = new System.Drawing.Point(241, 217);
+      this.btCancelRecurrence.Location = new System.Drawing.Point(241, 298);
       this.btCancelRecurrence.Name = "btCancelRecurrence";
       this.btCancelRecurrence.Size = new System.Drawing.Size(147, 23);
@@ -232 +256 @@
       this.cbMonday.UseVisualStyleBackColor = true;
       // 
+      // appointmentTypeView
+      // 
+      this.appointmentTypeView.DowntimeType = HeuristicLab.Clients.Hive.DowntimeType.Offline;
+      this.appointmentTypeView.Location = new System.Drawing.Point(10, 19);
+      this.appointmentTypeView.Name = "appointmentTypeView";
+      this.appointmentTypeView.Size = new System.Drawing.Size(120, 50);
+      this.appointmentTypeView.TabIndex = 45;
+      // 
+      // gbDowntimeType
+      // 
+      this.gbDowntimeType.Controls.Add(this.appointmentTypeView);
+      this.gbDowntimeType.Location = new System.Drawing.Point(2, 217);
+      this.gbDowntimeType.Name = "gbDowntimeType";
+      this.gbDowntimeType.Size = new System.Drawing.Size(386, 75);
+      this.gbDowntimeType.TabIndex = 46;
+      this.gbDowntimeType.TabStop = false;
+      this.gbDowntimeType.Text = "Type of Downtime";
+      // 
       // Recurrence
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
-      this.ClientSize = new System.Drawing.Size(393, 243);
+      this.ClientSize = new System.Drawing.Size(393, 332);
+      this.Controls.Add(this.gbDowntimeType);
       this.Controls.Add(this.gbWeekly);
       this.Controls.Add(this.btCancelRecurrence);
@@ -242 +284 @@
       this.Controls.Add(this.gbAppointment);
       this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-      this.Icon = HeuristicLab.Common.Resources.HeuristicLab.Icon;
       this.Name = "Recurrence";
+      this.ShowIcon = false;
+      this.ShowInTaskbar = false;
       this.Text = "Recurrence";
+      this.TopMost = true;
       this.gbAppointment.ResumeLayout(false);
       this.gbAppointment.PerformLayout();
       this.gbWeekly.ResumeLayout(false);
       this.gbWeekly.PerformLayout();
+      this.gbDowntimeType.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -273 +318 @@
     private System.Windows.Forms.CheckBox cbTuesday;
     private System.Windows.Forms.CheckBox cbMonday;
+    private DowntimeTypeView appointmentTypeView;
+    private System.Windows.Forms.GroupBox gbDowntimeType;
   }
 }

branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

@@ -53 +53 @@
           DateTo = dateTo,
           AllDay = chbade.Checked,
-          WeekDays = days
+          WeekDays = days,
+          DowntimeType = appointmentTypeView.DowntimeType
         };
 

branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -437 +437 @@
 
       try {
+        if (!Access.UserInformation.Instance.UserExists) {
+          //do a refresh just in case that the user has changed his usr and pwd in between
+          Access.UserInformation.Instance.Refresh();
+        }
         HiveAdminClient.Instance.Refresh();
         Content = HiveAdminClient.Instance.Resources;

branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

@@ -71 +71 @@
       this.dvOnline.ActiveTool = drawTool1;
       this.dvOnline.AmPmDisplay = false;
-      this.dvOnline.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.dvOnline.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.dvOnline.AppointmentDuration = Calendar.AppointmentSlotDuration.SixtyMinutes;
@@ -96 +96 @@
       // txttimeTo
       // 
-      this.txttimeTo.CustomFormat = "HH:00";
+      this.txttimeTo.CustomFormat = "HH:mm";
       this.txttimeTo.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
       this.txttimeTo.Location = new System.Drawing.Point(164, 45);
@@ -106 +106 @@
       // txttimeFrom
       // 
-      this.txttimeFrom.CustomFormat = "HH:00";
+      this.txttimeFrom.CustomFormat = "HH:mm";
       this.txttimeFrom.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
       this.txttimeFrom.Location = new System.Drawing.Point(164, 12);
@@ -212 +212 @@
       this.btCreate.Size = new System.Drawing.Size(242, 26);
       this.btCreate.TabIndex = 20;
-      this.btCreate.Text = "Create Appointment";
-      this.toolTip.SetToolTip(this.btCreate, "Create a new appointment in the calender");
+      this.btCreate.Text = "Create Downtime";
+      this.toolTip.SetToolTip(this.btCreate, "Create a new downtime in the calender");
       this.btCreate.UseVisualStyleBackColor = true;
       this.btCreate.Click += new System.EventHandler(this.btCreate_Click);
@@ -247 +247 @@
       // mcOnline
       // 
-      this.mcOnline.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.mcOnline.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.mcOnline.CalendarDimensions = new System.Drawing.Size(2, 1);

branches/OaaS/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
-using System.Xml.Serialization;
 using Calendar;
 using HeuristicLab.Core;
@@ -40 +39 @@
     }
 
-    [XmlArray("Appointments")]
-    [XmlArrayItem("HiveAppointment", typeof(HiveAppointment))]
-    public List<HiveAppointment> offlineTimes = new List<HiveAppointment>();
+    public List<HiveDowntime> offlineTimes = new List<HiveDowntime>();
 
     //delegate fired, if a dialog is being closed
@@ -59 +56 @@
 
     private void dvOnline_OnResolveAppointments(object sender, ResolveAppointmentsEventArgs e) {
-      List<HiveAppointment> apps = new List<HiveAppointment>();
-
-      foreach (HiveAppointment app in offlineTimes) {
+      List<HiveDowntime> apps = new List<HiveDowntime>();
+
+      foreach (HiveDowntime app in offlineTimes) {
         if (app.StartDate >= e.StartDate && app.StartDate <= e.EndDate && !app.Deleted) {
           apps.Add(app);
@@ -68 +65 @@
 
       e.Appointments.Clear();
-      foreach (HiveAppointment app in apps) {
+      foreach (HiveDowntime app in apps) {
         e.Appointments.Add(app);
       }
@@ -74 +71 @@
 
     private void dvOnline_OnNewAppointment(object sender, NewAppointmentEventArgs e) {
-      HiveAppointment Appointment = new HiveAppointment();
-
-      Appointment.StartDate = e.StartDate;
-      Appointment.EndDate = e.EndDate;
-      offlineTimes.Add(Appointment);
+      HiveDowntime downtime = new HiveDowntime();
+
+      downtime.StartDate = e.StartDate;
+      downtime.EndDate = e.EndDate;
+      offlineTimes.Add(downtime);
     }
 
@@ -84 +81 @@
       offlineTimes.Clear();
       if (Content != null) {
-        foreach (Downtime app in Content) {
-          offlineTimes.Add(ToHiveAppointment(app));
-        }
-      }
-      dvOnline.Invalidate();
-    }
-
-    private bool CreateAppointment() {
+        foreach (Downtime downtime in Content) {
+          offlineTimes.Add(ToHiveDowntime(downtime));
+        }
+      }
+      dvOnline.Invalidate();
+    }
+
+    private bool CreateDowntime(DowntimeType dtType) {
       DateTime from, to;
 
@@ -98 +95 @@
           //whole day appointment, only dates are visible
           if (DateTime.TryParse(dtpFrom.Text, out from) && DateTime.TryParse(dtpTo.Text, out to) && from <= to)
-            offlineTimes.Add(CreateAppointment(from, to.AddDays(1), true));
+            offlineTimes.Add(CreateDowntime(from, to.AddDays(1), true, dtType));
           else
             MessageBox.Show("Incorrect date format", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -105 +102 @@
           if (DateTime.TryParse(dtpFrom.Text + " " + txttimeFrom.Text, out from) && DateTime.TryParse(dtpTo.Text + " " + txttimeTo.Text, out to) && from < to) {
             if (from.Date == to.Date)
-              offlineTimes.Add(CreateAppointment(from, to, false));
+              offlineTimes.Add(CreateDowntime(from, to, false, dtType));
             else {
               //more than 1 day selected
               while (from.Date != to.Date) {
-                offlineTimes.Add(CreateAppointment(from, new DateTime(from.Year, from.Month, from.Day, to.Hour, to.Minute, 0, 0), false));
+                offlineTimes.Add(CreateDowntime(from, new DateTime(from.Year, from.Month, from.Day, to.Hour, to.Minute, 0, 0), false, dtType));
                 from = from.AddDays(1);
               }
-              offlineTimes.Add(CreateAppointment(from, new DateTime(from.Year, from.Month, from.Day, to.Hour, to.Minute, 0, 0), false));
+              offlineTimes.Add(CreateDowntime(from, new DateTime(from.Year, from.Month, from.Day, to.Hour, to.Minute, 0, 0), false, dtType));
             }
           } else
@@ -120 +117 @@
         return true;
       } else {
-        MessageBox.Show("Error in create appointment, please fill out all textboxes!", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        MessageBox.Show("Error creating downtime, please fill out all textboxes!", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
         return false;
       }
     }
 
-    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay) {
-      HiveAppointment app = new HiveAppointment();
-      app.StartDate = startDate;
-      app.EndDate = endDate;
-      app.AllDayEvent = allDay;
-      app.BorderColor = Color.Red;
-      app.Locked = true;
-      app.Subject = "Offline";
-      app.Recurring = false;
-      return app;
-    }
-
-    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay, bool recurring, Guid recurringId) {
-      HiveAppointment app = new HiveAppointment();
-      app.StartDate = startDate;
-      app.EndDate = endDate;
-      app.AllDayEvent = allDay;
-      app.BorderColor = Color.Red;
-      app.Locked = true;
-      app.Subject = "Offline";
-      app.Recurring = recurring;
-      app.RecurringId = recurringId;
-      return app;
-    }
-
-    private void DeleteRecurringAppointment(Guid recurringId) {
-      foreach (HiveAppointment app in offlineTimes) {
-        if (app.RecurringId == recurringId) {
-          app.Deleted = true;
-        }
-      }
-    }
-
-    private void ChangeRecurrenceAppointment(Guid recurringId) {
+    private HiveDowntime CreateDowntime(DateTime startDate, DateTime endDate, bool allDay, DowntimeType downtimeType) {
+      HiveDowntime downtime = new HiveDowntime();
+      downtime.StartDate = startDate;
+      downtime.EndDate = endDate;
+      downtime.AllDayEvent = allDay;
+      downtime.BorderColor = Color.Red;
+      downtime.Locked = true;
+      downtime.Subject = downtimeType.ToString();
+      downtime.Recurring = false;
+      return downtime;
+    }
+
+    private HiveDowntime CreateDowntime(DateTime startDate, DateTime endDate, bool allDay, bool recurring, Guid recurringId, DowntimeType downtimeType) {
+      HiveDowntime downtime = new HiveDowntime();
+      downtime.StartDate = startDate;
+      downtime.EndDate = endDate;
+      downtime.AllDayEvent = allDay;
+      downtime.BorderColor = Color.Red;
+      downtime.Locked = true;
+      downtime.Subject = downtimeType.ToString();
+      downtime.Recurring = recurring;
+      downtime.RecurringId = recurringId;
+      return downtime;
+    }
+
+    private void DeleteRecurringDowntime(Guid recurringId) {
+      foreach (HiveDowntime downtime in offlineTimes) {
+        if (downtime.RecurringId == recurringId) {
+          downtime.Deleted = true;
+        }
+      }
+    }
+
+    private void ChangeRecurrenceDowntime(Guid recurringId) {
       int hourfrom = int.Parse(txttimeFrom.Text.Substring(0, txttimeFrom.Text.IndexOf(':')));
       int hourTo = int.Parse(txttimeTo.Text.Substring(0, txttimeTo.Text.IndexOf(':')));
-      List<HiveAppointment> recurringAppointments = offlineTimes.Where(appointment => ((HiveAppointment)appointment).RecurringId == recurringId).ToList();
-      recurringAppointments.ForEach(appointment => appointment.StartDate = new DateTime(appointment.StartDate.Year, appointment.StartDate.Month, appointment.StartDate.Day, hourfrom, 0, 0));
-      recurringAppointments.ForEach(appointment => appointment.EndDate = new DateTime(appointment.EndDate.Year, appointment.EndDate.Month, appointment.EndDate.Day, hourTo, 0, 0));
-
-      DeleteRecurringAppointment(recurringId);
-      offlineTimes.AddRange(recurringAppointments);
+      List<HiveDowntime> recurringDowntimes = offlineTimes.Where(appointment => ((HiveDowntime)appointment).RecurringId == recurringId).ToList();
+      recurringDowntimes.ForEach(appointment => appointment.StartDate = new DateTime(appointment.StartDate.Year, appointment.StartDate.Month, appointment.StartDate.Day, hourfrom, 0, 0));
+      recurringDowntimes.ForEach(appointment => appointment.EndDate = new DateTime(appointment.EndDate.Year, appointment.EndDate.Month, appointment.EndDate.Day, hourTo, 0, 0));
     }
 
     public void DialogClosed(RecurrentEvent e) {
-      CreateDailyRecurrenceAppointments(e.DateFrom, e.DateTo, e.AllDay, e.WeekDays);
-    }
-
-    private void CreateDailyRecurrenceAppointments(DateTime dateFrom, DateTime dateTo, bool allDay, HashSet<DayOfWeek> daysOfWeek) {
+      CreateDailyRecurrenceDowntimes(e.DateFrom, e.DateTo, e.AllDay, e.WeekDays, e.DowntimeType);
+    }
+
+    private void CreateDailyRecurrenceDowntimes(DateTime dateFrom, DateTime dateTo, bool allDay, HashSet<DayOfWeek> daysOfWeek, DowntimeType appointmentType) {
       DateTime incDate = dateFrom;
       Guid guid = Guid.NewGuid();
@@ -179 +173 @@
       while (incDate.Date <= dateTo.Date) {
         if (daysOfWeek.Contains(incDate.Date.DayOfWeek))
-          offlineTimes.Add(CreateAppointment(incDate, new DateTime(incDate.Year, incDate.Month, incDate.Day, dateTo.Hour, dateTo.Minute, 0), allDay, true, guid));
+          offlineTimes.Add(CreateDowntime(incDate, new DateTime(incDate.Year, incDate.Month, incDate.Day, dateTo.Hour, dateTo.Minute, 0), allDay, true, guid, appointmentType));
         incDate = incDate.AddDays(1);
       }
@@ -187 +181 @@
 
     private void btbDelete_Click(object sender, EventArgs e) {
-      HiveAppointment selectedAppointment = (HiveAppointment)dvOnline.SelectedAppointment;
+      HiveDowntime selectedDowntime = (HiveDowntime)dvOnline.SelectedAppointment;
       if (dvOnline.SelectedAppointment != null) {
-        if (!selectedAppointment.Recurring)
-          DeleteAppointment();
+        if (!selectedDowntime.Recurring)
+          DeleteDowntime();
         else {
           DialogResult res = MessageBox.Show("Delete all events in this series?", "Delete recurrences", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
           if (res != DialogResult.Yes)
-            DeleteAppointment();
+            DeleteDowntime();
           else
-            DeleteRecurringAppointment(selectedAppointment.RecurringId);
-        }
-      }
-      dvOnline.Invalidate();
-    }
-
-    private void DeleteAppointment() {
+            DeleteRecurringDowntime(selectedDowntime.RecurringId);
+        }
+      }
+      dvOnline.Invalidate();
+    }
+
+    private void DeleteDowntime() {
       try {
-        HiveAppointment app = offlineTimes.First(s => s.Equals((HiveAppointment)dvOnline.SelectedAppointment));
-        app.Deleted = true;
+        HiveDowntime downtime = offlineTimes.First(s => s.Equals((HiveDowntime)dvOnline.SelectedAppointment));
+        downtime.Deleted = true;
       }
       catch (InvalidOperationException) {
@@ -242 +236 @@
 
     private void btnClearCal_Click(object sender, System.EventArgs e) {
-      foreach (HiveAppointment app in offlineTimes) {
+      foreach (HiveDowntime app in offlineTimes) {
         app.Deleted = true;
       }
@@ -259 +253 @@
         txttimeFrom.Text = dvOnline.SelectionStart.ToShortTimeString();
         txttimeTo.Text = dvOnline.SelectionEnd.ToShortTimeString();
-        btCreate.Text = "Create Appointment";
+        btCreate.Text = "Create Downtime";
       }
 
@@ -274 +268 @@
       if (dvOnline.Selection == SelectionType.None) {
         //also change the caption of the save button
-        btCreate.Text = "Create Appointment";
+        btCreate.Text = "Create Downtime";
       }
     }
@@ -284 +278 @@
     private void btCreate_Click(object sender, EventArgs e) {
       if (dvOnline.Selection != SelectionType.Appointment) {
-        CreateAppointment();
+        DowntimeType dtType;
+        DialogResult result;
+        DowntimeTypeDialog dialog = new DowntimeTypeDialog();
+        result = dialog.ShowDialog(this);
+        dtType = dialog.AppointmentType;
+        dialog.Dispose();
+        if (result == DialogResult.Cancel) return;
+        CreateDowntime(dtType);
       } else {
         //now we want to change an existing appointment
         if (!dvOnline.SelectedAppointment.Recurring) {
-          if (CreateAppointment())
-            DeleteAppointment();
+          if (CreateDowntime(GetDowntimeTypeOfSelectedDowntime()))
+            DeleteDowntime();
         } else {
           //change recurring appointment
@@ -295 +296 @@
           DialogResult res = MessageBox.Show("Change all events in this series?", "Change recurrences", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
           if (res != DialogResult.Yes) {
-            if (CreateAppointment())
-              DeleteAppointment();
+            if (CreateDowntime(GetDowntimeTypeOfSelectedDowntime()))
+              DeleteDowntime();
           } else
-            ChangeRecurrenceAppointment(((HiveAppointment)dvOnline.SelectedAppointment).RecurringId);
+            ChangeRecurrenceDowntime(((HiveDowntime)dvOnline.SelectedAppointment).RecurringId);
         }
       }
@@ -312 +313 @@
     private void btnSaveCal_Click(object sender, EventArgs e) {
       if (HiveAdminClient.Instance.DowntimeForResourceId == null || HiveAdminClient.Instance.DowntimeForResourceId == Guid.Empty) {
-        MessageBox.Show("You have to save the goup before you can save the schedule. ", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Stop);
+        MessageBox.Show("You have to save the group before you can save the schedule. ", "HeuristicLab Hive Administrator", MessageBoxButtons.OK, MessageBoxIcon.Stop);
       } else {
-        List<Downtime> appointments = new List<Downtime>();
-        foreach (HiveAppointment app in offlineTimes) {
-          if (app.Deleted && app.Id != Guid.Empty) {
-            HiveAdminClient.Delete(ToDowntime(app));
-          } else if (app.Changed || app.Id == null || app.Id == Guid.Empty) {
-            Downtime dt = ToDowntime(app);
-            appointments.Add(dt);
+        List<Downtime> downtimes = new List<Downtime>();
+        foreach (HiveDowntime downtime in offlineTimes) {
+          if (downtime.Deleted && downtime.Id != Guid.Empty) {
+            HiveAdminClient.Delete(ToDowntime(downtime));
+          } else if (downtime.Changed || downtime.Id == null || downtime.Id == Guid.Empty) {
+            Downtime dt = ToDowntime(downtime);
+            downtimes.Add(dt);
           }
         }
-        foreach (Downtime dt in appointments) {
+        foreach (Downtime dt in downtimes) {
           dt.Store();
         }
@@ -329 +330 @@
     }
 
-    private HiveAppointment ToHiveAppointment(Downtime downtime) {
-      HiveAppointment app = new HiveAppointment {
+    private HiveDowntime ToHiveDowntime(Downtime downtime) {
+      HiveDowntime hiveDowntime = new HiveDowntime {
         AllDayEvent = downtime.AllDayEvent,
         EndDate = downtime.EndDate,
@@ -339 +340 @@
         BorderColor = Color.Red,
         Locked = true,
-        Subject = "Offline",
+        Subject = downtime.DowntimeType.ToString(),
         Changed = downtime.Modified,
         Id = downtime.Id
       };
-      return app;
-    }
-
-    private Downtime ToDowntime(HiveAppointment app) {
+      return hiveDowntime;
+    }
+
+    private Downtime ToDowntime(HiveDowntime hiveDowntime) {
       Downtime downtime = new Downtime {
-        AllDayEvent = app.AllDayEvent,
-        EndDate = app.EndDate,
-        StartDate = app.StartDate,
-        Recurring = app.Recurring,
-        RecurringId = app.RecurringId,
+        AllDayEvent = hiveDowntime.AllDayEvent,
+        EndDate = hiveDowntime.EndDate,
+        StartDate = hiveDowntime.StartDate,
+        Recurring = hiveDowntime.Recurring,
+        RecurringId = hiveDowntime.RecurringId,
         ResourceId = HiveAdminClient.Instance.DowntimeForResourceId,
-        Id = app.Id
+        Id = hiveDowntime.Id,
+        DowntimeType = (DowntimeType)Enum.Parse(typeof(DowntimeType), hiveDowntime.Subject)
       };
       return downtime;
     }
+
+    private DowntimeType GetDowntimeTypeOfSelectedDowntime() {
+      return (DowntimeType)Enum.Parse(typeof(DowntimeType), ((HiveDowntime)dvOnline.SelectedAppointment).Subject);
+    }
   }
 }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages