Changeset 15966 for branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Timestamp:

06/19/18 15:51:41 (6 years ago)

Author:

jzenisek

Message:

#2839: Fixed several bugs and added project duration handling

• fixed project duration handling (client- & service-side)
• fixed tagging in HiveJobAdmin
• added ProjectJobs view (under construction)
• added necessary service methods

Location:

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3

Files:

• HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (3 diffs)
• Views/ProjectJobsView.Designer.cs (added)
• Views/ProjectJobsView.cs (added)
• Views/ProjectView.cs (modified) (5 diffs)
• Views/ProjectsView.Designer.cs (modified) (6 diffs)
• Views/ProjectsView.cs (modified) (5 diffs)

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj

@@ -132 +132 @@
     </Compile>
     <Compile Include="MenuItems\AdministratorMenuItem.cs" />
+    <Compile Include="Views\ProjectJobsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Views\ProjectJobsView.Designer.cs">
+      <DependentUpon>ProjectJobsView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Views\ProjectPermissionsView.cs">
       <SubType>UserControl</SubType>
@@ -248 +254 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
+      <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
+      <Name>HeuristicLab.Data.Views-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
@@ -283 +293 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\ProjectJobsView.resx">
+      <DependentUpon>ProjectJobsView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

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

@@ -28 +28 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using System.Drawing;
 
 namespace HeuristicLab.Clients.Hive.Administrator.Views {
@@ -35 +36 @@
     private readonly object locker = new object();
 
+    private Guid persistedOwnerUserId;
+
     public new Project Content {
       get { return (Project)base.Content; }
-      set { base.Content = value; }
+      set { base.Content = value; persistedOwnerUserId = Content != null ? Content.OwnerUserId : Guid.Empty; }
     }
 
@@ -82 +85 @@
         createdTextBox.Text = Content.DateCreated.ToString("ddd, dd.MM.yyyy, HH:mm:ss");
         startDateTimePicker.Value = Content.StartDate;
-        if (indefiniteCheckBox.Checked = !Content.EndDate.HasValue) {
-          endDateTimePicker.Value = startDateTimePicker.Value;
-        } else {
-          endDateTimePicker.Value = Content.EndDate.Value;
-        }
+
+        indefiniteCheckBox.Checked = !Content.EndDate.HasValue;
+        if(!indefiniteCheckBox.Checked) endDateTimePicker.Value = Content.EndDate.Value;
+        else endDateTimePicker.Value = Content.StartDate;
+        endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
       }
     }
@@ -148 +151 @@
           ownerComboBox.SelectedIndexChanged -= ownerComboBox_SelectedIndexChanged;
           ownerComboBox.DataSource = AccessClient.Instance.UsersAndGroups.OfType<LightweightUser>().ToList();
-          ownerComboBox.SelectedItem = AccessClient.Instance.UsersAndGroups.FirstOrDefault(x => x.Id == Content.OwnerUserId);
+          ownerComboBox.SelectedItem = AccessClient.Instance.UsersAndGroups.FirstOrDefault(x => x.Id == persistedOwnerUserId);
           ownerComboBox.SelectedIndexChanged += ownerComboBox_SelectedIndexChanged;
           refreshButton.Enabled = true;
@@ -201 +204 @@
       if (Content == null) return;
       var newEndDate = indefiniteCheckBox.Checked ? (DateTime?)null : Content.StartDate;
-      if (Content.EndDate != newEndDate)
+      endDateTimePicker.Enabled = !indefiniteCheckBox.Checked;
+      if (Content.EndDate != newEndDate) {
+        DeregisterContentEvents();
         Content.EndDate = newEndDate;
+        endDateTimePicker.Value = newEndDate.HasValue ? newEndDate.Value : Content.StartDate;
+        RegisterContentEvents();
+      }
     }
     #endregion

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

@@ -39 +39 @@
       this.resourcesTabPage = new System.Windows.Forms.TabPage();
       this.projectResourcesView = new HeuristicLab.Clients.Hive.Administrator.Views.ProjectResourcesView();
+      this.jobsTabPage = new System.Windows.Forms.TabPage();
+      this.projectJobsView = new HeuristicLab.Clients.Hive.Administrator.Views.ProjectJobsView();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -48 +50 @@
       this.permissionsTabPage.SuspendLayout();
       this.resourcesTabPage.SuspendLayout();
+      this.jobsTabPage.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -152 +155 @@
       this.tabControl.Controls.Add(this.permissionsTabPage);
       this.tabControl.Controls.Add(this.resourcesTabPage);
+      this.tabControl.Controls.Add(this.jobsTabPage);
       this.tabControl.Location = new System.Drawing.Point(3, 3);
       this.tabControl.Name = "tabControl";
@@ -225 +229 @@
       this.projectResourcesView.Size = new System.Drawing.Size(571, 509);
       this.projectResourcesView.TabIndex = 0;
+      //
+      // jobsTabPage
+      //
+      this.jobsTabPage.Controls.Add(this.projectJobsView);
+      this.jobsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.jobsTabPage.Name = "jobsTabPage";
+      this.jobsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.jobsTabPage.Size = new System.Drawing.Size(577, 515);
+      this.jobsTabPage.TabIndex = 3;
+      this.jobsTabPage.Text = "Jobs";
+      this.jobsTabPage.UseVisualStyleBackColor = true;
+      //
+      // projectJobsView
+      //
+      this.projectJobsView.Caption = "ProjectView";
+      this.projectJobsView.Content = null;
+      this.projectJobsView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.projectJobsView.Location = new System.Drawing.Point(3, 3);
+      this.projectJobsView.Name = "projectJobsView";
+      this.projectJobsView.ReadOnly = false;
+      this.projectJobsView.Size = new System.Drawing.Size(571, 509);
+      this.projectJobsView.TabIndex = 0;
       // 
       // ProjectsView
@@ -242 +268 @@
       this.permissionsTabPage.ResumeLayout(false);
       this.resourcesTabPage.ResumeLayout(false);
+      this.jobsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -260 +287 @@
     private System.Windows.Forms.ImageList imageList;
     private System.Windows.Forms.TabPage resourcesTabPage;
+    private System.Windows.Forms.TabPage jobsTabPage;
     private ProjectResourcesView projectResourcesView;
     private ProjectPermissionsView projectPermissionsView;
+    private ProjectJobsView projectJobsView;
     private System.Windows.Forms.ToolTip toolTip;
   }

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

@@ -100 +100 @@
         projectPermissionsView.Content = null;
         projectResourcesView.Content = null;
+        projectJobsView.Content = null;
       } else {
         BuildProjectTree(Content);
@@ -115 +116 @@
       projectPermissionsView.Enabled = enabled;
       projectResourcesView.Enabled = enabled;
+      projectJobsView.Enabled = enabled;
     }
     #endregion
@@ -228 +230 @@
         MessageBox.Show(
           "Only empty projects can be deleted.",
+          "HeuristicLab Hive Administrator",
+          MessageBoxButtons.OK,
+          MessageBoxIcon.Error);
+        return;
+      }
+
+      if (HiveAdminClient.Instance.Jobs.ContainsKey(selectedProject.Id) 
+        && HiveAdminClient.Instance.Jobs[selectedProject.Id] != null 
+        && HiveAdminClient.Instance.Jobs[selectedProject.Id].Any()) {
+        MessageBox.Show(
+          "There are " + HiveAdminClient.Instance.Jobs[selectedProject.Id].Count + " jobs using this project and/or child-projects. It is necessary to delete them before the project.",
           "HeuristicLab Hive Administrator",
           MessageBoxButtons.OK,
@@ -442 +455 @@
       projectPermissionsView.Content = project;
       projectResourcesView.Content = project;
+      projectJobsView.Content = project;
 
       bool projectIsNew = project != null && project.Id == Guid.Empty;
@@ -454 +468 @@
       projectPermissionsView.Locked = locked;
       projectResourcesView.Locked = locked;
+      projectJobsView.Locked = locked;
       selectedProject = project;
     }