Changeset 8953

Timestamp:

11/27/12 19:57:06 (11 years ago)

Author:

ascheibe

Message:

#1986 added the ui components for shutting down slaves

Location:

branches/SlaveShutdown

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/AppointmentTypeDialog.Designer.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/AppointmentTypeDialog.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/AppointmentTypeView.Designer.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/AppointmentTypeView.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (12 diffs)
• HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Downtime.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs (modified) (1 diff)

branches/SlaveShutdown/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

@@ -104 +104 @@
   <ItemGroup>
     <Compile Include="HiveRoles.cs" />
+    <Compile Include="Views\AppointmentTypeDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Views\AppointmentTypeDialog.Designer.cs">
+      <DependentUpon>AppointmentTypeDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Views\AppointmentTypeView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\AppointmentTypeView.Designer.cs">
+      <DependentUpon>AppointmentTypeView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\HiveAdministratorView.cs">
       <SubType>UserControl</SubType>

branches/SlaveShutdown/HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs

@@ -27 +27 @@
     public DateTime DateFrom { get; set; }
     public DateTime DateTo { get; set; }
-    public bool AllDay { get; set; }    
+    public bool AllDay { get; set; }
     public HashSet<DayOfWeek> WeekDays { get; set; }
+    public DowntimeType AppointmentType { get; set; }
   }
 }

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

@@ -63 +63 @@
       this.cbTuesday = new System.Windows.Forms.CheckBox();
       this.cbMonday = new System.Windows.Forms.CheckBox();
+      this.appointmentTypeView = new HeuristicLab.Clients.Hive.Administrator.Views.AppointmentTypeView();
+      this.gbDowntimeType = new System.Windows.Forms.GroupBox();
       this.gbAppointment.SuspendLayout();
       this.gbWeekly.SuspendLayout();
+      this.gbDowntimeType.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -149 +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);
@@ -159 +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);
@@ -253 +256 @@
       this.cbMonday.UseVisualStyleBackColor = true;
       // 
+      // appointmentTypeView
+      // 
+      this.appointmentTypeView.AppointmentType = 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);
@@ -263 +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);
 
@@ -294 +318 @@
     private System.Windows.Forms.CheckBox cbTuesday;
     private System.Windows.Forms.CheckBox cbMonday;
+    private AppointmentTypeView appointmentTypeView;
+    private System.Windows.Forms.GroupBox gbDowntimeType;
   }
 }

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

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

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

@@ -91 +91 @@
     }
 
-    private bool CreateAppointment() {
+    private bool CreateAppointment(DowntimeType dtType) {
       DateTime from, to;
 
@@ -98 +98 @@
           //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(CreateAppointment(from, to.AddDays(1), true, dtType));
           else
             MessageBox.Show("Incorrect date format", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -105 +105 @@
           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(CreateAppointment(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(CreateAppointment(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(CreateAppointment(from, new DateTime(from.Year, from.Month, from.Day, to.Hour, to.Minute, 0, 0), false, dtType));
             }
           } else
@@ -125 +125 @@
     }
 
-    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay) {
+    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay, DowntimeType downtimeType) {
       HiveAppointment app = new HiveAppointment();
       app.StartDate = startDate;
@@ -132 +132 @@
       app.BorderColor = Color.Red;
       app.Locked = true;
-      app.Subject = "Offline";
+      app.Subject = downtimeType.ToString();
       app.Recurring = false;
       return app;
     }
 
-    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay, bool recurring, Guid recurringId) {
+    private HiveAppointment CreateAppointment(DateTime startDate, DateTime endDate, bool allDay, bool recurring, Guid recurringId, DowntimeType downtimeType) {
       HiveAppointment app = new HiveAppointment();
       app.StartDate = startDate;
@@ -144 +144 @@
       app.BorderColor = Color.Red;
       app.Locked = true;
-      app.Subject = "Offline";
+      app.Subject = downtimeType.ToString();
       app.Recurring = recurring;
       app.RecurringId = recurringId;
@@ -164 +164 @@
       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);
     }
 
     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) {
+      CreateDailyRecurrenceAppointments(e.DateFrom, e.DateTo, e.AllDay, e.WeekDays, e.AppointmentType);
+    }
+
+    private void CreateDailyRecurrenceAppointments(DateTime dateFrom, DateTime dateTo, bool allDay, HashSet<DayOfWeek> daysOfWeek, DowntimeType appointmentType) {
       DateTime incDate = dateFrom;
       Guid guid = Guid.NewGuid();
@@ -179 +176 @@
       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(CreateAppointment(incDate, new DateTime(incDate.Year, incDate.Month, incDate.Day, dateTo.Hour, dateTo.Minute, 0), allDay, true, guid, appointmentType));
         incDate = incDate.AddDays(1);
       }
@@ -284 +281 @@
     private void btCreate_Click(object sender, EventArgs e) {
       if (dvOnline.Selection != SelectionType.Appointment) {
-        CreateAppointment();
+        DowntimeType dtType;
+        DialogResult result;
+        AppointmentTypeDialog dialog = new AppointmentTypeDialog();
+        result = dialog.ShowDialog(this);
+        dtType = dialog.AppointmentType;
+        dialog.Dispose();
+        if (result == DialogResult.Cancel) return;
+        CreateAppointment(dtType);
       } else {
         //now we want to change an existing appointment
         if (!dvOnline.SelectedAppointment.Recurring) {
-          if (CreateAppointment())
+          if (CreateAppointment(GetDowntimeTypeOfSelectedAppointment()))
             DeleteAppointment();
         } else {
@@ -295 +299 @@
           DialogResult res = MessageBox.Show("Change all events in this series?", "Change recurrences", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
           if (res != DialogResult.Yes) {
-            if (CreateAppointment())
+            if (CreateAppointment(GetDowntimeTypeOfSelectedAppointment()))
               DeleteAppointment();
           } else
@@ -339 +343 @@
         BorderColor = Color.Red,
         Locked = true,
-        Subject = "Offline",
+        Subject = downtime.DowntimeType.ToString(),
         Changed = downtime.Modified,
         Id = downtime.Id
@@ -354 +358 @@
         RecurringId = app.RecurringId,
         ResourceId = HiveAdminClient.Instance.DowntimeForResourceId,
-        Id = app.Id
+        Id = app.Id,
+        DowntimeType = (DowntimeType)Enum.Parse(typeof(DowntimeType), app.Subject)
       };
       return downtime;
     }
+
+    private DowntimeType GetDowntimeTypeOfSelectedAppointment() {
+      return (DowntimeType)Enum.Parse(typeof(DowntimeType), ((HiveAppointment)dvOnline.SelectedAppointment).Subject);
+    }
   }
 }

branches/SlaveShutdown/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -25 +25 @@
 using System.Threading;
 using System.Threading.Tasks;
-using HeuristicLab.Clients.Hive.SlaveCore.Properties;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -53 +52 @@
 
     public Core() {
-      var log = new ThreadSafeLog(Settings.Default.MaxLogCount);
+      var log = new ThreadSafeLog(SlaveCore.Properties.Settings.Default.MaxLogCount);
       this.pluginManager = new PluginManager(WcfService.Instance, log);
       this.taskManager = new TaskManager(pluginManager, log);
@@ -454 +453 @@
 
     private void ShutdownComputer() {
-      Shutdown();
-
-      try {
-        Process.Start(Settings.Default.ShutdownCommand);
-      }
-      catch (Exception ex) {
-        if (ServiceEventLog != null) {
-          EventLogManager.LogException(ex);
-        } else
-          throw ex;
-      }
+      var t = TS.Task.Factory.StartNew(new Action(Shutdown));
+      t.ContinueWith(c => {
+        try {
+          Process.Start(SlaveCore.Properties.Settings.Default.ShutdownCommand);
+        }
+        catch (Exception ex) {
+          if (ServiceEventLog != null) {
+            EventLogManager.LogException(ex);
+          } else
+            throw ex;
+        }
+      });
     }
 

branches/SlaveShutdown/HeuristicLab.Clients.Hive/3.3/ServiceClients/Downtime.cs

@@ -40 +40 @@
       this.ResourceId = original.ResourceId;
       this.StartDate = original.StartDate;
+      this.DowntimeType = original.DowntimeType;
     }
 

branches/SlaveShutdown/HeuristicLab.Services.Hive/3.3/Manager/HeartbeatManager.cs

@@ -154 +154 @@
 
     private bool ShutdownSlaveComputer(Guid slaveId) {
-      return dao.GetParentResources(slaveId).All(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Shutdown && DateTime.Now >= x.StartDate).Count() != 0);
+      return dao.GetParentResources(slaveId).Any(r => dao.GetDowntimes(x => x.ResourceId == r.Id && x.DowntimeType == DA.DowntimeType.Shutdown && (DateTime.Now >= x.StartDate) && (DateTime.Now <= x.EndDate)).Count() != 0);
     }
   }