Changeset 15627 for branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

Timestamp:

01/17/18 15:20:29 (7 years ago)

Author:

jzenisek

Message:

#2839 worked on Hive Job Manager: improved project/resource selector to show existent assignments and preserve selections

File:

• branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (6 diffs)

branches/HiveProjectManagement/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -33 +33 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.PluginInfrastructure;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Clients.Hive.JobManager.Views {
@@ -44 +45 @@
     private bool SuppressEvents { get; set; }
     private object runCollectionViewLocker = new object();
+    private Project selectedProject;
 
     public new RefreshableJob Content {
@@ -129 +131 @@
           nameTextBox.Text = Content.Job.Name;
           executionTimeTextBox.Text = Content.ExecutionTime.ToString();
-          //resourceNamesTextBox.Text = Content.Job.ResourceNames;
           refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
+
+          // project look up
+          if(Content.Job.ProjectId != null && Content.Job.ProjectId != Guid.Empty) {
+            selectedProject = GetProject(Content.Job.ProjectId);
+            if(selectedProject != null) {
+              projectNameTextBox.Text = selectedProject.Name;
+            } else {
+              projectNameTextBox.Text = string.Empty;
+            }
+          } else {
+            selectedProject = null;
+            projectNameTextBox.Text = string.Empty;
+          }
+          
           logView.Content = Content.Log;
           lock (runCollectionViewLocker) {
@@ -330 +345 @@
     #region Control events
     private void searchButton_Click(object sender, EventArgs e) {
-      if (hiveResourceSelectorDialog == null)
-        hiveResourceSelectorDialog = new HiveResourceSelectorDialog();
+      if (hiveResourceSelectorDialog == null) {
+        hiveResourceSelectorDialog = new HiveResourceSelectorDialog(Content.Job.Id, Content.Job.ProjectId);
+      } else if(selectedProject != null) {
+        hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+      } else {
+        hiveResourceSelectorDialog.SelectedProjectId = null;
+      }
 
       if (hiveResourceSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-        var selectedProject = hiveResourceSelectorDialog.SelectedProject;
-        projectNameTextBox.Text = selectedProject.Name;
-        Content.Job.ProjectId = selectedProject.Id;
-        Content.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
+        selectedProject = hiveResourceSelectorDialog.SelectedProject;
+        if(selectedProject != null) {
+          projectNameTextBox.Text = selectedProject.Name;
+          Content.Job.ProjectId = selectedProject.Id;
+          Content.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
+        } else {
+          projectNameTextBox.Text = string.Empty;
+          Content.Job.ProjectId = Guid.Empty;
+          Content.Job.ResourceIds = null;
+        }
       }
     }
@@ -344 +370 @@
       if (nameTextBox.Text.Trim() == string.Empty) {
         MessageBox.Show("Please enter a name for the job before uploading it!", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+      } else if (Content.Job.ProjectId == null || Content.Job.ProjectId == Guid.Empty) {
+        MessageBox.Show("Please select a project before uploading the job!", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+      } else if (Content.Job.ResourceIds == null || !Content.Job.ResourceIds.Any()) {
+        MessageBox.Show("Please select resources before uploading the job!", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
       } else if (Content.ExecutionState == ExecutionState.Paused) {
         var task = System.Threading.Tasks.Task.Factory.StartNew(ResumeJobAsync, Content);
@@ -436 +466 @@
       }
     }
+   
+    private Project GetProject(Guid projectId) {
+      return HiveServiceLocator.Instance.CallHiveService(s => s.GetProject(projectId));
+    }
     #endregion