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

[Bug #1036] Fix bug removing a consolidation

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-02 12:29:23 +02:00
parent 419d7b9889
commit c58614b818
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -632,12 +632,18 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
private boolean isCompletelyConsolidated() {
return task.getConsolidation() != null
return hasConsolidationValues()
&& getUnconsolidatedPercentage().setScale(2).equals(
BigDecimal.ZERO.setScale(2));
BigDecimal.ZERO.setScale(2));
}
private boolean hasConsolidationValues() {
return task.getConsolidation() != null
&& !task.getConsolidation().getConsolidatedValues().isEmpty();
}
private BigDecimal getUnconsolidatedPercentage() {
assert hasConsolidationValues();
BigDecimal lastConslidation = task.getConsolidation()
.getConsolidatedValues().last().getValue();
BigDecimal unconsolitedPercentage = BigDecimal.ONE