From f2763ec0517dcec18dce8310b50cbf3c2cb49350 Mon Sep 17 00:00:00 2001 From: Alba Carro Date: Sun, 2 Sep 2012 13:43:41 +0200 Subject: [PATCH] Moves calculateAndSetTotalHours() to Order FEA: ItEr77S05BasicProjectImport --- .../org/libreplan/business/orders/entities/Order.java | 8 ++++++++ .../web/planner/order/SaveCommandBuilder.java | 10 +--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java index 1feab7cd4..7f2834c20 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/entities/Order.java @@ -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); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index 5545e6015..88baac59f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -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;