diff --git a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
index 095899fe5..5d1524fcc 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/reports/dtos/TimeLineRequiredMaterialDTO.java
@@ -22,7 +22,6 @@
package org.libreplan.business.reports.dtos;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.util.Date;
import org.libreplan.business.materials.entities.MaterialAssignment;
@@ -34,7 +33,7 @@ import org.libreplan.business.planner.entities.TaskElement;
*/
public class TimeLineRequiredMaterialDTO{
- private String date;
+ private Date date;
private Date initDate;
@@ -98,22 +97,14 @@ public class TimeLineRequiredMaterialDTO{
this.initDate = initDate;
}
- public String getDate() {
+ public Date getDate() {
return date;
}
- public void setDate(String date) {
+ public void setDate(Date date) {
this.date = date;
}
- private void setDate(Date newDate) {
- if (newDate != null) {
- this.date = (new SimpleDateFormat("dd/MM/yyyy")).format(newDate);
- } else {
- this.date = null;
- }
- }
-
public String getStatus() {
return status;
}
diff --git a/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml b/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
index 2d7318795..f684c0066 100644
--- a/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
+++ b/libreplan-webapp/src/main/jasper/completedEstimatedHours.jrxml
@@ -49,12 +49,12 @@
-
+
-
+
@@ -249,10 +249,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml b/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
index f322fd203..82c92b777 100644
--- a/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/costExpenseSheetLinesReport.jrxml
@@ -119,10 +119,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml b/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
index 402b77d2f..64b36ab8f 100644
--- a/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/costWorkReportLinesReport.jrxml
@@ -216,10 +216,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
index 13cb3dcf2..5616b919d 100644
--- a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonthReport.jrxml
@@ -160,10 +160,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
index 5646cfb34..5f629e634 100644
--- a/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerReport.jrxml
@@ -74,12 +74,12 @@
-
+
-
+
@@ -228,19 +228,19 @@
-
+
-
+
-
+
-
+
@@ -387,10 +387,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
index db9e895ef..a149252cc 100644
--- a/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/orderCostsPerResourceReport.jrxml
@@ -203,12 +203,12 @@
-
+
-
+
@@ -219,12 +219,12 @@
-
+
-
+
@@ -281,10 +281,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
index 9e1e9f536..a0a48bbfe 100644
--- a/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/projectStatusReport.jrxml
@@ -196,12 +196,12 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
index d320826b9..94536b372 100644
--- a/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/schedulingProgressPerOrderReport.jrxml
@@ -72,12 +72,12 @@
-
+
-
+
@@ -88,14 +88,14 @@
-
+
-
+
@@ -106,14 +106,14 @@
-
+
-
+
@@ -570,10 +570,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
index 29e166927..91a501cd0 100644
--- a/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
+++ b/libreplan-webapp/src/main/jasper/timeLineRequiredMaterial.jrxml
@@ -19,7 +19,7 @@
-
+
@@ -123,11 +123,11 @@
-
+
-
+
@@ -193,19 +193,19 @@
-
+
-
+
-
+
-
+
@@ -324,7 +324,7 @@
-
+
@@ -334,7 +334,7 @@
-
+
@@ -375,10 +375,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
index 220adcbd4..1b89deaba 100644
--- a/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/workingArrangementsPerOrderReport.jrxml
@@ -175,7 +175,7 @@
-
+
@@ -187,9 +187,9 @@
-
+
-
+
@@ -201,9 +201,9 @@
-
+
-
+
@@ -215,9 +215,9 @@
-
+
-
+
@@ -229,9 +229,9 @@
-
+
-
+
@@ -243,7 +243,7 @@
-
+
@@ -566,10 +566,10 @@
-
+
-
+
diff --git a/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml b/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
index 93931aba4..788b4f225 100644
--- a/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
+++ b/libreplan-webapp/src/main/jasper/workingProgressPerTaskReport.jrxml
@@ -40,12 +40,12 @@
-
+
-
+
@@ -476,10 +476,10 @@
-
+
-
+