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

ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #475] Fixed advance consolidation reassignments when consolidated date is before task start date.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-06-01 19:07:47 +02:00 • committed by Javier Moran Rua
parent bcf6c17d39
commit 6f17f546b6
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
View file

@ -199,13 +199,18 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
.addConsolidatedValue((CalculatedConsolidatedValue) value);
}
LocalDate startInclusive = value.getDate().plusDays(1);
LocalDate taskStartDate = LocalDate.fromDateFields(task
.getStartDate());
if (startInclusive.compareTo(taskStartDate) < 0) {
startInclusive = taskStartDate;
}
LocalDate endExclusive = LocalDate
.fromDateFields(task.getEndDate());
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
LocalDate startInclusive = value.getDate().plusDays(1);
LocalDate endExclusive = LocalDate.fromDateFields(task
.getEndDate());
for (DayAssignment dayAssignment : resourceAllocation
.getAssignments()) {
if (dayAssignment.getDay().compareTo(startInclusive) < 0) {