From 643fac0fbd197ca3e0189272b93934648aa91cc6 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 9 Jul 2012 12:23:45 +0200
Subject: [PATCH] Bug #1483: Improve labels in cost indicators

FEA: ItEr76S04BugFixing
---
 .../web/dashboard/CostStatusController.java   | 33 +++++++++++++++++++
 .../src/main/webapp/dashboard/_costStatus.zul | 16 +++++----
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java
index 95a5b322e..c0c079f4d 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/CostStatusController.java
@@ -28,6 +28,7 @@ import java.util.Date;
 import org.joda.time.LocalDate;
 import org.libreplan.business.orders.entities.Order;
 import org.libreplan.web.common.Util;
+import org.libreplan.web.planner.chart.EarnedValueChartFiller.EarnedValueType;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
@@ -120,4 +121,36 @@ public class CostStatusController extends GenericForwardComposer {
         label.setValue(value.setScale(2, RoundingMode.HALF_UP) + " %");
     }
 
+    public String getLabel(EarnedValueType type) {
+        return type.getAcronym() + " (" + type.getName() + ")";
+    }
+
+    public String getLabelCV() {
+        return getLabel(EarnedValueType.CV);
+    }
+
+    public String getLabelACWP() {
+        return getLabel(EarnedValueType.ACWP);
+    }
+
+    public String getLabelCPI() {
+        return getLabel(EarnedValueType.CPI);
+    }
+
+    public String getLabelETC() {
+        return getLabel(EarnedValueType.ETC);
+    }
+
+    public String getLabelEAC() {
+        return getLabel(EarnedValueType.EAC);
+    }
+
+    public String getLabelBAC() {
+        return getLabel(EarnedValueType.BAC);
+    }
+
+    public String getLabelVAC() {
+        return getLabel(EarnedValueType.VAC);
+    }
+
 }
diff --git a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
index 30c88507e..604a5421c 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
@@ -34,23 +34,25 @@
                 <vbox hflex="1" align="pack" vflex="1">
                     <vbox style="margin-bottom:10px">
                     <label class="dashboard-label"
-                        value="${i18n:_('CV (Cost Variance)')}" />
+                        value="@{controller.labelCV}" />
                     <label class="dashboard-label dashboard-label-remarked" id="lblCV"/>
                     </vbox>
                     <label class="dashboard-label"
-                        value="${i18n:_('Hours invested')}" />
+                        value="@{controller.labelACWP}"
+                        tooltiptext="${i18n:_('Hours invested')}" />
                     <label class="dashboard-label dashboard-label-remarked"
                         id="lblACWP" />
                 </vbox>
                 <vbox hflex="1" align="pack" vflex="1">
                     <vbox style="margin-bottom:10px">
                         <label class="dashboard-label"
-                            value="${i18n:_('CPI (Cost Performance Index)')}" />
+                            value="@{controller.labelCPI}" />
                         <label class="dashboard-label dashboard-label-remarked"
                             id="lblCPI" />
                     </vbox>
                     <label class="dashboard-label"
-                        value="${i18n:_('Remaining time')}" />
+                        value="@{controller.labelETC}"
+                        tooltiptext="${i18n:_('Remaining time')}" />
                     <label class="dashboard-label dashboard-label-remarked"
                         id="lblETC" />
                 </vbox>
@@ -69,18 +71,18 @@
                 <vbox hflex="1" align="pack" vflex="1">
                     <vbox style="margin-bottom:10px">
                         <label class="dashboard-label"
-                            value="${i18n:_('EAC (Estimate At Completion)')}" />
+                            value="@{controller.labelEAC}" />
                         <label class="dashboard-label dashboard-label-remarked"
                             id="lblEAC" />
                     </vbox>
                     <label class="dashboard-label"
-                        value="${i18n:_('BAC (Budget At Completion)')}" />
+                        value="@{controller.labelBAC}" />
                     <label class="dashboard-label dashboard-label-remarked"
                         id="lblBAC" />
                 </vbox>
                 <vbox hflex="1" align="pack" vflex="1">
                     <label class="dashboard-label"
-                        value="${i18n:_('VAC (Variance At Completion)')}" />
+                        value="@{controller.labelVAC}" />
                     <label class="dashboard-label dashboard-label-remarked"
                         id="lblVAC" />
                 </vbox>