Changeset 15966

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

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/HeuristicLab.Clients.Hive.Administrator-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs (added)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (5 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveResourceSelector.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/JobDao.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveService.cs (modified) (9 diffs)
• HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs (modified) (1 diff)

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;
     }

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

@@ -48 +48 @@
     private const string ADDED_SELECTION_TAG = " [added selection]";
     private const string REMOVED_SELECTION_TAG = " [removed selection]";
+    private const string SELECTED_TAG = " [selected]";
     private const string INCLUDED_TAG = " [included]";
     private const string ADDED_INCLUDE_TAG = " [added include]";
@@ -537 +538 @@
         if (newAssignedResources.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.Checked = true;
+          if(!addedAssignments.Select(x => x.Id).Contains(newResource.Id) && !removedAssignments.Select(x => x.Id).Contains(newResource.Id)) {
+            newNode.Text += SELECTED_TAG;
+          }
         } else if (newIncludedResources.Select(x => x.Id).Contains(newResource.Id)) {
           newNode.Checked = true;
@@ -702 +706 @@
           if (newAssignedResources.Select(x => x.Id).Contains(resource.Id)) {
             n.Checked = true;
+            if (!addedAssignments.Select(x => x.Id).Contains(resource.Id) && !removedAssignments.Select(x => x.Id).Contains(resource.Id)) {
+              n.Text += SELECTED_TAG;
+            }
           } else if (newIncludedResources.Select(x => x.Id).Contains(resource.Id)) {
             n.Checked = true;

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

@@ -479 +479 @@
 
     private void updateButton_Click(object sender, EventArgs e) {
+      if (Content.ExecutionState == ExecutionState.Stopped) {
+        MessageBox.Show("Job cannot be updated once it stopped.", "HeuristicLab Hive Job Manager", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        return;
+      }
+
       HiveClient.UpdateJob(
         (Exception ex) => ErrorHandling.ShowErrorDialog(this, "Update failed.", ex), 

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

@@ -70 +70 @@
     }
 
+    private Dictionary<Guid, HiveItemCollection<Job>> jobs;
+    public Dictionary<Guid, HiveItemCollection<Job>> Jobs {
+      get { return jobs; }
+      set {
+        if (value != jobs)
+          jobs = value;
+        }
+    }
+
+
     //private Dictionary<Guid, HashSet<Project>> projectAncestors;
     //public Dictionary<Guid, HashSet<Project>> ProjectAncestors {
@@ -134 +144 @@
         projects = new ItemList<Project>();
         projectResourceAssignments = new ItemList<AssignedProjectResource>();
-
-        //projectAncestors = new Dictionary<Guid, HashSet<Project>>();
-        //projectDescendants = new Dictionary<Guid, HashSet<Project>>();
-        //resourceAncestors = new Dictionary<Guid, HashSet<Resource>>();
-        //resourceDescendants = new Dictionary<Guid, HashSet<Resource>>();
+        jobs = new Dictionary<Guid, HiveItemCollection<Job>>();
+
         projectAncestors = new Dictionary<Guid, HashSet<Guid>>();
         projectDescendants = new Dictionary<Guid, HashSet<Guid>>();
@@ -149 +156 @@
           service.GetProjectsForAdministration().ForEach(p => projects.Add(p));
           var projectIds = projects.Select(p => p.Id).ToList();
-          if(projectIds.Any())
+          if (projectIds.Any()) {
             service.GetAssignedResourcesForProjectsAdministration(projectIds)
-            .ForEach(a => projectResourceAssignments.Add(a));
+              .ForEach(a => projectResourceAssignments.Add(a));
+            projectIds.ForEach(p => jobs.Add(p, new HiveItemCollection<Job>()));
+            service.GetJobsByProjectIds(projectIds)
+              .ForEach(j => jobs[j.ProjectId].Add(j));
+          }
         });
 

branches/2839_HiveProjectManagement/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -2385 +2385 @@
         System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobs();
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobsByProjectId", ReplyAction="http://tempuri.org/IHiveService/GetJobsByProjectIdResponse")]
+        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectId(System.Guid projectId);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/GetJobsByProjectIds", ReplyAction="http://tempuri.org/IHiveService/GetJobsByProjectIdsResponse")]
+        System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectIds(System.Collections.Generic.List<System.Guid> projectIds);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/AddJob", ReplyAction="http://tempuri.org/IHiveService/AddJobResponse")]
         System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds);
@@ -2655 +2661 @@
         }
         
+        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectId(System.Guid projectId)
+        {
+            return base.Channel.GetJobsByProjectId(projectId);
+        }
+        
+        public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetJobsByProjectIds(System.Collections.Generic.List<System.Guid> projectIds)
+        {
+            return base.Channel.GetJobsByProjectIds(projectIds);
+        }
+        
         public System.Guid AddJob(HeuristicLab.Clients.Hive.Job jobDto, System.Collections.Generic.List<System.Guid> resourceIds)
         {

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

@@ -32 +32 @@
       return GetByIdQuery(DataContext, id);
     }
-    
+
     public void DeleteByState(JobState state) {
       DataContext.ExecuteCommand(DeleteByStateQueryString, Enum.GetName(typeof(JobState), state));
+    }
+
+    public IEnumerable<Job> GetByProjectId(Guid id) {
+      return GetByProjectIdQuery(DataContext, id);
+    }
+
+    public IEnumerable<Job> GetByProjectIds(IEnumerable<Guid> projectIds) {
+      string paramProjectIds = string.Join(",", projectIds.ToList().Select(x => string.Format("'{0}'", x)));
+      if(!string.IsNullOrWhiteSpace(paramProjectIds)) {
+        string queryString = string.Format(GetByProjectIdsQueryString, paramProjectIds);
+        return DataContext.ExecuteQuery<Job>(queryString);
+      }
+      return Enumerable.Empty<Job>();
     }
 
@@ -56 +69 @@
          where job.JobId == jobId
          select job).SingleOrDefault());
+    private static readonly Func<DataContext, Guid, IEnumerable<Job>> GetByProjectIdQuery =
+      CompiledQuery.Compile((DataContext db, Guid projectId) =>
+        (from job in db.GetTable<Job>()
+         where job.ProjectId == projectId
+         select job));
     private static readonly Func<DataContext, JobState, IEnumerable<Job>> GetByStateQuery =
       CompiledQuery.Compile((DataContext db, JobState jobState) =>
@@ -92 +110 @@
         WHERE t.JobId = j.JobId)
     ";
+    private const string GetByProjectIdsQueryString = @"
+      SELECT DISTINCT j.*
+      FROM [Job] j
+      WHERE j.ProjectId IN ({0})
+    ";
     #endregion
   }

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

@@ -366 +366 @@
     }
 
+    public IEnumerable<DT.Job> GetJobsByProjectId(Guid projectId) {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("GetJobsByProjectId")) {
+        var currentUserId = UserManager.CurrentUserId;
+        var projectDao = pm.ProjectDao;
+        var jobDao = pm.JobDao;
+
+        return pm.UseTransaction(() => {
+          // check if user is granted to administer the requested projectId
+          var administrationGrantedProjects = projectDao
+            .GetAdministrationGrantedProjectsForUser(currentUserId)
+            .ToList();
+
+          if(administrationGrantedProjects.Select(x => x.ProjectId).Contains(projectId)) {
+            return jobDao.GetByProjectId(projectId)
+            .Select(x => x.ToDto())
+            .ToList();
+          } else {
+            return Enumerable.Empty<DT.Job>();
+          }
+        });
+      }
+    }
+
+    public IEnumerable<DT.Job> GetJobsByProjectIds(IEnumerable<Guid> projectIds) {
+      RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var pm = PersistenceManager;
+      using (new PerformanceLogger("GetJobsByProjectIds")) {
+        var currentUserId = UserManager.CurrentUserId;
+        var projectDao = pm.ProjectDao;
+        var jobDao = pm.JobDao;
+        return pm.UseTransaction(() => {
+          // check for which of requested projectIds the user is granted to administer
+          var administrationGrantedProjectIds = projectDao
+            .GetAdministrationGrantedProjectsForUser(currentUserId)
+            .Select(x => x.ProjectId)
+            .ToList();
+          var requestedAndGrantedProjectIds = projectIds.Intersect(administrationGrantedProjectIds);
+
+          if(requestedAndGrantedProjectIds.Any()) {
+            return jobDao.GetByProjectIds(requestedAndGrantedProjectIds)
+              .Select(x => x.ToDto())
+              .ToList();
+          } else {
+            return Enumerable.Empty<DT.Job>();
+          }
+        });
+      }
+    }
+
     public Guid AddJob(DT.Job jobDto, IEnumerable<Guid> resourceIds) {
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
+      var dateCreated = DateTime.Now;
+      var pm = PersistenceManager;
+
+      // check project availability (cf. duration)
+      CheckProjectAvailability(pm, jobDto.ProjectId, dateCreated);
+
       // check user - project
       AuthorizationManager.AuthorizeUserForProjectUse(UserManager.CurrentUserId, jobDto.ProjectId);
+
       // check project - resources
       AuthorizationManager.AuthorizeProjectForResourcesUse(jobDto.ProjectId, resourceIds);
-      var pm = PersistenceManager;
+      
       using (new PerformanceLogger("AddJob")) {
         var jobDao = pm.JobDao;
@@ -380 +438 @@
           var newJob = jobDto.ToEntity();
           newJob.OwnerUserId = UserManager.CurrentUserId;
-          newJob.DateCreated = DateTime.Now;
+          newJob.DateCreated = dateCreated;
 
           // add resource assignments
@@ -406 +464 @@
       RoleVerifier.AuthenticateForAnyRole(HiveRoles.Administrator, HiveRoles.Client);
       AuthorizationManager.AuthorizeForJob(jobDto.Id, DT.Permission.Full);
+      var pm = PersistenceManager;
+      var dateUpdated = DateTime.Now;
+
+      // check project availability
+      CheckProjectAvailability(pm, jobDto.ProjectId, dateUpdated);
       // check user - project permission
       AuthorizationManager.AuthorizeUserForProjectUse(UserManager.CurrentUserId, jobDto.ProjectId);
@@ -411 +474 @@
       AuthorizationManager.AuthorizeProjectForResourcesUse(jobDto.ProjectId, resourceIds);
 
-      var pm = PersistenceManager;
       using (new PerformanceLogger("UpdateJob")) {
         bool exists = true;
@@ -466 +528 @@
           if(job != null) {
             var jobStateEntity = jobState.ToEntity();
-            // note: allow solely state changes from "Online" to "StatisticsPending"
-            // and from "StatisticsPending" to "DeletionPending"
+            // note: allow solely state changes from "Online" to "StatisticsPending" = deletion request by user for HiveStatisticGenerator
+            // and from "StatisticsPending" to "DeletionPending" = deletion request by HiveStatisticGenerator for EventManager
             if (job.State == DA.JobState.Online && jobStateEntity == DA.JobState.StatisticsPending) {
               job.State = jobStateEntity;
@@ -774 +836 @@
       using (new PerformanceLogger("DeleteProject")) {
         var projectDao = pm.ProjectDao;
+        var jobDao = pm.JobDao;
         var assignedJobResourceDao = pm.AssignedJobResourceDao;
         pm.UseTransaction(() => {
@@ -779 +842 @@
           projectIds.Union(projectDao.GetChildProjectIdsById(projectId));
 
-          assignedJobResourceDao.DeleteByProjectIds(projectIds);
-          projectDao.DeleteByIds(projectIds);
-          pm.SubmitChanges();
+          var jobs = jobDao.GetByProjectIds(projectIds)
+            .Select(x => x.ToDto())
+            .ToList();
+
+          if(jobs.Count > 0) {
+            throw new InvalidOperationException("There are " + jobs.Count + " job(s) using this project and/or child-projects. It is necessary to delete them before the project.");
+          } else {
+            assignedJobResourceDao.DeleteByProjectIds(projectIds);
+            projectDao.DeleteByIds(projectIds);
+            pm.SubmitChanges();
+          }
         });
       }
@@ -814 +885 @@
         userAndGroupIds.AddRange(UserManager.GetUserGroupIdsOfUser(currentUserId));
         return pm.UseTransaction(() => {
-          return projectDao.GetUsageGrantedProjectsForUser(userAndGroupIds)
+          var projects = projectDao.GetUsageGrantedProjectsForUser(userAndGroupIds)
             .Select(x => x.ToDto()).ToList();
+          var now = DateTime.Now;
+          return projects.Where(x => x.StartDate <= now && x.EndDate >= now).ToList();
         });
       }
@@ -1650 +1723 @@
     }
 
+    private void CheckProjectAvailability(IPersistenceManager pm, Guid projectId, DateTime date) {
+      var projectDao = pm.ProjectDao;
+      using (new PerformanceLogger("UpdateJob")) {
+        var project = pm.UseTransaction(() => {
+          return projectDao.GetById(projectId);
+        });
+        if (project != null) {
+          if (project.StartDate > date) throw new ArgumentException("Cannot add job to specified project. The start date of the project is still in the future.");
+          else if (project.EndDate < date) throw new ArgumentException("Cannot add job to specified project. The end date of the project is already in the past.");
+        } else {
+          throw new ArgumentException("Cannot add job to specified project. The project seems not to be available anymore.");
+        }
+      }
+    }
+
     #endregion
   }

branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive/3.3/ServiceContracts/IHiveService.cs

@@ -79 +79 @@
 
     [OperationContract]
+    IEnumerable<Job> GetJobsByProjectId(Guid projectId);
+
+    [OperationContract]
+    IEnumerable<Job> GetJobsByProjectIds(IEnumerable<Guid> projectIds);
+
+    [OperationContract]
     Guid AddJob(Job jobDto, IEnumerable<Guid> resourceIds);