Context Navigation

← Previous Changeset
Next Changeset →

Changeset 16044

Timestamp:

08/03/18 14:38:17 (6 years ago)

Author:

jzenisek

Message:

#2839:

adapted icons: replaced ".PublishToWeb" with ".Save"
pre-select project with all resources for new jobs, if it is the only available

Location:

branches/2839_HiveProjectManagement

Files:

: 16 edited

HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserGroupListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserListView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightAccessClientInformationView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Views/3.3/HiveItemView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/AlgorithmView.Designer.cs (modified) (2 diffs)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/OKBItemView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/ProblemView.Designer.cs (modified) (2 diffs)
HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBProblemView.cs (modified) (1 diff)
HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBRunView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/SingleObjectiveOKBSolutionView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleListView.Designer.cs

r14185	r16044
66	66	//
67	67	this.storeButton.Enabled = false;
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Location = new System.Drawing.Point(33, 3);
70	70	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableRoleSelectionListView.Designer.cs

r14185	r16044
53	53	//
54	54	this.storeButton.Enabled = false;
55		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	55	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
56	56	this.storeButton.Location = new System.Drawing.Point(33, 3);
57	57	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserGroupListView.Designer.cs

r14185	r16044
66	66	//
67	67	this.storeButton.Enabled = false;
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Location = new System.Drawing.Point(33, 3);
70	70	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/RefreshableUserListView.Designer.cs

r14185	r16044
66	66	this.storeButton.Enabled = false;
67	67	this.storeButton.Location = new System.Drawing.Point(33, 3);
68		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	68	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
69	69	this.storeButton.Name = "storeButton";
70	70	this.storeButton.Size = new System.Drawing.Size(24, 24);

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Administration/3.3/Views/UserGroupView.Designer.cs

r15953	r16044
108	108	//
109	109	this.storeButton.Enabled = false;
110		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	110	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
111	111	this.storeButton.Location = new System.Drawing.Point(31, 58);
112	112	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Access.Views/3.3/UserViews/RefreshableLightweightAccessClientInformationView.Designer.cs

r15953	r16044
72	72	//
73	73	this.storeButton.Enabled = false;
74		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	74	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
75	75	this.storeButton.Location = new System.Drawing.Point(34, 3);
76	76	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

r15956	r16044
198	198	//
199	199	this.btnSaveCal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top \| System.Windows.Forms.AnchorStyles.Right)));
200		this.btnSaveCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	200	this.btnSaveCal.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
201	201	this.btnSaveCal.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
202	202	this.btnSaveCal.Location = new System.Drawing.Point(640, 41);

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

-                      r15992
+                      r16044
+          }
+          if (Content.Job != null && Content.Job.ProjectId == Guid.Empty) {
+            if (HiveClient.Instance != null && HiveClient.Instance.Projects != null && HiveClient.Instance.Projects.Count == 1) {
+              var p = HiveClient.Instance.Projects.FirstOrDefault();
+              if (p != null && p.Id != Guid.Empty) {
+                hiveResourceSelectorDialog = new HiveResourceSelectorDialog(Content.Job.Id, Content.Job.ProjectId);
+                Content.Job.ProjectId = p.Id;
+                Content.Job.ResourceIds = HiveClient.Instance.GetAvailableResourcesForProject(p.Id).Select(x => x.Id).ToList();
+                hiveResourceSelectorDialog.SelectedProjectId = Content.Job.ProjectId;
+                hiveResourceSelectorDialog.SelectedResourceIds = Content.Job.ResourceIds;
+              }
+            }
+          }
           nameTextBox.Text = Content.Job.Name;
           descriptionTextBox.Text = Content.Job.Description;

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

r14185	r16044
52	52	// storeButton
53	53	//
54		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	54	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
55	55	this.storeButton.Location = new System.Drawing.Point(0, 0);
56	56	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

-                      r15995
+                      r16044
       else return Enumerable.Empty<Resource>();
+    }
+    public IEnumerable<Resource> GetAvailableResourcesForProject(Guid id) {
+      var assignedProjectResources = HiveServiceLocator.Instance.CallHiveService(s => s.GetAssignedResourcesForProject(id));
+      return resources.Where(x => assignedProjectResources.Select(y => y.ResourceId).Contains(x.Id));
+    }
     #endregion

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/AlgorithmView.Designer.cs

-                      r15953
+                      r16044
       // storeUsersButton
       //
       this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeUsersButton.Location = new System.Drawing.Point(37, 9);
       this.storeUsersButton.Name = "storeUsersButton";
 …
       // storeDataButton
       //
       this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeDataButton.Location = new System.Drawing.Point(36, 6);
       this.storeDataButton.Name = "storeDataButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/OKBItemView.Designer.cs

r14185	r16044
52	52	// storeButton
53	53	//
54		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	54	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
55	55	this.storeButton.Location = new System.Drawing.Point(0, 0);
56	56	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/ProblemView.Designer.cs

-                      r15953
+                      r16044
       // storeUsersButton
       //
       this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeUsersButton.Location = new System.Drawing.Point(38, 9);
       this.storeUsersButton.Name = "storeUsersButton";
 …
       // storeDataButton
       //
       this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeDataButton.Location = new System.Drawing.Point(36, 6);
       this.storeDataButton.Name = "storeDataButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBProblemView.cs

-                      r14185
+                      r16044
       downloadCharacteristicsButton.Image = VSImageLibrary.Refresh;
       uploadCharacteristicsButton.Text = string.Empty;
       uploadCharacteristicsButton.Image = VSImageLibrary.PublishToWeb;
+      uploadCharacteristicsButton.Image = VSImageLibrary.Save;
       refreshSolutionsButton.Text = string.Empty;
       refreshSolutionsButton.Image = VSImageLibrary.Refresh;
       uploadSolutionsButton.Text = string.Empty;
       uploadSolutionsButton.Image = VSImageLibrary.PublishToWeb;
+      uploadSolutionsButton.Image = VSImageLibrary.Save;
+    }

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/OKBRunView.Designer.cs

r14185	r16044
51	51	// storeButton
52	52	//
53		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	53	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
54	54	this.storeButton.Location = new System.Drawing.Point(0, 0);
55	55	this.storeButton.Name = "storeButton";

branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views/3.3/RunCreation/Views/SingleObjectiveOKBSolutionView.cs

r13693	r16044
41	41	refreshButton.Image = VSImageLibrary.Refresh;
42	42	uploadButton.Text = string.Empty;
43		uploadButton.Image = VSImageLibrary.~~PublishToWeb~~;
	43	uploadButton.Image = VSImageLibrary.Save;
44	44	}
45	45

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16044

Legend:

Download in other formats: