From a3bbc73f5dca85a121b4c10d40dc319f0180992a Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Tue, 19 Jun 2012 15:11:05 +0100 Subject: [PATCH] fixes the error that happens at filtering by dates in the report about order cost per resource. FEA: ItEr76S04BugFixing --- .../org/libreplan/business/orders/daos/OrderDAO.java | 10 +++++----- .../web/reports/OrderCostsPerResourceController.java | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java index 4f0c3c644..f6f151614 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/daos/OrderDAO.java @@ -439,13 +439,13 @@ public class OrderDAO extends IntegrationEntityDAO implements strQuery += "AND orderElement.parent IN (:orders) "; } if (startingDate != null && endingDate != null) { - strQuery += "AND wrl.date BETWEEN :startingDate AND :endingDate "; + strQuery += "AND expense.date BETWEEN :startingDate AND :endingDate "; } if (startingDate != null && endingDate == null) { - strQuery += "AND wrl.date >= :startingDate "; + strQuery += "AND expense.date >= :startingDate "; } if (startingDate == null && endingDate != null) { - strQuery += "AND wrl.date <= :endingDate "; + strQuery += "AND expense.date <= :endingDate "; } // Order by date @@ -458,10 +458,10 @@ public class OrderDAO extends IntegrationEntityDAO implements query.setParameterList("orders", orders); } if (startingDate != null) { - query.setParameter("startingDate", startingDate); + query.setParameter("startingDate", new LocalDate(startingDate)); } if (endingDate != null) { - query.setParameter("endingDate", endingDate); + query.setParameter("endingDate", new LocalDate(endingDate)); } List list = query.list(); 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 ea07df218..709417297 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 @@ -140,6 +140,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController { Date startDateLine = (Date) value; if ((startDateLine != null) && (getEndingDate() != null) && (startDateLine.compareTo(getEndingDate()) > 0)) { + ((Datebox) comp).setValue(null); throw new WrongValueException(comp, _("must be lower than finish date")); } @@ -155,6 +156,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController { Date endingDate = (Date) value; if ((endingDate != null) && (getStartingDate() != null) && (endingDate.compareTo(getStartingDate()) < 0)) { + ((Datebox) comp).setValue(null); throw new WrongValueException(comp, _("must be greater than finish date")); }