From 277ef6e947c37c5cdfd1fcd0a9623a4f84d236f7 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 16 Mar 2012 12:38:23 +0100
Subject: [PATCH] Add money cost percentage in the tooltip

FEA: ItEr76S17MoneyCostMonitoringSystem
---
 .../main/java/org/libreplan/web/orders/OrderModel.java | 10 ++++++++--
 .../org/libreplan/web/planner/TaskElementAdapter.java  | 10 +++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
index a1bef0bdf..7bf3a985e 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2011 Igalia, S.L.
+ * Copyright (C) 2012 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Affero General Public License as published by the Free
@@ -95,9 +95,11 @@ import org.zkoss.zk.ui.Desktop;
 
 /**
  * Model for UI operations related to {@link Order}. <br />
+ *
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  * @author Diego Pino García <dpino@igalia.com>
  * @author Jacobo Aragunde Pérez <jaragunde@igalia.com>
+ * @author Manuel Rego Casasnovas <rego@igalia.com>
  */
 @Service
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
@@ -677,7 +679,11 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
         StringBuilder result = new StringBuilder();
         result.append(_("Progress") + ": ").append(getEstimatedAdvance(order)).append("% , ");
         result.append(_("Hours invested") + ": ").append(
-                getHoursAdvancePercentage(order)).append("% \n");
+                getHoursAdvancePercentage(order)).append("% , ");
+        // TODO change method and message, for the moment using
+        // getHoursAdvancePercentage(order)
+        result.append(_("Cost") + ": ")
+                .append(getHoursAdvancePercentage(order)).append("% \n");
 
         if (!getDescription(order).equals("")) {
             result.append(" , " + _("Description") + ": "
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 c8124a48a..0774d8e82 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
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
  *                         Desenvolvemento Tecnolóxico de Galicia
- * Copyright (C) 2010-2011 Igalia, S.L.
+ * Copyright (C) 2010-2012 Igalia, S.L.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -103,6 +103,7 @@ import org.zkoss.ganttz.data.constraint.Constraint;
 
 /**
  * @author Óscar González Fernández <ogonzalez@igalia.com>
+ * @author Manuel Rego Casasnovas <rego@igalia.com>
  */
 @Component
 @Scope(BeanDefinition.SCOPE_SINGLETON)
@@ -951,6 +952,13 @@ public class TaskElementAdapter {
                 result.append(_("Hours invested") + ": ")
                         .append(getHoursAdvancePercentage().multiply(
                                 new BigDecimal(100))).append("% <br/>");
+
+                // TODO change method and message, for the moment using
+                // getHoursAdvancePercentage()
+                result.append(_("Cost") + ": ")
+                        .append(getHoursAdvancePercentage().multiply(
+                                new BigDecimal(100))).append("% <br/>");
+
                 if (taskElement.getOrderElement() instanceof Order) {
                     result.append(_("State") + ": ").append(getOrderState());
                 }