Changeset 15627 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Timestamp:

01/17/18 15:20:29 (7 years ago)

Author:

jzenisek

Message:

#2839 worked on Hive Job Manager: improved project/resource selector to show existent assignments and preserve selections

Location:

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Files:

• ProjectResourcesView.cs (modified) (3 diffs)
• ProjectsView.cs (modified) (7 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

@@ -152 +152 @@
 
     private static IEnumerable<Resource> GetAssignedResourcesForProject(Guid projectId) {
-      var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProject(projectId));
+      var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProjectAdministration(projectId));
       return HiveAdminClient.Instance.Resources.Where(x => assignedProjectResources.Select(y => y.ResourceId).Contains(x.Id));
     }
@@ -242 +242 @@
 
       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 stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
-      var top = stack.Peek();
+      Resource top = null;
 
       TreeNode currentNode = null;
@@ -262 +265 @@
 
       while (stack.Any()) {
+        if(top == null)  top = stack.Peek();
         var newResource = stack.Pop();
         var newNode = new TreeNode(newResource.Name) { Tag = newResource };

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

@@ -45 +45 @@
     private readonly object locker = new object();
 
+    private Project selectedProject = null;
+
     public new IItemList<Project> Content {
       get { return (IItemList<Project>)base.Content; }
@@ -190 +192 @@
 
     private void addButton_Click(object sender, EventArgs e) {
+      Guid? parentProjectId = null;
+      if (selectedProject != null) parentProjectId = selectedProject.Id;
       var project = new Project {
         Name = "New Project",
-        OwnerUserId = UserInformation.Instance.User.Id
+        OwnerUserId = UserInformation.Instance.User.Id,
+        ParentProjectId = parentProjectId
       };
       Content.Add(project);
@@ -244 +249 @@
         },
         finallyCallback: () => saveProjectButton.Enabled = true);
+
+      OnContentChanged();
     }
 
     private void projectsTreeView_AfterSelect(object sender, TreeViewEventArgs e) {
-      var selectedProject = (Project)e.Node.Tag;
-      ReColorTreeNodes(projectsTreeView.Nodes, selectedColor, Color.Transparent);
+      selectedProject = (Project)e.Node.Tag;
+      ReColorTreeNodes(projectsTreeView.Nodes, selectedColor, Color.Transparent, true);
       e.Node.BackColor = selectedColor;
+      e.Node.Text += " [selected]";
       
 
-      if (projectView.Content != null)
-        projectView.Content.PropertyChanged -= ProjectViewContent_PropertyChanged;
+      //if (projectView.Content != null)
+      //  projectView.Content.PropertyChanged -= ProjectViewContent_PropertyChanged;
 
       projectView.Content = selectedProject;
@@ -259 +267 @@
       projectResourcesView.Content = selectedProject;
 
-      if (selectedProject != null)
-        selectedProject.PropertyChanged += ProjectViewContent_PropertyChanged;
+      //if (selectedProject != null)
+      //  selectedProject.PropertyChanged += ProjectViewContent_PropertyChanged;
 
       if (IsAuthorized(selectedProject)) {
@@ -322 +330 @@
 
     #region Helpers
-    private void ReColorTreeNodes(TreeNodeCollection nodes, Color c1, Color c2) {
+    private void ReColorTreeNodes(TreeNodeCollection nodes, Color c1, Color c2, bool resetText) {
       foreach(TreeNode n in nodes) {
         if(n.BackColor.Equals(c1)) {
           n.BackColor = c2;
+          if (resetText) n.Text = ((Project)n.Tag).Name;
         }
         if (n.Nodes.Count > 0) {
-          ReColorTreeNodes(n.Nodes, c1, c2);
+          ReColorTreeNodes(n.Nodes, c1, c2, resetText);
         }
       }
@@ -338 +347 @@
 
       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)));
+            mainProjects.UnionWith(parentedMainProjects);
       var subProbjects = new HashSet<Project>(projects.Except(mainProjects));
 
       var stack = new Stack<Project>(mainProjects.OrderByDescending(x => x.Name));
-      var top = stack.Peek();
-      bool first = true;
+      Project top = null;
 
       TreeNode currentNode = null;
@@ -350 +362 @@
         var newProject = stack.Pop();
         var newNode = new TreeNode(newProject.Name) { Tag = newProject };
-        if (first) {
+        if (top == null) {
+          top = newProject;
           newNode.BackColor = selectedColor;
-          first = false;
+          newNode.Text += " [selected]";
         }