From 65d13f4d6f159edbdd6f042da36ace3d6f0454da Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 7 May 2012 10:42:14 +0200
Subject: [PATCH] Add method in Util to include currency symbol in a BigDecimal

FEA: ItEr76S25CurrencyManagement
---
 .../src/main/java/org/libreplan/web/common/Util.java | 12 ++++++++++++
 .../libreplan/web/orders/OrderCRUDController.java    |  3 +--
 .../libreplan/web/planner/TaskElementAdapter.java    |  5 ++---
 .../subcontract/SubcontractedTasksController.java    |  5 ++---
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
index 953dad693..9cf2d05b5 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/Util.java
@@ -655,6 +655,18 @@ public class Util {
                 });
     }
 
+    /**
+     * Returns the value using the money format, that means, 2 figures for the
+     * decimal part and concatenating the currency symbol from
+     * {@link Configuration} object.
+     */
+    public static String addCurrencySymbol(BigDecimal value) {
+        DecimalFormat decimalFormat = (DecimalFormat) DecimalFormat
+                .getInstance();
+        decimalFormat.applyPattern(getMoneyFormat());
+        return decimalFormat.format(value);
+    }
+
     /**
      * Gets money format for a {@link Decimalbox} using 2 figures for the
      * decimal part and concatenating the currency symbol
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
index 0af216209..4c58820f7 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderCRUDController.java
@@ -1211,8 +1211,7 @@ public class OrderCRUDController extends GenericForwardComposer {
             appendDate(row, order.getInitDate());
             appendDate(row, order.getDeadline());
             appendCustomer(row, order.getCustomer());
-            appendObject(row,
-                    order.getTotalBudget() + " " + Util.getCurrencySymbol());
+            appendObject(row, Util.addCurrencySymbol(order.getTotalBudget()));
             appendObject(row, order.getTotalHours());
             appendObject(row, _(order.getState().toString()));
             appendOperations(row, order);
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 29ad7b86c..61ba7d08b 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
@@ -1034,9 +1034,8 @@ public class TaskElementAdapter {
                 if (taskElement.getOrderElement() instanceof Order) {
                     result.append(_("State") + ": ").append(getOrderState());
                 } else {
-                    String currencySymbol = Util.getCurrencySymbol();
-                    String budget = getBudget() + " " + currencySymbol;
-                    String moneyCost = getMoneyCost() + " " + currencySymbol;
+                    String budget = Util.addCurrencySymbol(getBudget());
+                    String moneyCost = Util.addCurrencySymbol(getMoneyCost());
                     result.append(
                             _("Budget: {0}, Consumed: {1} ({2}%)", budget,
                                     moneyCost, getMoneyCostBarPercentage()
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
index 55f294b6c..b9eda626f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractedTasksController.java
@@ -109,9 +109,8 @@ public class SubcontractedTasksController extends GenericForwardComposer {
             appendLabel(row, subcontractedTaskData.getSubcontractedCode());
             appendLabel(row, getTaskName(subcontractedTaskData));
             appendLabel(row, subcontractedTaskData.getWorkDescription());
-            appendLabel(row,
-                    toString(subcontractedTaskData.getSubcontractPrice()) + " "
-                            + Util.getCurrencySymbol());
+            appendLabel(row, Util.addCurrencySymbol(subcontractedTaskData
+                    .getSubcontractPrice()));
             appendLabel(row, _(toString(subcontractedTaskData.getState())));
             appendOperations(row, subcontractedTaskData);
         }