Changeset 15908 for branches/2839_HiveProjectManagement

Timestamp:

04/17/18 13:38:33 (7 years ago)

Author:

jkarder

Message:

#2839: worked on hive project management

• fixed some bugs
• cleaned up

Location:

branches/2839_HiveProjectManagement

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Services.Access.DataAccess/3.3/AccessService.dbml (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimProjectDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml (modified) (4 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs (modified) (12 diffs)
• HeuristicLab.Services.Hive.JanitorService/3.3/ProjectInstaller.Designer.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/SpaceUsageController.cs (modified) (3 diffs)

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

@@ -284 +284 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\ProjectView.resx">
-      <DependentUpon>ProjectView.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProjectView));
       this.idLabel = new System.Windows.Forms.Label();
       this.idTextBox = new System.Windows.Forms.TextBox();
@@ -193 +192 @@
       // refreshButton
       // 
-      this.refreshButton.Image = ((System.Drawing.Image)(resources.GetObject("refreshButton.Image")));
+      this.refreshButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Refresh;
       this.refreshButton.Location = new System.Drawing.Point(72, 162);
       this.refreshButton.Name = "refreshButton";

branches/2839_HiveProjectManagement/HeuristicLab.Services.Access.DataAccess/3.3/AccessService.dbml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?><Database Name="HeuristicLab.ClientManagement" Class="AccessServiceDataContext" xmlns="http://schemas.microsoft.com/linqtosql/dbml/2007">
-  <Connection Mode="AppSettings" ConnectionString="Data Source=HIVELAB;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService" SettingsObjectName="HeuristicLab.Services.Access.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_ClientManagementConnectionString" Provider="System.Data.SqlClient" />
+  <Connection Mode="AppSettings" ConnectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.AccessService" SettingsObjectName="HeuristicLab.Services.Access.DataAccess.Properties.Settings" SettingsPropertyName="HeuristicLab_ClientManagementConnectionString" Provider="System.Data.SqlClient" />
   <Table Name="dbo.Resource" Member="Resources">
     <Type Name="Resource" InheritanceCode="Resource" IsInheritanceDefault="true">

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimProjectDao.cs

@@ -55 +55 @@
         (from dimProject in db.GetTable<DimProject>()
          where dimProject.ProjectId == projectId
-         select dimProject).ToList());
+         select dimProject));
     private static readonly Func<DataContext, Guid, Guid> GetLastValidIdByProjectIdQuery =
       CompiledQuery.Compile((DataContext db, Guid projectId) =>
@@ -67 +67 @@
         (from dimProject in db.GetTable<DimProject>()
          where dimProject.DateExpired == null
-         select dimProject).ToList());
+         select dimProject));
     #endregion
   }

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs

@@ -60 +60 @@
         (from job in db.GetTable<Job>()
          where job.State == jobState
-         select job).ToList());
+         select job));
     private static readonly Func<DataContext, JobState, IEnumerable<Guid>> GetJobIdsByStateQuery =
       CompiledQuery.Compile((DataContext db, JobState jobState) =>
         (from job in db.GetTable<Job>()
          where job.State == jobState
-         select job.JobId).ToList());
+         select job.JobId));
     private static readonly Func<DataContext, IEnumerable<Job>> GetJobsReadyForDeletionQuery =
       CompiledQuery.Compile((DataContext db) =>
@@ -75 +75 @@
               || task.State == TaskState.Aborted
               || task.State == TaskState.Failed).All(x => x)
-         select job).ToList());
+         select job));
     #endregion
 

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs

@@ -65 +65 @@
     /// <returns></returns>
     public IEnumerable<Task> GetParentTasks(IEnumerable<Guid> resourceIds, int count, bool finished) {
-      var query = from t in Table
-                  where t.State == TaskState.Waiting
+    var query = from t in Table
+                where t.State == TaskState.Waiting
                     && t.IsParentTask
-                    && !t.Job.AssignedJobResources.Select(x => x.ResourceId).Except(resourceIds).Any()
+                    && t.Job.AssignedJobResources.All(x => resourceIds.ToList().Contains(x.ResourceId))
                     && t.FinishWhenChildJobsFinished == finished
                     && t.ChildJobs.Any()

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

@@ -153 +153 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.cs.frame" />
-    <Compile Include="Settings.cs" />
     <Compile Include="Settings.Designer.cs">
       <AutoGen>True</AutoGen>

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

@@ -37 +37 @@
       <Column Name="HbInterval" Type="System.Int32" DbType="Int" CanBeNull="false" />
       <Column Name="OwnerUserId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
-      <Association Name="Resource_AssignedProjectResource" Member="AssignedProjectResources" Storage="_AssignedResources" ThisKey="ResourceId" OtherKey="ResourceId" Type="AssignedProjectResource" />
+      <Association Name="Resource_AssignedProjectResource" Member="AssignedProjectResources" ThisKey="ResourceId" OtherKey="ResourceId" Type="AssignedProjectResource" />
       <Association Name="Resource_Resource" Member="ChildResources" ThisKey="ResourceId" OtherKey="ParentResourceId" Type="Resource" />
       <Association Name="Resource_Downtime" Member="Downtimes" Storage="_UptimeCalendars" ThisKey="ResourceId" OtherKey="ResourceId" Type="Downtime" />
@@ -261 +261 @@
       <Column Name="StartDate" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" />
       <Column Name="EndDate" Type="System.DateTime" DbType="DateTime" CanBeNull="true" />
-      <Association Name="Project_AssignedProjectResource" Member="AssignedProjectResources" Storage="_AssignedResources" ThisKey="ProjectId" OtherKey="ProjectId" Type="AssignedProjectResource" />
+      <Association Name="Project_AssignedProjectResource" Member="AssignedProjectResources" ThisKey="ProjectId" OtherKey="ProjectId" Type="AssignedProjectResource" />
       <Association Name="Project_Job" Member="Jobs" ThisKey="ProjectId" OtherKey="ProjectId" Type="Job" />
       <Association Name="Project_Project" Member="ChildProjects" Storage="_Projects" ThisKey="ProjectId" OtherKey="ParentProjectId" Type="Project" />
@@ -284 +284 @@
     </Type>
   </Table>
-  <Table Name="" Member="FactProjectInfos">
+  <Table Name="[statistics].FactProjectInfo" Member="FactProjectInfos">
     <Type Name="FactProjectInfo">
       <Column Name="ProjectId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
@@ -296 +296 @@
     </Type>
   </Table>
-  <Table Name="" Member="DimProjects">
+  <Table Name="[statistics].DimProject" Member="DimProjects">
     <Type Name="DimProject">
       <Column Name="Id" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

@@ -941 +941 @@
     private System.Nullable<System.Guid> _OwnerUserId;
     
-    private EntitySet<AssignedProjectResource> _AssignedResources;
+    private EntitySet<AssignedProjectResource> _AssignedProjectResources;
     
     private EntitySet<Resource> _ChildResources;
@@ -973 +973 @@
     public Resource()
     {
-      this._AssignedResources = new EntitySet<AssignedProjectResource>(new Action<AssignedProjectResource>(this.attach_AssignedResources), new Action<AssignedProjectResource>(this.detach_AssignedResources));
+      this._AssignedProjectResources = new EntitySet<AssignedProjectResource>(new Action<AssignedProjectResource>(this.attach_AssignedProjectResources), new Action<AssignedProjectResource>(this.detach_AssignedProjectResources));
       this._ChildResources = new EntitySet<Resource>(new Action<Resource>(this.attach_ChildResources), new Action<Resource>(this.detach_ChildResources));
       this._UptimeCalendars = new EntitySet<Downtime>(new Action<Downtime>(this.attach_UptimeCalendars), new Action<Downtime>(this.detach_UptimeCalendars));
@@ -1106 +1106 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_AssignedProjectResource", Storage="_AssignedResources", ThisKey="ResourceId", OtherKey="ResourceId")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Resource_AssignedProjectResource", Storage="_AssignedProjectResources", ThisKey="ResourceId", OtherKey="ResourceId")]
     public EntitySet<AssignedProjectResource> AssignedProjectResources
     {
       get
       {
-        return this._AssignedResources;
-      }
-      set
-      {
-        this._AssignedResources.Assign(value);
+        return this._AssignedProjectResources;
+      }
+      set
+      {
+        this._AssignedProjectResources.Assign(value);
       }
     }
@@ -1225 +1225 @@
     }
     
-    private void attach_AssignedResources(AssignedProjectResource entity)
+    private void attach_AssignedProjectResources(AssignedProjectResource entity)
     {
       this.SendPropertyChanging();
@@ -1231 +1231 @@
     }
     
-    private void detach_AssignedResources(AssignedProjectResource entity)
+    private void detach_AssignedProjectResources(AssignedProjectResource entity)
     {
       this.SendPropertyChanging();
@@ -5651 +5651 @@
     private System.Nullable<System.DateTime> _EndDate;
     
-    private EntitySet<AssignedProjectResource> _AssignedResources;
+    private EntitySet<AssignedProjectResource> _AssignedProjectResources;
     
     private EntitySet<Job> _Jobs;
@@ -5685 +5685 @@
     public Project()
     {
-      this._AssignedResources = new EntitySet<AssignedProjectResource>(new Action<AssignedProjectResource>(this.attach_AssignedResources), new Action<AssignedProjectResource>(this.detach_AssignedResources));
+      this._AssignedProjectResources = new EntitySet<AssignedProjectResource>(new Action<AssignedProjectResource>(this.attach_AssignedProjectResources), new Action<AssignedProjectResource>(this.detach_AssignedProjectResources));
       this._Jobs = new EntitySet<Job>(new Action<Job>(this.attach_Jobs), new Action<Job>(this.detach_Jobs));
       this._Projects = new EntitySet<Project>(new Action<Project>(this.attach_Projects), new Action<Project>(this.detach_Projects));
@@ -5857 +5857 @@
     }
     
-    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Project_AssignedProjectResource", Storage="_AssignedResources", ThisKey="ProjectId", OtherKey="ProjectId")]
+    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Project_AssignedProjectResource", Storage="_AssignedProjectResources", ThisKey="ProjectId", OtherKey="ProjectId")]
     public EntitySet<AssignedProjectResource> AssignedProjectResources
     {
       get
       {
-        return this._AssignedResources;
-      }
-      set
-      {
-        this._AssignedResources.Assign(value);
+        return this._AssignedProjectResources;
+      }
+      set
+      {
+        this._AssignedProjectResources.Assign(value);
       }
     }
@@ -5963 +5963 @@
     }
     
-    private void attach_AssignedResources(AssignedProjectResource entity)
+    private void attach_AssignedProjectResources(AssignedProjectResource entity)
     {
       this.SendPropertyChanging();
@@ -5969 +5969 @@
     }
     
-    private void detach_AssignedResources(AssignedProjectResource entity)
+    private void detach_AssignedProjectResources(AssignedProjectResource entity)
     {
       this.SendPropertyChanging();
@@ -6331 +6331 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="[statistics].FactProjectInfo")]
   public partial class FactProjectInfo : INotifyPropertyChanging, INotifyPropertyChanged
   {
@@ -6595 +6595 @@
   }
   
-  [global::System.Data.Linq.Mapping.TableAttribute(Name="")]
+  [global::System.Data.Linq.Mapping.TableAttribute(Name="[statistics].DimProject")]
   public partial class DimProject : INotifyPropertyChanging, INotifyPropertyChanged
   {

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.JanitorService/3.3/ProjectInstaller.Designer.cs

@@ -50 +50 @@
       // serviceProcessInstaller1
       // 
-      this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.LocalSystem;
+      this.serviceProcessInstaller1.Account = System.ServiceProcess.ServiceAccount.NetworkService;
       this.serviceProcessInstaller1.Installers.AddRange(new System.Configuration.Install.Installer[] {
             this.serviceInstaller1});

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveService.cs

@@ -391 +391 @@
 
           var job = jobDao.Save(newJob);
-          if (userPriorityDao.GetById(jobDto.OwnerUserId) == null) {
+          if (userPriorityDao.GetById(newJob.OwnerUserId) == null) {
             userPriorityDao.Save(new DA.UserPriority {
-              UserId = jobDto.OwnerUserId,
-              DateEnqueued = jobDto.DateCreated
+              UserId = newJob.OwnerUserId,
+              DateEnqueued = newJob.DateCreated
             });
           }

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

@@ -421 +421 @@
         let uStats = projectUsageStats.Where(x => x.ProjectId == dimp.ProjectId).SingleOrDefault()
         select new FactProjectInfo {
-            ProjectId = dimp.ProjectId,
+            ProjectId = dimp.Id,
             DimTime = newTime,
             NumTotalCores = aStats != null ? aStats.Cores : 0,

branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/SpaceUsageController.cs

@@ -36 +36 @@
     public IEnumerable<TableInformation> GetHiveTableInformation() {
       var tables = new List<string> {
-        "AssignedResources",
+        "AssignedJobResource",
+        "AssignedProjectResource",
         "Downtime",
         "Job",
@@ -43 +44 @@
         "Plugin",
         "PluginData",
+        "Project",
+        "ProjectPermission",
         "RequiredPlugins",
         "Resource",
-        "ResourcePermission",
         "StateLog",
         "Task",
@@ -65 +67 @@
         "statistics.DimClient",
         "statistics.DimJob",
+        "statistics.DimProject",
         "statistics.DimTime",
         "statistics.DimUser",
         "statistics.FactClientInfo",
+        "statistics.FactProjectInfo",
         "statistics.FactTask"
       };