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

Moves calculateAndSetTotalHours() to Order

Browse source 
FEA: ItEr77S05BasicProjectImport
This commit is contained in:
Alba Carro 2012-09-02 13:43:41 +02:00 • committed by Manuel Rego Casasnovas
parent 5f514ef913
commit f2763ec051
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java
View file

@ -670,4 +670,12 @@ public class Order extends OrderLineGroup implements Comparable {
return neededToRecalculateSumExpenses;
}
public void calculateAndSetTotalHours() {
int result = 0;
for (OrderElement orderElement : this.getChildren()) {
result = result + orderElement.getWorkHours();
}
this.setTotalHours(result);
}
}

10
libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java
View file

@ -371,7 +371,7 @@ public class SaveCommandBuilder {
Order order = state.getOrder();
generateOrderElementCodes(order);
createAdvancePercentagesIfRequired(order);
calculateAndSetTotalHours(order);
order.calculateAndSetTotalHours();
checkConstraintOrderUniqueCode(order);
checkConstraintHoursGroupUniqueCode(order);
state.synchronizeTrees();
@ -497,14 +497,6 @@ public class SaveCommandBuilder {
.getNumberOfDigitsCode(EntityNameEnum.ORDER));
}
private void calculateAndSetTotalHours(Order order) {
int result = 0;
for (OrderElement orderElement : order.getChildren()) {
result = result + orderElement.getWorkHours();
}
order.setTotalHours(result);
}
private void checkConstraintOrderUniqueCode(OrderElement order) {
OrderElement repeatedOrder;