diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index 55f38280b..bb9aa8317 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -128,10 +128,11 @@ public class GenericResourceAllocation extends task)); } - public static GenericResourceAllocation create(Task task, + public static GenericResourceAllocation createForLimiting(Task task, Collection criterions) { GenericResourceAllocation result = new GenericResourceAllocation(task); result.criterions = new HashSet(criterions); + result.setResourcesPerDay(ResourcesPerDay.amount(1)); return create(result); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java index 14f37cb3f..ee04081ec 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java @@ -72,7 +72,7 @@ public class SpecificResourceAllocation extends * @param task * @return */ - public static SpecificResourceAllocation create(Resource resource, + public static SpecificResourceAllocation createForLimiting(Resource resource, Task task) { assert resource.isLimitingResource(); SpecificResourceAllocation result = create(new SpecificResourceAllocation( diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java index 711723bc7..37977ba83 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/GenericAllocationRow.java @@ -112,8 +112,7 @@ public class GenericAllocationRow extends AllocationRow { } private GenericResourceAllocation createGenericAllocation(Task task) { - GenericResourceAllocation result = GenericResourceAllocation.create( - task, criterions); + GenericResourceAllocation result = GenericResourceAllocation.createForLimiting(task, criterions); GenericResourceAllocation origin = (GenericResourceAllocation) getOrigin(); if (origin != null) { result.overrideAssignedHoursForResource(origin); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java index f5eeecf58..554588551 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/limiting/allocation/LimitingAllocationRow.java @@ -69,7 +69,7 @@ public class LimitingAllocationRow { } public static LimitingAllocationRow create(Resource resource, Task task) { - return new LimitingAllocationRow(SpecificResourceAllocation.create(resource, task), task); + return new LimitingAllocationRow(SpecificResourceAllocation.createForLimiting(resource, task), task); } private LimitingAllocationRow(ResourceAllocation resourceAllocation, @@ -103,7 +103,7 @@ public class LimitingAllocationRow { public static LimitingAllocationRow create(Set criteria, Collection resources, Task task, int priority) { LimitingAllocationRow result = new LimitingAllocationRow( - GenericResourceAllocation.create(task, criteria), task, + GenericResourceAllocation.createForLimiting(task, criteria), task, priority); result.setResources(resources); return result; @@ -115,7 +115,7 @@ public class LimitingAllocationRow { public static LimitingAllocationRow create(Resource resource, Task task, int priority) { - return new LimitingAllocationRow(SpecificResourceAllocation.create( + return new LimitingAllocationRow(SpecificResourceAllocation.createForLimiting( resource, task), task, priority); }