diff --git a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml index 35ef705e2..936cf3fc1 100644 --- a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml +++ b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml @@ -7,6 +7,7 @@ + @@ -88,12 +89,12 @@ - + - + @@ -135,10 +136,10 @@ - + - + @@ -228,10 +229,10 @@ - + - + @@ -264,20 +265,20 @@ - + - + - + - + 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 cae9a2dda..5fa15625e 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 @@ -68,4 +68,6 @@ public interface IOrderCostsPerResourceModel { String getSelectedCriteria(); 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 2d43abad8..0e9cebd55 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,6 +88,8 @@ public class OrderCostsPerResourceController extends LibrePlanReportController { result.put("endingDate", getEndingDate()); result.put("criteria", getParameterCriterions()); result.put("labels", getParameterLabels()); + result.put("currencySymbol", + orderCostsPerResourceModel.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 65787f719..7bbff552a 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 @@ -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 @@ -36,6 +36,7 @@ import net.sf.jasperreports.engine.JRDataSource; import net.sf.jasperreports.engine.JREmptyDataSource; import net.sf.jasperreports.engine.data.JRBeanCollectionDataSource; +import org.libreplan.business.common.daos.IConfigurationDAO; import org.libreplan.business.costcategories.entities.TypeOfWorkHours; import org.libreplan.business.labels.daos.ILabelDAO; import org.libreplan.business.labels.entities.Label; @@ -61,6 +62,7 @@ import org.springframework.transaction.annotation.Transactional; /** * @author Lorenzo Tilve Álvaro * @author Susana Montes Pedreira + * @author Manuel Rego Casasnovas */ @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) @@ -78,6 +80,9 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel { @Autowired private ICriterionTypeDAO criterionTypeDAO; + @Autowired + private IConfigurationDAO configurationDAO; + private List selectedOrders = new ArrayList(); private List