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

Timestamp:

10/07/17 10:32:07 (7 years ago)

Author:

jkarder

Message:

#2839:

• worked on resources and projects views
• changed resource selector to be able to select projects and assigned resources
• updated service clients

File:

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

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

@@ -23 +23 @@
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -118 +117 @@
           nameTextBox.Text = string.Empty;
           executionTimeTextBox.Text = string.Empty;
-          resourceNamesTextBox.Text = string.Empty;
+          projectNameTextBox.Text = string.Empty;
           refreshAutomaticallyCheckBox.Checked = false;
           lock (runCollectionViewLocker) {
@@ -137 +136 @@
           }
         }
-      }
-      finally {
+      } finally {
         SuppressEvents = false;
       }
@@ -158 +156 @@
       tabControl.Enabled = !Locked;
       nameTextBox.Enabled = !Locked;
-      resourceNamesTextBox.Enabled = !Locked;
+      projectNameTextBox.Enabled = !Locked;
       searchButton.Enabled = !Locked;
       jobsTreeView.Enabled = !Locked;
@@ -183 +181 @@
 
           this.nameTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
-          this.resourceNamesTextBox.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
           this.searchButton.Enabled = Content.IsControllable && Content.ExecutionState == ExecutionState.Prepared && !alreadyUploaded && !Content.IsProgressing;
           this.jobsTreeView.ReadOnly = !Content.IsControllable || Content.ExecutionState != ExecutionState.Prepared || alreadyUploaded || Content.IsProgressing;
@@ -335 +332 @@
       if (hiveResourceSelectorDialog == null)
         hiveResourceSelectorDialog = new HiveResourceSelectorDialog();
+
       if (hiveResourceSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-        StringBuilder sb = new StringBuilder();
-        //foreach (Project resource in hiveResourceSelectorDialog.GetSelectedResources()) {
-        //  sb.Append(resource.Name);
-        //  sb.Append(";");
-        //}
-        //resourceNamesTextBox.Text = sb.ToString();
-        //if (Content.Job.ResourceNames != resourceNamesTextBox.Text)
-        //  Content.Job.ResourceNames = resourceNamesTextBox.Text;
         var selectedProject = hiveResourceSelectorDialog.SelectedProject;
-        resourceNamesTextBox.Text = selectedProject.Name;
-        if (Content.Job.ProjectId != selectedProject.Id)
-          Content.Job.ProjectId = selectedProject.Id;
+        projectNameTextBox.Text = selectedProject.Name;
+        Content.Job.ProjectId = selectedProject.Id;
+        Content.Job.ResourceIds = hiveResourceSelectorDialog.SelectedResources.Select(x => x.Id).ToList();
       }
     }
@@ -421 +411 @@
         try {
           invoker.EndInvoke(ar);
-        }
-        catch (Exception ex) {
-          ThreadPool.QueueUserWorkItem(delegate(object exception) { ErrorHandling.ShowErrorDialog(this, (Exception)exception); }, ex);
+        } catch (Exception ex) {
+          ThreadPool.QueueUserWorkItem(delegate (object exception) { ErrorHandling.ShowErrorDialog(this, (Exception)exception); }, ex);
         }
       }, null);
@@ -510 +499 @@
           if (subTask is OptimizerHiveTask) {
             OptimizerHiveTask ohTask = subTask as OptimizerHiveTask;
-            ohTask.ExecuteReadActionOnItemTask(new Action(delegate() {
+            ohTask.ExecuteReadActionOnItemTask(new Action(delegate () {
               runs.AddRange(ohTask.ItemTask.Item.Runs);
             }));