Changeset 15978 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator

Timestamp:

07/02/18 15:51:17 (6 years ago)

Author:

jzenisek

Message:

#2839: applied several fixes:

• show full project-path in project/resource selector
• handle lost of project-ownership by not withdrawing permissions
• update automatically after hand-down save
• lock jobs for which statistics/deletion is pending
• lock the disabled checkbox in ProjectResourcesView...

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ProjectJobsView.cs (modified) (2 diffs)
• ProjectPermissionsView.cs (modified) (1 diff)
• ProjectResourcesView.cs (modified) (1 diff)
• ResourcesView.Designer.cs (modified) (1 diff)
• ResourcesView.cs (modified) (1 diff)
• ScheduleView.cs (modified) (1 diff)
• SlaveView.cs (modified) (1 diff)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs

@@ -144 +144 @@
 
     private StringMatrix CreateValueMatrix() {
+      if (Content == null || Content.Id == Guid.Empty)
+        return new StringMatrix();
+
       var jobs = HiveAdminClient.Instance.Jobs[Content.Id];
       var resources = HiveAdminClient.Instance.Resources;
@@ -172 +175 @@
       if (InvokeRequired) Invoke((Action)UpdateJobs);
       else {
-        StringMatrix matrix = null;
-        if(Content != null) {
-          matrix = CreateValueMatrix();
+        if(Content != null && Content.Id != null && Content.Id != Guid.Empty) {
+          var matrix = CreateValueMatrix();
+          matrixView.Content = matrix;
+          if(matrix != null) {
+            foreach (DataGridViewRow row in matrixView.DataGridView.Rows) {
+              string val = ((string)row.Cells[0].Value);
+              if (val == JobState.Online.ToString()) {
+                row.DefaultCellStyle.BackColor = onlineStatusColor;
+              } else if (val == JobState.StatisticsPending.ToString()) {
+                row.DefaultCellStyle.BackColor = statisticsPendingStatusColor;
+              } else if (val == JobState.DeletionPending.ToString()) {
+                row.DefaultCellStyle.BackColor = deletionPendingStatusColor;
+              }
+            }
+
+            matrixView.DataGridView.AutoResizeColumns();
+            matrixView.DataGridView.Columns[0].MinimumWidth = 90;
+            matrixView.DataGridView.Columns[1].MinimumWidth = 108;
+          }
         } else {
           refreshButton.Enabled = false;
           removeButton.Enabled = false;
-        }
-        matrixView.Content = matrix;
-        
-        foreach(DataGridViewRow row in matrixView.DataGridView.Rows) {
-          string val = ((string)row.Cells[0].Value);
-          if (val == JobState.Online.ToString()) {
-            row.DefaultCellStyle.BackColor = onlineStatusColor;
-          } else if(val == JobState.StatisticsPending.ToString()) {
-            row.DefaultCellStyle.BackColor = statisticsPendingStatusColor;
-          } else if(val == JobState.DeletionPending.ToString()) {
-            row.DefaultCellStyle.BackColor = deletionPendingStatusColor;
-          }
-        }
-
-        matrixView.DataGridView.AutoResizeColumns();
-        matrixView.DataGridView.Columns[0].MinimumWidth = 90;
-        matrixView.DataGridView.Columns[1].MinimumWidth = 108;
+          matrixView.Content = null;
+        }
       }
     }

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

@@ -143 +143 @@
     #region Helpers
     private void UpdatePermissionList() {
+      AccessClient.Instance.Refresh();
+
       UpdateUserGroupGenealogy();
       UpdateAssignedPermissions();

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -117 +117 @@
           SetAssignedProjectResources(Content.Id, newAssignedResources.Select(x => x.Id), false, true, false);
         });
+      HiveAdminClient.Instance.Refresh();
       UpdateResourceTree();
     }

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

@@ -198 +198 @@
       this.viewHost.Caption = "View";
       this.viewHost.Content = null;
-      this.viewHost.Enabled = false;
+      this.viewHost.Enabled = true;
       this.viewHost.Location = new System.Drawing.Point(6, 6);
       this.viewHost.Name = "viewHost";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

@@ -123 +123 @@
       btnRemoveGroup.Enabled = !locked;
       btnSave.Enabled = !locked;
-      viewHost.Locked = locked;
+      viewHost.Enabled = true;
+      //viewHost.Locked = locked;
+      viewHost.Locked = false;
+      viewHost.ReadOnly = false;
       scheduleView.Locked = locked;
-      scheduleView.SetEnabledStateOfSchedule(!scheduleLocked);
+      //scheduleView.SetEnabledStateOfSchedule(!scheduleLocked);
     }
     #endregion

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

@@ -234 +234 @@
     }
 
-    public virtual void SetEnabledStateOfSchedule(bool state) {
-      if (InvokeRequired) {
-        Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
-      } else {
-        if (Content == null || Locked || ReadOnly) state = false;
-        //groupBox1.Enabled = state;
-        btnClearCal.Enabled = state;
-        btnSaveCal.Enabled = state;
-      }
-    }
+    //public virtual void SetEnabledStateOfSchedule(bool state) {
+    //  if (InvokeRequired) {
+    //    Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
+    //  } else {
+    //    if (Content == null || Locked || ReadOnly) state = false;
+    //    //groupBox1.Enabled = state;
+    //    btnClearCal.Enabled = state;
+    //    btnSaveCal.Enabled = state;
+    //  }
+    //}
 
     private void btnClearCal_Click(object sender, System.EventArgs e) {

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

@@ -60 +60 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      disposableCheckBox.Enabled = Content != null;
+      bool enabled = Content != null && !Locked;
+      disposableCheckBox.Enabled = enabled;
     }
     #endregion