From 77d2fd65fa4de2a51f52718844add8cf039cf10d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 27 Apr 2012 08:08:33 +0200 Subject: [PATCH] Moved method to get currency symbol to Util class FEA: ItEr76S25CurrencyManagement --- .../java/org/libreplan/web/common/Util.java | 19 +++++++++++++++++++ .../web/planner/TaskElementAdapter.java | 12 ++++-------- .../reports/IOrderCostsPerResourceModel.java | 1 - .../OrderCostsPerResourceController.java | 3 +-- .../reports/OrderCostsPerResourceModel.java | 6 ------ 5 files changed, 24 insertions(+), 17 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 cc4b29942..348eba713 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 @@ -31,6 +31,9 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.libreplan.business.common.Configuration; +import org.libreplan.business.common.IOnTransaction; +import org.libreplan.business.common.Registry; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; @@ -629,4 +632,20 @@ public class Util { } } + /** + * Gets currency symbol from {@link Configuration} object. + * + * @return Currency symbol configured in the application + */ + public static String getCurrencySymbol() { + return Registry.getTransactionService().runOnReadOnlyTransaction( + new IOnTransaction() { + @Override + public String execute() { + return Registry.getConfigurationDAO() + .getConfiguration().getCurrencySymbol(); + } + }); + } + } 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 ab9c7a656..29ad7b86c 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 @@ -89,6 +89,7 @@ import org.libreplan.business.workingday.EffortDuration; import org.libreplan.business.workingday.EffortDuration.IEffortFrom; import org.libreplan.business.workingday.IntraDayDate; import org.libreplan.business.workingday.IntraDayDate.PartialDay; +import org.libreplan.web.common.Util; import org.libreplan.web.planner.order.PlanningStateCreator.PlanningState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; @@ -1033,14 +1034,9 @@ public class TaskElementAdapter { if (taskElement.getOrderElement() instanceof Order) { result.append(_("State") + ": ").append(getOrderState()); } else { - String budget = getBudget() - + " " - + configurationDAO.getConfiguration() - .getCurrencySymbol(); - String moneyCost = getMoneyCost() - + " " - + configurationDAO.getConfiguration() - .getCurrencySymbol(); + String currencySymbol = Util.getCurrencySymbol(); + String budget = getBudget() + " " + currencySymbol; + String moneyCost = getMoneyCost() + " " + currencySymbol; result.append( _("Budget: {0}, Consumed: {1} ({2}%)", budget, moneyCost, getMoneyCostBarPercentage() diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/IOrderCostsPerResourceModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/IOrderCostsPerResourceModel.java index 5fa15625e..bfca7cdef 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/IOrderCostsPerResourceModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/IOrderCostsPerResourceModel.java @@ -69,5 +69,4 @@ public interface IOrderCostsPerResourceModel { String getSelectedLabel(); - String getCurrencySymbol(); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java index 0e9cebd55..a9e5cf442 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceController.java @@ -88,8 +88,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController { result.put("endingDate", getEndingDate()); result.put("criteria", getParameterCriterions()); result.put("labels", getParameterLabels()); - result.put("currencySymbol", - orderCostsPerResourceModel.getCurrencySymbol()); + result.put("currencySymbol", Util.getCurrencySymbol()); return result; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java index 7bbff552a..7f832e140 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/OrderCostsPerResourceModel.java @@ -415,10 +415,4 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel { return selectedCriteria; } - @Override - @Transactional(readOnly = true) - public String getCurrencySymbol() { - return configurationDAO.getConfiguration().getCurrencySymbol(); - } - }