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

ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #475] Fixed problem consolidating and advance after the end of the task.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-06-02 19:16:12 +02:00 • committed by Javier Moran Rua
parent 129f3db74b
commit eb03750192
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,7 +131,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
}
@Override
@Transactional
@Transactional(readOnly = true)
public void accept() {
if (context != null && orderElement != null && isVisibleAdvances()) {
org.zkoss.ganttz.data.Task ganttTask = context.getTask();
@ -205,8 +205,6 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
if (startInclusive.compareTo(taskStartDate) < 0) {
startInclusive = taskStartDate;
}
LocalDate endExclusive = LocalDate
.fromDateFields(task.getEndDate());
Set<ResourceAllocation<?>> allResourceAllocations = task
.getAllResourceAllocations();
@ -218,6 +216,9 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
}
}
LocalDate endExclusive = LocalDate.fromDateFields(task
.getEndDate());
Integer pendingHours = BigDecimal.ONE.subtract(
value.getValue().divide(new BigDecimal(100),
RoundingMode.DOWN)).multiply(
@ -227,8 +228,7 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
if (value.getDate().compareTo(
LocalDate.fromDateFields(task.getEndDate())) > 0) {
if (value.getDate().compareTo(endExclusive) > 0) {
LocalDate date = ResourceAllocation.allocating(
Arrays.asList(resourceAllocation
.asResourcesPerDayModification()))