RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Update resources per day value at allocation grid.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-06-16 15:09:09 +02:00 • committed by Javier Moran Rua
parent 056bcfddc3
commit 3971221313
3 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -706,7 +706,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
return getWorkHoursPerDay().toHours(day, resourcesPerDay);
}
private ResourcesPerDay calculateResourcesPerDayFromAssignments() {
public ResourcesPerDay calculateResourcesPerDayFromAssignments() {
return calculateResourcesPerDayFromAssignments(getAssignments());
}

20
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java
View file

@ -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());
}
}

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/FormBinder.java
View file

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