Changeset 15813 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

Timestamp:

02/26/18 13:38:05 (6 years ago)

Author:

jzenisek

Message:

#2839: improved HiveAdmin interactions:

• collaps groups with slaves only
• update scheduleView only if currently visible
• made schedule scrollable for non-admins
• changed selection backcolor
• fixed add/delete project permission bug for non-admins

File:

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

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

@@ -40 +40 @@
     private const int greenFlagImageIndex = 0;
     private const int redFlagImageIndex = 1;
-
-    private readonly Color changedColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
-    private readonly Color selectedColor = Color.FromArgb(255, 240, 194, 59); // #f0c23b
+    private const string SELECTED_TAG = ""; // " [selected]";
+    private const string NOT_STORED_TAG = "**"; // " [not stored]";
+    private const string CHANGES_NOT_STORED_TAG = "*"; // " [changes not stored]";
+
+    private readonly Color selectedBackColor = Color.DodgerBlue;
+    private readonly Color selectedForeColor = Color.White;
 
     private Project selectedProject = null;
@@ -222 +225 @@
       }
 
-      if(!IsAdmin() 
-        && HiveAdminClient.Instance.CheckOwnershipOfParentProject(selectedProject, 
-          UserInformation.Instance.User.Id)) {
-        MessageBox.Show(
-          "Only subprojects of owned projects can be deleted.",
-          "HeuristicLab Hive Administrator",
-          MessageBoxButtons.OK,
-          MessageBoxIcon.Error);
-        return;
-      }
-
-      if (!IsAdmin() && Content.Any(x => x.ParentProjectId == selectedProject.Id)) {
+      if (Content.Any(x => x.ParentProjectId == selectedProject.Id)) {
         MessageBox.Show(
           "Only empty projects can be deleted.",
@@ -387 +379 @@
         }
         if (newProject.Id == selectedProject.Id && !nodeSelected) {
-          newNode.BackColor = selectedColor;
-          newNode.Text += " [selected]";
+          newNode.BackColor = selectedBackColor;
+          newNode.ForeColor = selectedForeColor;
+          newNode.Text += SELECTED_TAG;
           nodeSelected = true;
         }
@@ -430 +423 @@
 
       if (p.Id == Guid.Empty) {
-        n.Text += " [not stored]";
+        n.Text += NOT_STORED_TAG;
       } else if (p.Modified) {
-        n.Text += " [changes not stored]";
+        n.Text += CHANGES_NOT_STORED_TAG;
       }
     }
@@ -450 +443 @@
       projectResourcesView.Content = project;
 
-      bool locked = project == null || (project != null && project.Id == Guid.Empty);
+      bool projectIsNew = project != null && project.Id == Guid.Empty;
+      bool locked = project == null || projectIsNew;
+      bool deleteEnabled = project != null && (
+        projectIsNew
+        || HiveAdminClient.Instance.CheckOwnershipOfParentProject(project, UserInformation.Instance.User.Id)
+        || !HiveAdminClient.Instance.ProjectDescendants[project.Id].Any());
+
       addButton.Enabled = !locked;
+      removeButton.Enabled = deleteEnabled;
       projectPermissionsView.Locked = locked;
       projectResourcesView.Locked = locked;
@@ -461 +461 @@
       SelectedProject = (Project)projectNode.Tag;
       ResetTreeNodes(projectsTreeView.Nodes);
-      projectNode.BackColor = selectedColor;
-      projectNode.Text += " [selected]";
+      projectNode.BackColor = selectedBackColor;
+      projectNode.ForeColor = selectedForeColor;
+      projectNode.Text += SELECTED_TAG;
     }