diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index edd0df2c3..6ea06efc6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -706,7 +706,7 @@ public abstract class ResourceAllocation extends return getWorkHoursPerDay().toHours(day, resourcesPerDay); } - private ResourcesPerDay calculateResourcesPerDayFromAssignments() { + public ResourcesPerDay calculateResourcesPerDayFromAssignments() { return calculateResourcesPerDayFromAssignments(getAssignments()); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index a6b02b4ba..48fa9302e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -462,10 +462,10 @@ public abstract class AllocationRow { public ResourcesPerDay getTotalResourcesPerDay() { if (temporal != null) { - return temporal.getResourcesPerDay(); + return temporal.calculateResourcesPerDayFromAssignments(); } if (origin != null) { - return origin.getResourcesPerDay(); + return origin.calculateResourcesPerDayFromAssignments(); } return ResourcesPerDay.amount(0); } @@ -480,4 +480,20 @@ public abstract class AllocationRow { return ResourcesPerDay.amount(0); } + public void loadResourcesPerDay() { + if (temporal != null) { + nonConsolidatedResourcesPerDay = temporal.getNonConsolidatedResourcePerDay(); + } else { + if (origin != null) { + nonConsolidatedResourcesPerDay = origin + .getNonConsolidatedResourcePerDay(); + } else { + nonConsolidatedResourcesPerDay = ResourcesPerDay.amount(0); + } + } + + resourcesPerDayInput.setValue(nonConsolidatedResourcesPerDay + .getAmount()); + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java index 781e3589b..ae922199e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java @@ -384,6 +384,7 @@ public class FormBinder { } private void reloadValues() { + loadResourcesPerDay(); loadHoursValues(); loadValueForAssignedHoursComponent(); loadValueForEndDate(); @@ -417,6 +418,12 @@ public class FormBinder { } } + private void loadResourcesPerDay() { + for (AllocationRow each : rows) { + each.loadResourcesPerDay(); + } + } + private void loadDerivedAllocations() { for (AllocationRow each : rows) { each.reloadDerivedAllocationsGrid();