From cd2720147efead5a0925497f74d00264683f0924 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 27 Apr 2012 09:02:20 +0200 Subject: [PATCH] Add currency symbol in all the decimalbox representing money * Create a new method Util.getMoneyFormat() FEA: ItEr76S25CurrencyManagement --- .../main/jasper/timeLineRequiredMaterial.jrxml | 7 ++++--- .../main/java/org/libreplan/web/common/Util.java | 11 +++++++++++ .../CostCategoryCRUDController.java | 3 +-- .../TypeOfWorkHoursCRUDController.java | 9 +++++++++ .../web/materials/MaterialsController.java | 5 +++++ .../AssignedHoursToOrderElementController.java | 4 ++++ .../orders/DetailsOrderElementController.java | 4 ++++ .../web/orders/OrderCRUDController.java | 13 ++++++++++--- .../materials/AssignedMaterialsController.java | 11 ++++++++++- .../web/planner/order/SubcontractController.java | 4 ++++ .../taskedition/TaskPropertiesController.java | 7 ++++++- .../TimeLineRequiredMaterialController.java | 2 ++ .../SubcontractedTasksController.java | 5 +++-- .../web/templates/OrderTemplatesController.java | 4 ++++ .../org/libreplan/web/tree/TreeController.java | 1 + .../costcategories/_editTypeOfWorkHours.zul | 3 ++- .../costcategories/_listTypesOfWorkHours.zul | 5 ++++- .../src/main/webapp/materials/materials.zul | 3 ++- .../src/main/webapp/orders/_assignmentsBox.zul | 8 +++++--- .../src/main/webapp/orders/_edition.zul | 16 ++++++++++++---- .../webapp/orders/_listOrderElementHours.zul | 14 ++++++++++---- .../main/webapp/orders/_orderElementDetails.zul | 3 ++- .../components/_listOrderElementMaterials.zul | 5 ++++- .../planner/taskpanels/_tabPanelSubcontract.zul | 3 ++- .../taskpanels/_tabPanelTaskProperties.zul | 3 ++- .../src/main/webapp/templates/_editTemplate.zul | 3 ++- .../webapp/templates/_materialAssignmentsBox.zul | 8 +++++--- 27 files changed, 130 insertions(+), 34 deletions(-) diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml index b50aed032..ca3d39707 100644 --- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml +++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml @@ -5,6 +5,7 @@ + @@ -156,7 +157,7 @@ - + @@ -291,7 +292,7 @@ - + @@ -303,7 +304,7 @@ - + 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 348eba713..013e579bc 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 @@ -648,4 +648,15 @@ public class Util { }); } + /** + * Gets money format for a {@link Decimalbox} using 2 figures for the + * decimal part and concatenating the currency symbol + * + * @return Format for a {@link Decimalbox} ###.## plus currency + * symbol + */ + public static String getMoneyFormat() { + return "###.## " + getCurrencySymbol(); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java index cfdd24218..fc560ddec 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/CostCategoryCRUDController.java @@ -38,10 +38,8 @@ import org.libreplan.business.costcategories.entities.CostCategory; import org.libreplan.business.costcategories.entities.HourCost; import org.libreplan.business.costcategories.entities.TypeOfWorkHours; import org.libreplan.web.common.BaseCRUDController; -import org.libreplan.web.common.ConstraintChecker; import org.libreplan.web.common.Level; import org.libreplan.web.common.Util; -import org.libreplan.web.util.ValidationExceptionPrinter; import org.libreplan.web.workreports.WorkReportCRUDController; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.zk.ui.Component; @@ -305,6 +303,7 @@ public class CostCategoryCRUDController extends BaseCRUDController Decimalbox boxCost = new Decimalbox(); bindDecimalboxCost(boxCost, (HourCost) row.getValue()); boxCost.setConstraint("no empty:" + _("cannot be null or empty")); + boxCost.setFormat(Util.getMoneyFormat()); row.appendChild(boxCost); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java index 4eb5cf3d2..814fce5ad 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/costcategories/TypeOfWorkHoursCRUDController.java @@ -141,4 +141,13 @@ public class TypeOfWorkHoursCRUDController extends BaseCRUDController extends GenericForwardCo Label lblName = new Label(materialCategory.getName()); Label lblUnits = new Label(getUnits(materialCategory).toString()); - Label lblPrice = new Label(getPrice(materialCategory).toString()); + Label lblPrice = new Label(getPrice(materialCategory).toString() + + getCurrencySymbol()); Treerow tr = null; ti.setValue(node); @@ -573,4 +574,12 @@ public abstract class AssignedMaterialsController extends GenericForwardCo .getId().equals(material.getUnitType().getId()))); } + public String getCurrencySymbol() { + return Util.getCurrencySymbol(); + } + + public String getMoneyFormat() { + return Util.getMoneyFormat(); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java index 826457317..619d9ab37 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java @@ -101,4 +101,8 @@ public class SubcontractController extends GenericForwardComposer { subcontractModel.removeSubcontractedTaskData(); } + public String getMoneyFormat() { + return Util.getMoneyFormat(); + } + } \ No newline at end of file diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java index 983604668..8110c5d02 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.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 @@ -639,4 +639,9 @@ public class TaskPropertiesController extends GenericForwardComposer { .toDate(); Util.reloadBindings(startDateBox); } + + public String getMoneyFormat() { + return Util.getMoneyFormat(); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java index ee5008b64..abc42e191 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/reports/TimeLineRequiredMaterialController.java @@ -185,6 +185,8 @@ public class TimeLineRequiredMaterialController extends result.put("startingDate", getStartingDate()); result.put("endingDate", getEndingDate()); result.put("status", getSelectedStatusName()); + result.put("currencySymbol", Util.getCurrencySymbol()); + return result; } 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 d01b87a32..55f294b6c 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,8 +109,9 @@ public class SubcontractedTasksController extends GenericForwardComposer { appendLabel(row, subcontractedTaskData.getSubcontractedCode()); appendLabel(row, getTaskName(subcontractedTaskData)); appendLabel(row, subcontractedTaskData.getWorkDescription()); - appendLabel(row, toString(subcontractedTaskData - .getSubcontractPrice())); + appendLabel(row, + toString(subcontractedTaskData.getSubcontractPrice()) + " " + + Util.getCurrencySymbol()); appendLabel(row, _(toString(subcontractedTaskData.getState()))); appendOperations(row, subcontractedTaskData); } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java index 926ce5ce3..3924c9dcc 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/templates/OrderTemplatesController.java @@ -408,4 +408,8 @@ public class OrderTemplatesController extends GenericForwardComposer implements Util.reloadBindings(tabPanel); } + public String getMoneyFormat() { + return Util.getMoneyFormat(); + } + } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java index 77e96c8c6..28d230738 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/tree/TreeController.java @@ -796,6 +796,7 @@ public abstract class TreeController> extends // If it's a container budget cell is not editable Util.bind(result, getBudgetGetterFor(element)); } + result.setFormat(Util.getMoneyFormat()); return result; } diff --git a/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul b/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul index 8b59f7ebb..458e3d531 100644 --- a/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul +++ b/libreplan-webapp/src/main/webapp/costcategories/_editTypeOfWorkHours.zul @@ -59,7 +59,8 @@