From cd9c71d18e03f10bc3754283c910d6940a370386 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Thu, 17 Nov 2011 17:54:28 +0100
Subject: [PATCH] [Bug #1269] Fix tooltip text using now configured progress
 type

FEA: ItEr75S04BugFixing
---
 .../web/planner/TaskElementAdapter.java       | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 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 94d0d0cba..383c9ef24 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
@@ -575,19 +575,7 @@ public class TaskElementAdapter {
 
             @Override
             public GanttDate getAdvanceEndDate() {
-                BigDecimal advancePercentage = BigDecimal.ZERO;
-
-                if (taskElement.getOrderElement() != null) {
-                    if (isTaskRoot(taskElement)) {
-                        ProgressType progressType = getProgressTypeFromConfiguration();
-                        advancePercentage = taskElement
-                                .getAdvancePercentage(progressType);
-
-                    } else {
-                        advancePercentage = taskElement.getAdvancePercentage();
-                    }
-                }
-                return getAdvanceEndDate(advancePercentage);
+                return getAdvanceEndDate(getAdvancePercentage());
             }
 
             private boolean isTaskRoot(TaskElement taskElement) {
@@ -887,14 +875,21 @@ public class TaskElementAdapter {
             @Override
             public BigDecimal getAdvancePercentage() {
                 if (taskElement != null) {
-                    return taskElement.getAdvancePercentage();
+                    BigDecimal advancePercentage;
+                    if (isTaskRoot(taskElement)) {
+                        ProgressType progressType = getProgressTypeFromConfiguration();
+                        advancePercentage = taskElement
+                                .getAdvancePercentage(progressType);
+                    } else {
+                        advancePercentage = taskElement.getAdvancePercentage();
+                    }
+                    return advancePercentage;
                 }
                 return new BigDecimal(0);
             }
 
             private String buildTooltipText() {
-                return buildTooltipText(asPercentage(taskElement
-                        .getAdvancePercentage()));
+                return buildTooltipText(asPercentage(getAdvancePercentage()));
             }
 
             private BigDecimal asPercentage(BigDecimal value) {