From 10007fe1147d35c36e4a034e7c5b780d420912c5 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 3 Jan 2011 13:33:48 +0100
Subject: [PATCH] Fix Exception resource not found: 'logos/logo.png' in reports

logo.png image was moved to other folder so reports were crashing. This
logo.png image doesn't longer exist as now there is a different logo
for each language.

The patch retrieves what language the user is using when printing out
a report and use appropriate logo.

FEA: ItEr67S04BugFixing
---
 .../main/jasper/completedEstimatedHours.jrxml |  3 +-
 .../hoursWorkedPerWorkerInAMonthReport.jrxml  |  3 +-
 .../jasper/hoursWorkedPerWorkerReport.jrxml   |  3 +-
 .../jasper/orderCostsPerResourceReport.jrxml  |  3 +-
 .../schedulingProgressPerOrderReport.jrxml    |  3 +-
 .../jasper/timeLineRequiredMaterial.jrxml     |  3 +-
 .../workingArrangementsPerOrderReport.jrxml   |  3 +-
 .../jasper/workingProgressPerTaskReport.jrxml |  3 +-
 ...pletedEstimatedHoursPerTaskController.java |  2 +-
 .../HoursWorkedPerWorkerController.java       |  2 +-
 ...oursWorkedPerWorkerInAMonthController.java |  2 +-
 .../reports/NavalplannerReportController.java | 28 ++++++++-
 .../OrderCostsPerResourceController.java      | 60 +++++++++++--------
 .../SchedulingProgressPerOrderController.java |  2 +-
 .../TimeLineRequiredMaterialController.java   |  3 +-
 ...WorkingArrangementsPerOrderController.java |  2 +-
 .../WorkingProgressPerTaskController.java     |  2 +-
 17 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
index 89ca99d9f..28f8f2794 100644
--- a/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
+++ b/navalplanner-webapp/src/main/jasper/completedEstimatedHours.jrxml
@@ -6,6 +6,7 @@
 	<style name="Detail" isDefault="false" fontName="Arial" fontSize="12"/>
 	<parameter name="referenceDate" class="java.util.Date"/>
 	<parameter name="orderName" class="java.lang.String"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="taskName" class="java.lang.String"/>
 	<field name="estimatedHours" class="java.lang.Integer"/>
 	<field name="totalPlannedHours" class="java.lang.Integer"/>
@@ -33,7 +34,7 @@
 			</textField>
 			<image scaleImage="RealHeight">
 				<reportElement x="316" y="3" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="0" y="92" width="142" height="20"/>
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
index 85ab903e2..6d12ad7f7 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
@@ -7,6 +7,7 @@
 	<parameter name="showNote" class="java.lang.Boolean"/>
 	<parameter name="year" class="java.lang.String"/>
 	<parameter name="month" class="java.lang.String"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="workerName" class="java.lang.String"/>
 	<field name="numHours" class="java.lang.Long"/>
 	<variable name="sumNumHours" class="java.lang.Long" calculation="Sum">
@@ -30,7 +31,7 @@
 			</textField>
 			<image scaleImage="RetainShape">
 				<reportElement x="318" y="0" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="0" y="80" width="48" height="15">
diff --git a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
index c3d22b0c8..f3395e06b 100644
--- a/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
@@ -7,6 +7,7 @@
 	<parameter name="startingDate" class="java.util.Date"/>
 	<parameter name="endingDate" class="java.util.Date"/>
 	<parameter name="showNote" class="java.lang.Boolean"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="workerName" class="java.lang.String"/>
 	<field name="date" class="java.util.Date"/>
 	<field name="clockStart" class="java.util.Date"/>
@@ -199,7 +200,7 @@
 			</textField>
 			<image scaleImage="RetainShape">
 				<reportElement x="318" y="0" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="0" y="80" width="114" height="15">
diff --git a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
index 44d281cff..9fdb03515 100644
--- a/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
@@ -7,6 +7,7 @@
 	<subDataset name="dataset1"/>
 	<parameter name="startingDate" class="java.util.Date"/>
 	<parameter name="endingDate" class="java.util.Date"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="workerName" class="java.lang.String"/>
 	<field name="date" class="java.util.Date"/>
 	<field name="clockStart" class="java.util.Date"/>
@@ -295,7 +296,7 @@
 			</textField>
 			<image scaleImage="RetainShape">
 				<reportElement x="316" y="0" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="2" y="75" width="119" height="15">
diff --git a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
index 9fd26dd2d..a0ddc8734 100644
--- a/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
@@ -10,6 +10,7 @@
 	<parameter name="endingDate" class="java.util.Date"/>
 	<parameter name="advanceType" class="java.lang.String"/>
 	<parameter name="showFootnote" class="java.lang.Boolean"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="orderName" class="java.lang.String"/>
 	<field name="estimatedHours" class="java.lang.Integer"/>
 	<field name="totalPlannedHours" class="java.lang.Integer"/>
@@ -46,7 +47,7 @@
 		<band height="176" splitType="Stretch">
 			<image scaleImage="RealHeight">
 				<reportElement x="316" y="3" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement style="Title" x="0" y="13" width="263" height="33"/>
diff --git a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index 0f4962bcc..34cacf9fe 100644
--- a/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/navalplanner-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -6,6 +6,7 @@
 	<parameter name="startingDate" class="java.util.Date"/>
 	<parameter name="endingDate" class="java.util.Date"/>
 	<parameter name="status" class="java.lang.String"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="status" class="java.lang.String"/>
 	<field name="code" class="java.lang.String"/>
 	<field name="name" class="java.lang.String"/>
@@ -169,7 +170,7 @@
 		<band height="132" splitType="Stretch">
 			<image scaleImage="RealHeight">
 				<reportElement x="318" y="0" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="0" y="80" width="100" height="15">
diff --git a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
index fd492845d..a4c0340f4 100644
--- a/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
@@ -6,6 +6,7 @@
 	<style name="Detail" isDefault="false" fontName="Arial" fontSize="12"/>
 	<parameter name="orderName" class="java.lang.String"/>
 	<parameter name="taskStatus" class="java.lang.String"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="orderCode" class="java.lang.String"/>
 	<field name="orderName" class="java.lang.String"/>
 	<field name="estimatedStartingDate" class="java.util.Date"/>
@@ -423,7 +424,7 @@
 			</textField>
 			<image scaleImage="RealHeight">
 				<reportElement x="318" y="0" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="1" y="79" width="68" height="15"/>
diff --git a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
index 805c53d6a..2a2f22337 100644
--- a/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
+++ b/navalplanner-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
@@ -6,6 +6,7 @@
 	<style name="Detail" isDefault="false" fontName="Arial" fontSize="12"/>
 	<parameter name="referenceDate" class="java.util.Date"/>
 	<parameter name="orderName" class="java.lang.String"/>
+	<parameter name="logo" class="java.lang.String"/>
 	<field name="taskName" class="java.lang.String"/>
 	<field name="estimatedHours" class="java.lang.Integer"/>
 	<field name="totalPlannedHours" class="java.lang.Integer"/>
@@ -28,7 +29,7 @@
 		<band height="131" splitType="Stretch">
 			<image scaleImage="RealHeight">
 				<reportElement x="316" y="3" width="180" height="53"/>
-				<imageExpression class="java.lang.String"><![CDATA["logos/logo.png"]]></imageExpression>
+				<imageExpression class="java.lang.String"><![CDATA[$P{logo}]]></imageExpression>
 			</image>
 			<textField>
 				<reportElement x="1" y="96" width="150" height="20"/>
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java
index d24e6bcc3..21952a94d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java
@@ -100,7 +100,7 @@ public class CompletedEstimatedHoursPerTaskController extends NavalplannerReport
 
     @Override
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("orderName", getSelectedOrder().getName());
         result.put("referenceDate", getDeadlineDate());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
index 7ff30e15a..5a14deed8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
@@ -124,7 +124,7 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
 
     @Override
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("startingDate", getStartingDate());
         result.put("endingDate", getEndingDate());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java
index e675cd92b..d5880c4e1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java
@@ -93,7 +93,7 @@ public class HoursWorkedPerWorkerInAMonthController extends NavalplannerReportCo
 
     @Override
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("year", getSelectedYear());
         result.put("month", monthAsLiteral(getSelectedMonth()));
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
index 83b54b425..cf6324017 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReportController.java
@@ -20,11 +20,15 @@
 
 package org.navalplanner.web.reports;
 
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import net.sf.jasperreports.engine.JRDataSource;
 
 import org.navalplanner.web.common.components.ExtendedJasperreport;
+import org.zkoss.util.Locales;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Hbox;
@@ -51,6 +55,14 @@ public abstract class NavalplannerReportController extends GenericForwardCompose
 
     protected Toolbarbutton URIlink;
 
+    private static Set<String> supportedLanguages = new HashSet<String>() {{
+        add("es");
+        add("en");
+        add("gl");
+    }};
+
+    private final String DEFAULT_LANG = "en";
+
     public void showReport(ExtendedJasperreport jasperreport) {
         final String type = outputFormat.getOutputFormat();
 
@@ -70,9 +82,21 @@ public abstract class NavalplannerReportController extends GenericForwardCompose
         }
     }
 
-    protected abstract JRDataSource getDataSource();
+    protected Map<String, Object> getParameters() {
+        Map<String, Object> parameters = new HashMap<String, Object>();
+        parameters.put("logo", String.format("/logos/%s/logo.png", getLanguage()));
+        return parameters;
+    }
 
-    protected abstract Map<String, Object> getParameters();
+    private String getLanguage() {
+        String lang = Locales.getCurrent().getLanguage();
+        if (!supportedLanguages.contains(lang)) {
+            lang = DEFAULT_LANG;
+        }
+        return lang;
+    }
+
+    protected abstract JRDataSource getDataSource();
 
     protected abstract String getReportName();
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java
index e4d387d31..f92afffb4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java
@@ -50,7 +50,9 @@ import org.zkoss.zul.Toolbarbutton;
  * @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
  */
-public class OrderCostsPerResourceController extends GenericForwardComposer {
+public class OrderCostsPerResourceController extends NavalplannerReportController {
+
+    private static final String REPORT_NAME = "orderCostsPerResourceReport";
 
     private IOrderCostsPerResourceModel orderCostsPerResourceModel;
 
@@ -60,11 +62,11 @@ public class OrderCostsPerResourceController extends GenericForwardComposer {
 
     private Datebox endingDate;
 
-    private ComboboxOutputFormat outputFormat;
-
-    private Hbox URItext;
-
-    private Toolbarbutton URIlink;
+//    private ComboboxOutputFormat outputFormat;
+//
+//    private Hbox URItext;
+//
+//    private Toolbarbutton URIlink;
 
     private static final String HTML = "html";
 
@@ -87,32 +89,33 @@ public class OrderCostsPerResourceController extends GenericForwardComposer {
         orderCostsPerResourceModel.init();
     }
 
-    public void showReport(ExtendedJasperreport report) {
-        final String type = outputFormat.getOutputFormat();
+//    public void showReport(ExtendedJasperreport report) {
+//        final String type = outputFormat.getOutputFormat();
+//
+//        orderCostsPerResourceReport = new OrderCostsPerResourceReport(report);
+//        orderCostsPerResourceReport.setDatasource(getDataSource());
+//        orderCostsPerResourceReport.setParameters(getParameters());
+//
+//        String URI = orderCostsPerResourceReport.show(type);
+//        if (type.equals(HTML)) {
+//            URItext.setStyle("display: none");
+//            Executions.getCurrent().sendRedirect(URI, "_blank");
+//        } else {
+//            URItext.setStyle("display: inline");
+//            URIlink.setHref(URI);
+//        }
+//
+//    }
 
-        orderCostsPerResourceReport = new OrderCostsPerResourceReport(report);
-        orderCostsPerResourceReport.setDatasource(getDataSource());
-        orderCostsPerResourceReport.setParameters(getParameters());
-
-        String URI = orderCostsPerResourceReport.show(type);
-        if (type.equals(HTML)) {
-            URItext.setStyle("display: none");
-            Executions.getCurrent().sendRedirect(URI, "_blank");
-        } else {
-            URItext.setStyle("display: inline");
-            URIlink.setHref(URI);
-        }
-
-    }
-
-    private JRDataSource getDataSource() {
+    protected JRDataSource getDataSource() {
         return orderCostsPerResourceModel.getOrderReport(getSelectedOrders(),
                 getStartingDate(), getEndingDate(), getSelectedLabels(),
                 getSelectedCriterions());
     }
 
-    private Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+    @Override
+    public Map<String, Object> getParameters() {
+        Map<String, Object> result = super.getParameters();
 
         result.put("startingDate", getStartingDate());
         result.put("endingDate", getEndingDate());
@@ -245,4 +248,9 @@ public class OrderCostsPerResourceController extends GenericForwardComposer {
         Util.reloadBindings(lbCriterions);
     }
 
+    @Override
+    protected String getReportName() {
+        return REPORT_NAME;
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
index a6fa2969d..8fdaa4868 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
@@ -145,7 +145,7 @@ public class SchedulingProgressPerOrderController extends NavalplannerReportCont
     }
 
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("referenceDate", getReferenceDate());
         result.put("startingDate", getStartingDate());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
index bce0357a7..af7e27787 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
@@ -179,7 +179,8 @@ public class TimeLineRequiredMaterialController extends
 
     @Override
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
+
         result.put("startingDate", getStartingDate());
         result.put("endingDate", getEndingDate());
         result.put("status", getSelectedStatusName());
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
index d4e566aff..1ff82f6ad 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
@@ -120,7 +120,7 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
     }
 
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("orderName", getSelectedOrder().getName());
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
index 112db9a56..6a8fe58c0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
@@ -96,7 +96,7 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
     }
 
     protected Map<String, Object> getParameters() {
-        Map<String, Object> result = new HashMap<String, Object>();
+        Map<String, Object> result = super.getParameters();
 
         result.put("orderName", getSelectedOrder().getName());
         result.put("referenceDate", getDeadlineDate());