Changeset 15956 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager

Timestamp:

06/08/18 15:34:12 (6 years ago)

Author:

jzenisek

Message:

#2839:

• fixed project/resource selector in HiveJobManager
• added error provider to project/resource selector
• changed datetime pickers in HiveAdmin...

Location:

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

Files:

• HiveResourceSelector.Designer.cs (modified) (1 diff)
• HiveResourceSelector.cs (modified) (2 diffs)
• HiveResourceSelectorDialog.Designer.cs (modified) (5 diffs)
• HiveResourceSelectorDialog.cs (modified) (1 diff)

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

@@ -248 +248 @@
     protected HeuristicLab.Clients.Hive.Views.TreeView.NoDoubleClickTreeView resourcesTreeView;
     private System.Windows.Forms.GroupBox summaryGroupBox;
-    private System.Windows.Forms.Label coresLabel;
-    private System.Windows.Forms.Label memorySummaryLabel;
-    private System.Windows.Forms.Label memoryLabel;
-    private System.Windows.Forms.Label coresSummaryLabel;
+    protected System.Windows.Forms.Label coresLabel;
+    protected System.Windows.Forms.Label memorySummaryLabel;
+    protected System.Windows.Forms.Label memoryLabel;
+    protected System.Windows.Forms.Label coresSummaryLabel;
   }
 }

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

@@ -148 +148 @@
     }
 
+    public int AssignedCores {
+      get {
+        HashSet<Slave> newAssignedSlaves = new HashSet<Slave>(newAssignedResources.OfType<Slave>());
+        foreach(var slaveGroup in newAssignedResources.OfType<SlaveGroup>()) {
+          foreach(var slave in HiveClient.Instance.GetAvailableResourceDescendants(slaveGroup.Id).OfType<Slave>()) {
+            newAssignedSlaves.Add(slave);
+          }
+        }
+        return newAssignedSlaves.Sum(x => x.Cores.GetValueOrDefault());
+      }
+    }
+
     public IEnumerable<Resource> AssignedResources {
       get { return newAssignedResources; }
@@ -425 +437 @@
           }
         }
-      } else { // existent, unchanged jobs get all assigned resources
+      } else if(selectedProject.Id == projectId) { // existent, unchanged jobs get all assigned resources
         // update assigned resources
         var assignedJobResources = GetAssignedResourcesForJob(JobId);

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

@@ -50 +50 @@
       this.refreshButton = new System.Windows.Forms.Button();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.errorProvider = new System.Windows.Forms.ErrorProvider(this.components);
       this.hiveResourceSelector = new HeuristicLab.Clients.Hive.JobManager.Views.HiveProjectSelector();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.SuspendLayout();
       // 
@@ -64 +66 @@
       this.okButton.Text = "&OK";
       this.okButton.UseVisualStyleBackColor = true;
+      this.errorProvider.SetIconAlignment(this.okButton, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.errorProvider.SetIconPadding(this.okButton, 2);
       // 
       // cancelButton
@@ -87 +91 @@
       this.refreshButton.UseVisualStyleBackColor = true;
       this.refreshButton.Click += new System.EventHandler(this.refreshButton_Click);
+      // 
+      // errorProvider
+      // 
+      this.errorProvider.BlinkStyle = System.Windows.Forms.ErrorBlinkStyle.NeverBlink;
+      this.errorProvider.ContainerControl = this;
       // 
       // hiveResourceSelector
@@ -127 +136 @@
       this.Text = "Select Project";
       this.Load += new System.EventHandler(this.HiveResourceSelectorDialog_Load);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
       this.ResumeLayout(false);
 
@@ -137 +147 @@
     protected System.Windows.Forms.Button refreshButton;
     protected System.Windows.Forms.ToolTip toolTip;
+    protected System.Windows.Forms.ErrorProvider errorProvider;
     protected HiveProjectSelector hiveResourceSelector;
   }

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

@@ -134 +134 @@
 
     private void hiveResourceSelector_SelectedProjectChanged(object sender, EventArgs e) {
-      okButton.Enabled = hiveResourceSelector.SelectedProject != null;
+      okButton.Enabled = hiveResourceSelector.SelectedProject != null && hiveResourceSelector.AssignedResources.Any();
     }
 
     private void hiveResourceSelector_SelectedResourcesChanged(object sender, EventArgs e) {
       okButton.Enabled = hiveResourceSelector.AssignedResources.Any();
+
+      if(!hiveResourceSelector.AssignedResources.Any()) {
+        errorProvider.SetError(okButton, "Note: currently no resources are assigned");
+      } else if(hiveResourceSelector.AssignedCores == 0) {
+        errorProvider.SetError(okButton, "Note: currently no resources with cores are assigned");
+      } else {
+        errorProvider.SetError(okButton, string.Empty);
+      }
     }