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

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

File:

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

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

@@ -55 +55 @@
     private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
     private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
+    private readonly Color selectedBackColor = Color.DodgerBlue;
+    private readonly Color selectedForeColor = Color.White;
+    private readonly Color grayTextColor = SystemColors.GrayText;
 
     private HashSet<Resource> projectExclusiveResources = new HashSet<Resource>();
@@ -83 +86 @@
         UpdateAssignedResources();
         UpdateIncludedResources();
-        var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+        var top = BuildResourceTree();
         detailsViewHost.Content = top;
         detailsViewHost.Locked = true;
@@ -108 +111 @@
       UpdateAssignedResources();
       UpdateIncludedResources();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
@@ -130 +133 @@
     }
 
+    private void treeView_BeforeSelect(object sender, TreeViewCancelEventArgs e) {
+      if (e.Node == null || e.Node == ungroupedGroupNode)
+        e.Cancel = true;
+
+      var selectedResource = (Resource)e.Node.Tag;
+      if(HiveAdminClient.Instance.DisabledParentResources.Contains(selectedResource))
+        e.Cancel = true;
+    }
+
     private void treeView_AfterSelect(object sender, TreeViewEventArgs e) {
       var selectedResource = (Resource)e.Node.Tag;
@@ -136 +148 @@
 
     private void treeView_BeforeCheck(object sender, TreeViewCancelEventArgs e) {
+      if (e.Node == null || e.Node == ungroupedGroupNode) {
+        e.Cancel = true;
+        return;
+      }
+        
       var checkedResource = (Resource)e.Node.Tag;
-      if (newIncludedResources.Contains(checkedResource) || checkedResource.Id == Guid.Empty || e.Node == ungroupedGroupNode) {
+      if (checkedResource == null
+        || checkedResource.Id == Guid.Empty
+        || HiveAdminClient.Instance.DisabledParentResources.Contains(checkedResource) 
+        || newIncludedResources.Contains(checkedResource)) {
         e.Cancel = true;
       } else if (!HiveRoles.CheckAdminUserPermissions()) {
@@ -164 +184 @@
       UpdateIncludedResources();
 
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
@@ -171 +191 @@
       UpdateNewAssignedResources();
       UpdateNewIncludedResources();
-      var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
+      var top = BuildResourceTree();
       detailsViewHost.Content = top;
     }
@@ -191 +211 @@
       // look up for assignments of ancestor projects
       var projectIds = new HashSet<Guid>();
-      HiveClient.Instance.GetAvailableProjectAncestors(projectId).ToList().ForEach(x => projectIds.Add(x.Id));
+      HiveAdminClient.Instance.GetAvailableProjectAncestors(projectId).ToList().ForEach(x => projectIds.Add(x.Id));
 
       var ancestorProjectResources = resources.Where(x => 
@@ -278 +298 @@
     }
 
-    private Resource BuildResourceTree(IEnumerable<Resource> resources) {
+    private Resource BuildResourceTree() {
       treeView.Nodes.Clear();
-      if (!resources.Any()) return null;
 
       treeView.BeforeCheck -= treeView_BeforeCheck;
       treeView.AfterCheck -= treeView_AfterCheck;
 
-      resources = GetAvailableResourcesForProjectAdministration(Content.Id);
-
+      var resources = GetAvailableResourcesForProjectAdministration(Content.Id);
+
+      var disabledParentResources = HiveAdminClient.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 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 stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
+      
       Resource top = null;
+      //bool nodeSelected = false;
+      if (detailsViewHost != null && detailsViewHost.Content != null && detailsViewHost.Content is Resource) {
+        var resourceId = ((Resource)detailsViewHost.Content).Id;
+        top = resources.Where(x => x.Id == resourceId).FirstOrDefault();
+      }
+      
 
       TreeNode currentNode = null;
@@ -305 +334 @@
 
       while (stack.Any()) {
-        if(top == null)  top = stack.Peek();
         var newResource = stack.Pop();
         var newNode = new TreeNode(newResource.Name) { Tag = newResource };
+
+        if(top == null && !disabledParentResources.Contains(newResource)) {
+          top = newResource;
+        }
+
+        //if(!nodeSelected && top != null && newResource.Id == top.Id) {
+        //  newNode.BackColor = selectedBackColor;
+        //  newNode.ForeColor = selectedForeColor;
+        //  nodeSelected = true;
+        //}
 
         // search for parent node of newNode and save in currentNode
@@ -323 +361 @@
         }
 
-        if (newAssignedResources.Contains(newResource)) {
+        if (disabledParentResources.Contains(newResource)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
+        } else if (newAssignedResources.Contains(newResource)) {
           newNode.Checked = true;
           if(!HiveRoles.CheckAdminUserPermissions()) {
@@ -398 +439 @@
       treeView.BeforeCheck += treeView_BeforeCheck;
       treeView.AfterCheck += treeView_AfterCheck;
-      treeView.ExpandAll();
+      
+      ExpandResourceNodesOfInterest(treeView.Nodes);
 
       return top;
+    }
+
+    private void ExpandResourceNodesOfInterest(TreeNodeCollection nodes) {
+      foreach (TreeNode n in nodes) {
+        Resource r = (Resource)n.Tag;
+        if (n.Nodes.Count > 0) {
+          if (HiveAdminClient.Instance.GetAvailableResourceDescendants(r.Id).OfType<SlaveGroup>().Any()) {
+            n.Expand();
+            ExpandResourceNodesOfInterest(n.Nodes);
+          } else {
+            n.Collapse();
+          }
+        } else {
+          n.Collapse();
+        }
+      }
     }