From 7518270ced8878e0011fb064214b4f2f28739711 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 23 Dec 2011 14:14:47 +0100 Subject: [PATCH] [Bug #1242] Use IntraDayDate to draw the progress bar in leaf Tasks. The advance bar was always drawn until the end of the day, even when the task finished in the middle of the day, causing a weird effect. FEA: ItEr75S04BugFixing --- .../org/libreplan/web/planner/TaskElementAdapter.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java index d0755f992..903d961ba 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java @@ -745,13 +745,8 @@ public class TaskElementAdapter { EffortDuration decrement = min(entry.getValue(), hoursLeft); hoursLeft = hoursLeft.minus(decrement); if (hoursLeft.isZero()) { - if (decrement.equals(entry.getValue())) { - result = IntraDayDate.startOfDay(entry.getKey() - .plusDays(1)); - } else { - result = IntraDayDate.create(entry.getKey(), - decrement); - } + result = IntraDayDate.create(entry.getKey(), + decrement); break; } else { result = IntraDayDate.startOfDay(entry.getKey()