Changeset 6943 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

Timestamp:

10/31/11 23:58:52 (13 years ago)

Author:

ascheibe

Message:

#1233 fixed a small bug in the Job Manager and the Administrator UI

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

@@ -39 +39 @@
 
     private void btSaveRecurrence_Click(object sender, EventArgs e) {
-      DateTime dateFrom, dateTo;            
+      DateTime dateFrom, dateTo;
       HashSet<DayOfWeek> days = new HashSet<DayOfWeek>();
 
@@ -45 +45 @@
 
       //check if valid
-      if (InputIsValid())
-      {   
-          dateFrom = DateTime.Parse(dtpStart.Text + " " + dtpFromTime.Text);
-          dateTo = DateTime.Parse(dtpEnd.Text + " " + dtpToTime.Text);
+      if (InputIsValid()) {
+        dateFrom = DateTime.Parse(dtpStart.Text + " " + dtpFromTime.Text);
+        dateTo = DateTime.Parse(dtpEnd.Text + " " + dtpToTime.Text);
 
-          RecurrentEvent recurrentEvent = new RecurrentEvent()
-          {
-              DateFrom = dateFrom,
-              DateTo = dateTo,
-              AllDay = chbade.Checked,
-              WeekDays = days              
-          };
+        RecurrentEvent recurrentEvent = new RecurrentEvent() {
+          DateFrom = dateFrom,
+          DateTo = dateTo,
+          AllDay = chbade.Checked,
+          WeekDays = days
+        };
 
-          //fire delegate and close the dialog
-          dialogClosedDelegate(recurrentEvent);
-          this.Close();
-      }
-      else
-      {
-          MessageBox.Show("Incorrect date format", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        //fire delegate and close the dialog
+        dialogClosedDelegate(recurrentEvent);
+        this.Close();
+      } else {
+        MessageBox.Show("Incorrect date format", "Schedule Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
       }
     }
@@ -90 +86 @@
 
     private bool InputIsValid() {
-      DateTime dateFrom, dateTo;      
+      DateTime dateFrom, dateTo;
 
       dateFrom = DateTime.Parse(dtpStart.Text + " " + dtpFromTime.Text);
       dateTo = DateTime.Parse(dtpEnd.Text + " " + dtpToTime.Text);
 
-      if (dateFrom < dateTo && dateFrom.TimeOfDay < dateTo.TimeOfDay)
+      if (chbade.Checked && dateFrom < dateTo) {
         return true;
-      else
-        return false;
+      }
+
+      if (!chbade.Checked && dateFrom < dateTo && dateFrom.TimeOfDay < dateTo.TimeOfDay) {
+        return true;
+      }
+
+      return false;
     }
   }