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

Bug #1366: Fix issue subtracting the value when you are removing work report lines

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2012-01-25 17:41:13 +01:00
parent e3e47b924c
commit 88c25ef47c
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderElementDAO.java
View file

@ -520,13 +520,21 @@ public class OrderElementDAO extends IntegrationEntityDAO<OrderElement>
}
private void updateIndirectChargedEffortWithMap(
Map<Long, EffortDuration> relationOrderElementIdAndIndirectChargedEffort)
Map<Long, EffortDuration> relationOrderElementIdAndIndirectChargedEffort,
boolean sum)
throws InstanceNotFoundException {
for (Long id : relationOrderElementIdAndIndirectChargedEffort.keySet()) {
OrderElement orderElement = find(id);
orderElement.getSumChargedEffort().addIndirectChargedEffort(
relationOrderElementIdAndIndirectChargedEffort.get(id));
if (sum) {
orderElement.getSumChargedEffort().addIndirectChargedEffort(
relationOrderElementIdAndIndirectChargedEffort.get(id));
} else {
orderElement.getSumChargedEffort()
.subtractIndirectChargedEffort(
relationOrderElementIdAndIndirectChargedEffort
.get(id));
}
save(orderElement);
}
}
@ -540,7 +548,8 @@ public class OrderElementDAO extends IntegrationEntityDAO<OrderElement>
updateRelatedSumChargedEffortWithDeletedWorkReportLine(line,
relationOrderElementIdAndIndirectChargedEffort);
}
updateIndirectChargedEffortWithMap(relationOrderElementIdAndIndirectChargedEffort);
updateIndirectChargedEffortWithMap(
relationOrderElementIdAndIndirectChargedEffort, false);
}
@Override
@ -552,7 +561,8 @@ public class OrderElementDAO extends IntegrationEntityDAO<OrderElement>
updateRelatedSumChargedEffortWithWorkReportLine(line,
relationOrderElementIdAndIndirectChargedEffort);
}
updateIndirectChargedEffortWithMap(relationOrderElementIdAndIndirectChargedEffort);
updateIndirectChargedEffortWithMap(
relationOrderElementIdAndIndirectChargedEffort, true);
}
@SuppressWarnings("unchecked")

6
libreplan-business/src/main/java/org/libreplan/business/orders/entities/SumChargedEffort.java
View file

@ -62,6 +62,12 @@ public class SumChargedEffort extends BaseEntity {
.plus(indirectChargedEffort);
}
public void subtractIndirectChargedEffort(
EffortDuration indirectChargedEffort) {
this.indirectChargedEffort = this.indirectChargedEffort
.minus(indirectChargedEffort);
}
public EffortDuration getIndirectChargedEffort() {
return indirectChargedEffort;
}