Changeset 15914

Timestamp:

04/23/18 14:44:04 (7 years ago)

Author:

jzenisek

Message:

#2839: fixed several bugs in resource selector

Location:

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

Files:

• HiveResourceSelector.cs (modified) (4 diffs)
• RefreshableHiveJobView.cs (modified) (4 diffs)

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

@@ -46 +46 @@
     private const string NEW_SELECTION_TAG = " [new selection]";
     private const string CHANGED_SELECTION_TAG = " [changed selection]";
+    private const string ADDED_SELECTION_TAG = " [added selection]";
+    private const string REMOVED_SELECTION_TAG = " [removed selection]";
+    private const string INCLUDED_TAG = " [included]";
+    private const string ADDED_INCLUDE_TAG = " [added include]";
+    private const string REMOVED_INCLUDE_TAG = " [removed include]";
 
     private readonly HashSet<TreeNode> mainTreeNodes = new HashSet<TreeNode>();
@@ -68 +73 @@
     private readonly Color selectedBackColor = Color.DodgerBlue;
     private readonly Color selectedForeColor = Color.White;
+    private readonly Color controlTextColor = SystemColors.ControlText;
+    private readonly Color grayTextColor = SystemColors.GrayText;
 
     private string currentSearchString;
@@ -133 +140 @@
       get { return selectedProject; }
       set {
+        if (selectedProject == value) return;
         lastSelectedProject = selectedProject;
-        if (selectedProject == value) return;
         selectedProject = value;
+
+        if (JobId == Guid.Empty || JobId == null) selectedResourceIds = null;
         UpdateResourceTree();
         ExtractStatistics();
@@ -523 +532 @@
         } else if (newIncludedResources.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.Checked = true;
-          newNode.ForeColor = SystemColors.GrayText;
+          newNode.ForeColor = grayTextColor;
         }
 
         if (includedResources.Select(x => x.Id).Contains(newResource.Id) && newIncludedResources.Select(x => x.Id).Contains(newResource.Id)) {
-          newNode.Text += " [included]";
+          newNode.Text += INCLUDED_TAG;
         } else if (addedIncludes.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.BackColor = addedIncludeColor;
-          newNode.ForeColor = SystemColors.GrayText;
-          newNode.Text += " [added include]";
+          newNode.ForeColor = grayTextColor;
+          newNode.Text += ADDED_INCLUDE_TAG;
         } else if (removedIncludes.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.BackColor = removedIncludeColor;
-          newNode.Text += " [removed include]";
+          newNode.Text += REMOVED_INCLUDE_TAG;
         }
 
         if (addedAssignments.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.BackColor = addedAssignmentColor;
-          newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [added selection]";
+          newNode.ForeColor = controlTextColor;
+          newNode.Text += ADDED_SELECTION_TAG;
         } else if (removedAssignments.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.BackColor = removedAssignmentColor;
-          newNode.ForeColor = SystemColors.ControlText;
-          newNode.Text += " [removed selection]";
+          newNode.ForeColor = controlTextColor;
+          newNode.Text += REMOVED_SELECTION_TAG;
         }
 

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

@@ -411 +411 @@
       } else {
         HiveClient.StartJob((Exception ex) => ErrorHandling.ShowErrorDialog(this, "Start failed.", ex), Content, new CancellationToken());
+        UpdateSelectorDialog();
       }
     }
@@ -473 +474 @@
         }
       }, null);
+      UpdateSelectorDialog();
     }
 
@@ -480 +482 @@
         Content, 
         new CancellationToken());
+      UpdateSelectorDialog();
     }
 
@@ -515 +518 @@
       return HiveServiceLocator.Instance.CallHiveService(s => s.GetProject(projectId));
     }
+
+    private void UpdateSelectorDialog() {
+      if(hiveResourceSelectorDialog != null) {
+        hiveResourceSelectorDialog = null;
+        //hiveResourceSelectorDialog.JobId = Content.Job.Id;
+        //hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+        //hiveResourceSelectorDialog.SelectedResourceIds = Content.Job.ResourceIds;
+      }
+    }
     #endregion