Changeset 15995 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager

Timestamp:

07/19/18 13:37:32 (6 years ago)

Author:

jzenisek

Message:

#2839: adapted illustration of project and resource ancestry in HiveAdministrator and HiveJobAdministrator

Location:

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

Files:

• HiveResourceSelector.Designer.cs (modified) (1 diff)
• HiveResourceSelector.cs (modified) (8 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.Designer.cs

@@ -165 +165 @@
       this.resourcesTreeView.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.resourcesTreeView_AfterCheck);
       this.resourcesTreeView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.resourcesTreeView_MouseDown);
+      this.resourcesTreeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.resourcesTreeView_BeforeSelect);
       // 
       // summaryGroupBox

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs

@@ -53 +53 @@
     private const string REMOVED_INCLUDE_TAG = " [removed include]";
 
+    private TreeNode additionalNode;
+
     private readonly HashSet<TreeNode> mainTreeNodes = new HashSet<TreeNode>();
     private readonly HashSet<TreeNode> filteredTreeNodes = new HashSet<TreeNode>();
-    private readonly HashSet<TreeNode> nodeStore = new HashSet<TreeNode>();
 
     private readonly HashSet<Resource> availableResources = new HashSet<Resource>();
@@ -262 +263 @@
       var node = resourcesTreeView.GetNodeAt(new Point(e.X, e.Y));
 
-      if (node == null) {
+      if (node == null || node == additionalNode) {
         resourcesTreeView.SelectedNode = null;
         ExtractStatistics();
       } else {
-        ExtractStatistics((Resource)node.Tag);
-      }
+        var r = (Resource)node.Tag;
+        if (!HiveClient.Instance.DisabledParentResources.Contains(r)) {
+          ExtractStatistics((Resource)node.Tag);
+        } else {
+          resourcesTreeView.SelectedNode = null;
+          ExtractStatistics();
+        } 
+      }
+    }
+
+    private void resourcesTreeView_BeforeSelect(object sender, TreeViewCancelEventArgs e) {
+      if(e.Node == null || e.Node == additionalNode) {
+        e.Cancel = true;
+      } else {
+        var r = (Resource)e.Node.Tag;
+        if(r == null || HiveClient.Instance.DisabledParentResources.Contains(r)) {
+          e.Cancel = true;
+        }
+      }
+
     }
 
     private void resourcesTreeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
-      var checkedResource = (Resource)e.Node.Tag;
-      if (newIncludedResources.Contains(checkedResource) || checkedResource.Id == Guid.Empty) {
+      if(e.Node == null || e.Node == additionalNode) {
         e.Cancel = true;
-        ExtractStatistics((Resource)resourcesTreeView.SelectedNode?.Tag);
+      } else {
+        var checkedResource = (Resource)e.Node.Tag;
+        if (checkedResource == null
+          || checkedResource.Id == Guid.Empty
+          || HiveClient.Instance.DisabledParentResources.Contains(checkedResource)
+          || newIncludedResources.Contains(checkedResource)) {
+          e.Cancel = true;
+          ExtractStatistics((Resource)resourcesTreeView.SelectedNode?.Tag);
+        }
       }
     }
@@ -330 +356 @@
       //  && !projects.SelectMany(y => HiveClient.Instance.ProjectAncestors[y.Id]).Contains(x.ParentProjectId.Value)));
       //mainProjects.UnionWith(parentedMainProjects);
-      var mainDisabledParentProjects = new HashSet<Project>(disabledParentProjects.Where(x => x.ParentProjectId == null));
+      var mainDisabledParentProjects = new HashSet<Project>(disabledParentProjects.Where(x => x.ParentProjectId == null || x.ParentProjectId == Guid.Empty));
       mainProjects.UnionWith(mainDisabledParentProjects);
       var subProbjects = new HashSet<Project>(projects.Union(disabledParentProjects).Except(mainProjects));
@@ -518 +544 @@
       resourcesTreeView.AfterCheck -= resourcesTreeView_AfterCheck;
 
+      var disabledParentResources = HiveClient.Instance.DisabledParentResources;
       var mainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>().Where(x => x.ParentResourceId == null));
-      var parentedMainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
-        .Where(x => x.ParentResourceId.HasValue && !resources.Select(y => y.Id).Contains(x.ParentResourceId.Value)));
-      mainResources.UnionWith(parentedMainResources);
-      var subResources = new HashSet<Resource>(resources.Except(mainResources));
+      //var parentedMainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
+      //  .Where(x => x.ParentResourceId.HasValue && !resources.Select(y => y.Id).Contains(x.ParentResourceId.Value)));
+      //mainResources.UnionWith(parentedMainResources);
+      //var subResources = new HashSet<Resource>(resources.Except(mainResources));
+      var mainDisabledParentResources = new HashSet<Resource>(disabledParentResources.Where(x => x.ParentResourceId == null || x.ParentResourceId == Guid.Empty));
+      mainResources.UnionWith(mainDisabledParentResources);
+      var subResources = new HashSet<Resource>(resources.Union(disabledParentResources).Except(mainResources).OrderByDescending(x => x.Name));
 
       var addedAssignments = newAssignedResources.Except(assignedResources);
@@ -552 +582 @@
         }
 
-        if (newAssignedResources.Select(x => x.Id).Contains(newResource.Id)) {
+        if (disabledParentResources.Contains(newResource)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
+        } else if (newAssignedResources.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.Checked = true;
           if(!addedAssignments.Select(x => x.Id).Contains(newResource.Id) && !removedAssignments.Select(x => x.Id).Contains(newResource.Id)) {
@@ -604 +637 @@
       if (singleSlaves.Any()) {
 
-        var additionalNode = new TreeNode(additionalSlavesGroupName) {
+        additionalNode = new TreeNode(additionalSlavesGroupName) {
           ForeColor = SystemColors.GrayText,
           Tag = new SlaveGroup() {
@@ -693 +726 @@
         var p = (Project)n.Tag;
         if(HiveClient.Instance.DisabledParentProjects.Select(x => x.Id).Contains(p.Id)) {
+          n.Checked = false;
+          n.ForeColor = grayTextColor;
+        }
+      } else if(n.Tag is Resource) {
+        var r = (Resource)n.Tag;
+        if(HiveClient.Instance.DisabledParentResources.Select(x => x.Id).Contains(r.Id) || n == additionalNode) {
+          n.Checked = false;
           n.ForeColor = grayTextColor;
         }
@@ -725 +765 @@
           n.ForeColor = Color.Black;
           n.Checked = false;
+
+          if (HiveClient.Instance.DisabledParentResources.Select(x => x.Id).Contains(resource.Id) || n == additionalNode) {
+            n.ForeColor = grayTextColor;
+          }
 
           // add additional info