Changeset 15760 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views

Timestamp:

02/12/18 18:10:42 (6 years ago)

Author:

jzenisek

Message:

#2839

• minor changes regarding project- & resource selection
• adapted DeleteOnNull rules in dbml

Location:

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

Files:

• ProjectPermissionsView.cs (modified) (1 diff)
• ProjectResourcesView.cs (modified) (5 diffs)
• ProjectView.cs (modified) (1 diff)
• ProjectsView.cs (modified) (3 diffs)
• ResourcesView.cs (modified) (5 diffs)
• ScheduleView.cs (modified) (1 diff)

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

@@ -81 +81 @@
       }
     }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked && !ReadOnly;
+
+      inheritButton.Enabled = enabled;
+      saveButton.Enabled = enabled;
+      treeView.Enabled = enabled;
+    }
     #endregion
 

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

@@ -50 +50 @@
     private readonly Dictionary<Guid, HashSet<Resource>> resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
 
-    //private readonly Color addedAssignmentColor = Color.FromArgb(255, 0, 174, 179); // #00aeb3
     private readonly Color addedAssignmentColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
     private readonly Color removedAssignmentColor = Color.FromArgb(255, 236, 159, 72); // #ec9f48
@@ -84 +83 @@
         var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
         detailsViewHost.Content = top;
-        detailsViewHost.ActiveView.Locked = true;
-      }
-    }
-
+      }
+    }
+
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked && !ReadOnly;
+
+      inheritButton.Enabled = enabled;
+      saveButton.Enabled = enabled;
+      treeView.Enabled = enabled;
+    }
     #endregion
 
@@ -208 +214 @@
       var resources = HiveAdminClient.Instance.Resources;
 
-      foreach(var r in resources) {
+      foreach(var r in resources.Where(x => x.Id != Guid.Empty)) {
         resourceAncestors.Add(r.Id, new HashSet<Resource>());
         resourceDescendants.Add(r.Id, new HashSet<Resource>());
       }
 
-      foreach(var r in resources) { 
+      foreach(var r in resources.Where(x => x.Id != Guid.Empty)) { 
         var parentResourceId = r.ParentResourceId;
         while(parentResourceId != null) {
@@ -253 +259 @@
       treeView.AfterCheck -= treeView_AfterCheck;
 
+      resources = resources.Where(x => x.Id != Guid.Empty);
       var mainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>().Where(x => x.ParentResourceId == null));
       var parentedMainResources = new HashSet<Resource>(resources.OfType<SlaveGroup>()
@@ -379 +386 @@
       var projects = HiveAdminClient.Instance.Projects;
 
-      foreach(var p in projects) {
+      foreach(var p in projects.Where(x => x.Id != Guid.Empty)) {
         projectAncestors.Add(p.Id, new HashSet<Project>());
         projectDescendants.Add(p.Id, new HashSet<Project>());
       }
 
-      foreach (var p in projects) {
+      foreach (var p in projects.Where(x => x.Id != Guid.Empty)) {
         var parentProjectId = p.ParentProjectId;
         while (parentProjectId != null) {

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

@@ -92 +92 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      bool enabled = Content != null && !ReadOnly;
+      bool enabled = Content != null && !Locked && !ReadOnly;
       nameTextBox.Enabled = enabled;
       descriptionTextBox.Enabled = enabled;

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

@@ -97 +97 @@
         projectPermissionsView.Content = top;
         projectResourcesView.Content = top;
+
+        if(top != null && top.Id == Guid.Empty) {
+          projectPermissionsView.Locked = true;
+          projectResourcesView.Locked = true;
+        }
       }
     }
@@ -390 +395 @@
       var stack = new Stack<Project>(mainProjects.OrderByDescending(x => x.Name));
       if (selectedProject != null) selectedProject = projects.Where(x => x.Id == selectedProject.Id).FirstOrDefault();
+      bool nodeSelected = false;
 
       TreeNode currentNode = null;
@@ -406 +412 @@
           selectedProject = newProject;
         }
-        if (newProject.Id == selectedProject.Id) {
+        if (newProject.Id == selectedProject.Id && !nodeSelected) {
           newNode.BackColor = selectedColor;
           newNode.Text += " [selected]";
+          nodeSelected = true;
         }
 

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

@@ -95 +95 @@
       } else {
         var top = BuildResourceTree(Content);
+        SetEnabledStateOfControlsForSelectedResource();
+
         viewHost.Content = top;
+        bool locked = !IsAdmin();
+        viewHost.Locked = locked;
+        scheduleView.Locked = locked;
+
+        if (top != null && top.Id == Guid.Empty) {
+          scheduleView.SetEnabledStateOfSchedule(false);
+        }
       }
     }
@@ -105 +114 @@
       btnRemoveGroup.Enabled = enabled;
       btnSave.Enabled = enabled;
-      scheduleView.SetEnabledStateOfSchedule(enabled && IsAdmin()); // IsAuthorized((Resource)viewHost.Content));
+      scheduleView.SetEnabledStateOfSchedule(enabled && IsAdmin());
     }
     #endregion
@@ -415 +424 @@
       var stack = new Stack<Resource>(mainResources.OrderByDescending(x => x.Name));
       if (selectedResource != null) selectedResource = resources.Where(x => x.Id == selectedResource.Id).FirstOrDefault();
-      //bool nodeSelected = false;
+      bool nodeSelected = false;
 
       TreeNode currentNode = null;
@@ -432 +441 @@
           selectedResource = newResource;
         }
-        if (newResource.Id == selectedResource.Id) {
+        if (newResource.Id == selectedResource.Id && !nodeSelected) {
           newNode.BackColor = selectedColor;
           newNode.Text += " [selected]";
+          nodeSelected = true;
         }
 
@@ -490 +500 @@
           slaveNode.Text += " [changes not stored]";
         }
-        if (slave.Id == selectedResource.Id) {
+        if (slave.Id == selectedResource.Id && !nodeSelected) {
           slaveNode.BackColor = selectedColor;
           slaveNode.Text += " [selected]";
+          nodeSelected = true;
         }
       }

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

@@ -234 +234 @@
         Invoke(new Action(() => SetEnabledStateOfSchedule(state)));
       } else {
-        if (Content == null) state = false;
+        if (Content == null || Locked || ReadOnly) state = false;
         groupBox1.Enabled = state;
         btnClearCal.Enabled = state;