Changeset 15567

Timestamp:

01/02/18 13:51:29 (7 years ago)

Author:

jzenisek

Message:

#2839 worked on views for project and resource administration

Location:

branches/HiveProjectManagement

Files:

• HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs (modified) (1 diff)
• HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)

branches/HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.cs

@@ -68 +68 @@
     }
 
+    protected override void SetEnabledStateOfControls() {
+      base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked;
+      groupNameTextBox.ReadOnly = enabled;
+    }
+
     private void groupNameTextBox_TextChanged(object sender, EventArgs e) {
       if (Content != null && Content.Name != groupNameTextBox.Text)

branches/HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserView.cs

@@ -64 +64 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      bool enabled = Content != null && !Locked;
+      
+      userNameTextBox.ReadOnly = enabled;
+      fullNameTextBox.ReadOnly = enabled;
+      emailTextBox.ReadOnly = enabled;
+
       if (Content == null) {
         resetPasswordButton.Enabled = false;

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

@@ -65 +65 @@
         var top = BuildPermissionsList(AccessClient.Instance.UsersAndGroups);
         detailsViewHost.Content = top;
+        detailsViewHost.ActiveView.Locked = true;
+        
       }
     }

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

@@ -29 +29 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using System.Collections;
 
 namespace HeuristicLab.Clients.Hive.Administrator.Views {
@@ -45 +46 @@
     private readonly Dictionary<Guid, HashSet<Resource>> resourceAncestors = new Dictionary<Guid, HashSet<Resource>>();
     private readonly Dictionary<Guid, HashSet<Resource>> resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
-    //private readonly Color ownedResourceColor = Color.LightGreen;
-    private readonly Color changedAssignmentColor = Color.FromArgb(255, Color.LightGreen);
-    private readonly Color changedInheritanceColor = Color.FromArgb(255, Color.LightGray);
+    //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
+    private readonly Color addedIncludeColor = Color.FromArgb(25, 169, 221, 221); // #a9dddd
+    private readonly Color removedIncludeColor = Color.FromArgb(25, 249, 210, 145); // #f9d291
 
     public new Project Content {
@@ -76 +79 @@
         var top = BuildResourceTree(HiveAdminClient.Instance.Resources);
         detailsViewHost.Content = top;
+        detailsViewHost.ActiveView.Locked = true;
       }
     }
@@ -250 +254 @@
       Resource currentResource = null;
 
-      var assignmentDiff = new HashSet<Resource>(newAssignedResources);
-      assignmentDiff.SymmetricExceptWith(assignedResources);
-      var inheritanceDiff = new HashSet<Resource>(newInheritedResources);
-      inheritanceDiff.SymmetricExceptWith(inheritedResources);
+
+      var addedAssignments = newAssignedResources.Except(assignedResources);
+      var removedAssignments = assignedResources.Except(newAssignedResources);
+      var addedIncludes = newInheritedResources.Except(inheritedResources);
+      var removedIncludes = inheritedResources.Except(newInheritedResources);
+
+      //var assignmentDiff = new HashSet<Resource>(newAssignedResources);
+      //assignmentDiff.SymmetricExceptWith(assignedResources);
+      //var inheritanceDiff = new HashSet<Resource>(newInheritedResources);
+      //inheritanceDiff.SymmetricExceptWith(inheritedResources);
 
       while (stack.Any()) {
@@ -273 +283 @@
         }
 
-
         if (newAssignedResources.Contains(newResource)) {
           newNode.Checked = true;
         } else if (newInheritedResources.Contains(newResource)) {
           newNode.Checked = true;
-          newNode.Text += " (Inherited)";
           newNode.ForeColor = SystemColors.GrayText;
         }
 
-        if (assignmentDiff.Contains(newResource)) {
-          newNode.BackColor = changedAssignmentColor;
-          newNode.Text += " [changed]";
-        } else if(inheritanceDiff.Contains(newResource)) {
-          newNode.BackColor = changedInheritanceColor;
-          newNode.Text += " [changed]";
+          if (inheritedResources.Contains(newResource) && newInheritedResources.Contains(newResource)) {
+          newNode.Text += " [included]";
+        } else if (addedIncludes.Contains(newResource)) {
+          newNode.BackColor = addedIncludeColor;
+          newNode.ForeColor = SystemColors.GrayText;
+          newNode.Text += " [+included]";
+        } else if (removedIncludes.Contains(newResource)) {
+          newNode.BackColor = removedIncludeColor;
+          newNode.Text += " [-included]";
+        }
+
+        if (addedAssignments.Contains(newResource)) {
+          newNode.BackColor = addedAssignmentColor;
+          newNode.ForeColor = SystemColors.ControlText;
+          newNode.Text += " [added]";
+        } else if (removedAssignments.Contains(newResource)) {
+          newNode.BackColor = removedAssignmentColor;
+          newNode.ForeColor = SystemColors.ControlText;
+          newNode.Text += " [removed]";
         }
 

branches/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, Color.LightGreen);
-    private readonly Color selectedColor = Color.SkyBlue;
+    private readonly Color changedColor = Color.FromArgb(255, 87, 191, 193); // #57bfc1
+    private readonly Color selectedColor = Color.FromArgb(255, 240, 194, 59); // #f0c23b
 
     private readonly object locker = new object();

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

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

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

@@ -98 +98 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      bool enabled = Content != null;
+      bool enabled = Content != null && !Locked;
       btnAddGroup.Enabled = enabled;
       btnRemoveGroup.Enabled = enabled;