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 @@
+
@@ -33,7 +34,7 @@
-
+
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 @@
+
@@ -30,7 +31,7 @@
-
+
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 @@
+
@@ -199,7 +200,7 @@
-
+
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 @@
+
@@ -295,7 +296,7 @@
-
+
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 @@
+
@@ -46,7 +47,7 @@
-
+
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 @@
+
@@ -169,7 +170,7 @@
-
+
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 @@
+
@@ -423,7 +424,7 @@
-
+
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 @@
+
@@ -28,7 +29,7 @@
-
+
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 getParameters() {
- Map result = new HashMap();
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map 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 supportedLanguages = new HashSet() {{
+ 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 getParameters() {
+ Map parameters = new HashMap();
+ parameters.put("logo", String.format("/logos/%s/logo.png", getLanguage()));
+ return parameters;
+ }
- protected abstract Map 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
* @author Susana Montes Pedreira
*/
-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 getParameters() {
- Map result = new HashMap();
+ @Override
+ public Map getParameters() {
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map 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 getParameters() {
- Map result = new HashMap();
+ Map result = super.getParameters();
result.put("orderName", getSelectedOrder().getName());
result.put("referenceDate", getDeadlineDate());