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

Bug #1483: Fix problem getting the last value calculated

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-07-09 09:37:49 +02:00
parent fd440e06c8
commit ea805b3253
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libreplan-business/src/main/java/org/libreplan/business/planner/entities/OrderEarnedValueCalculator.java
View file

@ -47,8 +47,7 @@ public class OrderEarnedValueCalculator extends EarnedValueCalculator implements
@Override
public BigDecimal getActualCostWorkPerformedAt(Order order, LocalDate date) {
SortedMap<LocalDate, BigDecimal> actualCost = calculateActualCostWorkPerformed(order);
BigDecimal result = actualCost.get(date);
return (result != null) ? result : BigDecimal.ZERO;
return getValueAt(actualCost, date);
}
@Transactional(readOnly = true)
@ -130,8 +129,24 @@ public class OrderEarnedValueCalculator extends EarnedValueCalculator implements
@Transactional(readOnly = true)
public BigDecimal getBudgetedCostWorkPerformedAt(Order order, LocalDate date) {
SortedMap<LocalDate, BigDecimal> budgetedCost = calculateBudgetedCostWorkPerformed(order);
BigDecimal result = budgetedCost.get(date);
return (result != null) ? result : BigDecimal.ZERO;
return getValueAt(budgetedCost, date);
}
private BigDecimal getValueAt(SortedMap<LocalDate, BigDecimal> map,
LocalDate date) {
BigDecimal result = map.get(date);
if (result != null) {
return result;
}
for (LocalDate each : map.keySet()) {
if (date.isBefore(each)) {
return map.get(each);
}
}
if (date.isAfter(map.lastKey())) {
return map.get(map.lastKey());
}
return BigDecimal.ZERO;
}
@Override