Changeset 15978 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3

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.JobManager/3.3/Views

Files:

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

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

@@ -147 +147 @@
       this.projectsTreeView.TabIndex = 3;
       this.projectsTreeView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.projectsTreeView_MouseDoubleClick);
+      this.projectsTreeView.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.projectsTreeView_BeforeSelect);
       this.projectsTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.projectsTreeView_AfterSelect);
       // 

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

@@ -227 +227 @@
     }
 
+    private void projectsTreeView_BeforeSelect(object sender, TreeViewCancelEventArgs e) {
+      var node = (Project)e.Node.Tag;
+      if (HiveClient.Instance.DisabledParentProjects.Contains(node)) {
+        e.Cancel = true;
+      }
+    }
+
     private void projectsTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
       var node = (Project)e.Node.Tag;
-      
+
       if (node == null) {
         projectsTreeView.SelectedNode = null;
+      } else if (HiveClient.Instance.DisabledParentProjects.Contains(node)) {
+        return;
       } else {
         ResetTreeNodes(projectsTreeView.Nodes);
         e.Node.BackColor = selectedBackColor;
         e.Node.ForeColor = selectedForeColor;
-        
-        if(node.Id == projectId) {
+
+        if (node.Id == projectId) {
           e.Node.Text += CURRENT_SELECTION_TAG;
-        } else if(projectId == null || projectId == Guid.Empty) {
+        } else if (projectId == null || projectId == Guid.Empty) {
           e.Node.Text += NEW_SELECTION_TAG;
         } else {
@@ -245 +254 @@
         }
 
-        
+
       }
       SelectedProject = node;
@@ -313 +322 @@
       if (!projects.Any()) return;
 
+      var disabledParentProjects = HiveClient.Instance.DisabledParentProjects;
       // select all top level projects (withouth parent, or without any ancestor within current project collection)
       var mainProjects = new HashSet<Project>(projects.Where(x => x.ParentProjectId == null));
-      var parentedMainProjects = new HashSet<Project>(projects
-        .Where(x => x.ParentProjectId.HasValue
-        && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)
-        && !projects.SelectMany(y => HiveClient.Instance.ProjectAncestors[y.Id]).Contains(x.ParentProjectId.Value)));
-      mainProjects.UnionWith(parentedMainProjects);
-      var subProbjects = new HashSet<Project>(projects.Except(mainProjects));
-      foreach(var p in subProbjects) {
-        p.ParentProjectId = HiveClient.Instance.ProjectAncestors[p.Id].Where(x => projects.Select(y => y.Id).Contains(x)).FirstOrDefault();
-      }
+      //var parentedMainProjects = new HashSet<Project>(projects
+      //  .Where(x => x.ParentProjectId.HasValue
+      //  && !projects.Select(y => y.Id).Contains(x.ParentProjectId.Value)
+      //  && !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));
+      mainProjects.UnionWith(mainDisabledParentProjects);
+      var subProbjects = new HashSet<Project>(projects.Union(disabledParentProjects).Except(mainProjects));
+      //foreach (var p in subProbjects) {
+      //  p.ParentProjectId = HiveClient.Instance.ProjectAncestors[p.Id].Where(x => projects.Select(y => y.Id).Contains(x)).FirstOrDefault();
+      //}
 
       var stack = new Stack<Project>(mainProjects.OrderByDescending(x => x.Name));
@@ -349 +361 @@
         newNode.SelectedImageIndex = newNode.ImageIndex;
 
-        if (SelectedProject != null && SelectedProject.Id.Equals(newProject.Id)) {
+        if(disabledParentProjects.Contains(newProject)) {
+          newNode.Checked = false;
+          newNode.ForeColor = grayTextColor;
+        }
+        else if (SelectedProject != null && SelectedProject.Id.Equals(newProject.Id)) {
           newNode.BackColor = selectedBackColor;
           newNode.ForeColor = selectedForeColor;
@@ -673 +689 @@
       n.BackColor = Color.Transparent;
       n.ForeColor = Color.Black;
+
+      if(n.Tag is Project) {
+        var p = (Project)n.Tag;
+        if(HiveClient.Instance.DisabledParentProjects.Select(x => x.Id).Contains(p.Id)) {
+          n.ForeColor = grayTextColor;
+        }
+      }
     }