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

Timestamp:

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

Author:

jkarder

Message:

#2839: worked on hive project management

• fixed some bugs
• cleaned up

File:

• branches/2839_HiveProjectManagement/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs (modified) (1 diff)

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()