Changeset 15792 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

Timestamp:

02/20/18 14:32:16 (6 years ago)

Author:

jzenisek

Message:

#2839 preliminary integration of several HiveAdministrator related improvements from #2877 (full merge pending)

• slaves and slave groups are sorted by name
• slave state is indicated by different colors
• number of contained slaves is shown for each group
• CPU utilization is shown for each calculating slave
• last heartbeat date is shown for each offline slave

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (6 diffs)

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

@@ -250 +250 @@
       if (result == DialogResult.Yes) {
         await SecurityExceptionUtil.TryAsyncAndReportSecurityExceptions(
-          action: () => RemoveProject(selectedProject),
+          action: () => {
+            RemoveProject(selectedProject);  
+          },
           finallyCallback: () => {
             removeButton.Enabled = true;
@@ -358 +360 @@
 
     #region Helpers
-    private void ResetTreeNodes(TreeNodeCollection nodes, Color c1, Color c2, bool resetText) {
-      foreach (TreeNode n in nodes) {
-        var pro = ((Project)n.Tag);
-        if (n.BackColor.Equals(c1)) {
-          n.BackColor = c2;
-        }
-        if (resetText) {
-          n.Text = pro.Name;
-
-          if (pro.Id == Guid.Empty) {
-            n.Text += " [not stored]";
-          } else if (pro.Modified) {
-            n.Text += " [changes not stored]";
-          }
-        }
-        if (n.Nodes.Count > 0) {
-          ResetTreeNodes(n.Nodes, c1, c2, resetText);
-        }
-      }
-    }
-
-    private void ChangeSelectedProject(Project project) {
-      projectView.Content = project;
-      projectPermissionsView.Content = project;
-      projectResourcesView.Content = project;
-
-      bool locked = project == null || (project != null && project.Id == Guid.Empty);
-      addButton.Enabled = !locked;
-      projectPermissionsView.Locked = locked;
-      projectResourcesView.Locked = locked;
-      selectedProject = project;
-    }
-
-    private void ChangeSelectedProjectNode(TreeNode projectNode) {
-      if (projectNode == null) return;
-      SelectedProject = (Project)projectNode.Tag;
-      ResetTreeNodes(projectsTreeView.Nodes, selectedColor, Color.Transparent, true);
-      projectNode.BackColor = selectedColor;
-      projectNode.Text += " [selected]";
-    }
-
     private void BuildProjectTree(IEnumerable<Project> projects) {
       projectsTreeView.Nodes.Clear();
@@ -407 +368 @@
         .Where(x => x.ParentProjectId.HasValue
         && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)));
-            mainProjects.UnionWith(parentedMainProjects);
+      mainProjects.UnionWith(parentedMainProjects);
       var subProbjects = new HashSet<Project>(projects.Except(mainProjects));
 
@@ -416 +377 @@
       TreeNode currentNode = null;
       Project currentProject = null;
-      
+
       while (stack.Any()) {
         var newProject = stack.Pop();
         var newNode = new TreeNode(newProject.Name) { Tag = newProject };
-
-        if (newProject.Id == Guid.Empty) {
-          newNode.Text += " [not stored]";
-        } else if(newProject.Modified) {
-          newNode.Text += " [changes not stored]";
-        }
+        StyleTreeNode(newNode, newProject);
+      
         if (selectedProject == null) {
           SelectedProject = newProject;
@@ -467 +424 @@
     }
 
+    private void StyleTreeNode(TreeNode n, Project p) {
+      n.Text = p.Name;
+      n.BackColor = Color.Transparent;
+      n.ForeColor = Color.Black;
+
+      if (p.Id == Guid.Empty) {
+        n.Text += " [not stored]";
+      } else if (p.Modified) {
+        n.Text += " [changes not stored]";
+      }
+    }
+
+    private void ResetTreeNodes(TreeNodeCollection nodes) {
+      foreach (TreeNode n in nodes) {
+        StyleTreeNode(n, (Project)n.Tag);
+        if (n.Nodes.Count > 0) {
+          ResetTreeNodes(n.Nodes);
+        }
+      }
+    }
+
+    private void ChangeSelectedProject(Project project) {
+      projectView.Content = project;
+      projectPermissionsView.Content = project;
+      projectResourcesView.Content = project;
+
+      bool locked = project == null || (project != null && project.Id == Guid.Empty);
+      addButton.Enabled = !locked;
+      projectPermissionsView.Locked = locked;
+      projectResourcesView.Locked = locked;
+      selectedProject = project;
+    }
+
+    private void ChangeSelectedProjectNode(TreeNode projectNode) {
+      if (projectNode == null) return;
+      SelectedProject = (Project)projectNode.Tag;
+      ResetTreeNodes(projectsTreeView.Nodes);
+      projectNode.BackColor = selectedColor;
+      projectNode.Text += " [selected]";
+    }
+
     private void UpdateProjects() {
       try {
@@ -480 +478 @@
 
       try {
-        if(project.Id != Guid.Empty) HiveAdminClient.Delete(project);
-        Content.Remove(selectedProject);
+        if (project.Id != Guid.Empty) {
+          var projectsToSave = Content.Where(x => x.Id == Guid.Empty || x.Modified);
+          foreach (var p in projectsToSave)
+            p.Store();
+          HiveAdminClient.Delete(project);
+          UpdateProjects();
+        } else {
+          Content.Remove(project);
+        }
       } catch (AnonymousUserException) {
         ShowHiveInformationDialog();