From c24897ae5966718dffc6aa7e91021389a5d3e71e Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Thu, 31 May 2012 11:32:32 +0200 Subject: [PATCH] Change the way to calculate total extra (summing extra of each day) FEA: ItEr76S28UserDashboard --- .../users/dashboard/MonthlyTimesheetController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java index 7b68d5e78..8f56dc719 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java @@ -316,17 +316,16 @@ public class MonthlyTimesheetController extends GenericForwardComposer } private void updateTotalExtraColumn() { - EffortDuration total = getEffortDuration(getTotalTextboxId()); - EffortDuration capacity = getEffortDuration(getTotalCapacityTextboxId()); - - EffortDuration extra = EffortDuration.zero(); - if (total.compareTo(capacity) > 0) { - extra = total.minus(capacity); + EffortDuration totalExtra = EffortDuration.zero(); + for (LocalDate day = first; day.compareTo(last) <= 0; day = day + .plusDays(1)) { + EffortDuration extra = getEffortDuration(getExtraColumnTextboxId(day)); + totalExtra = totalExtra.plus(extra); } Textbox textbox = (Textbox) timesheet .getFellow(getTotalExtraTextboxId()); - textbox.setValue(effortDurationToString(extra)); + textbox.setValue(effortDurationToString(totalExtra)); } private String getTotalRowTextboxId(final OrderElement orderElement) {