From a5d28c39fd207a164ae23860ff3f1a5ac7878b32 Mon Sep 17 00:00:00 2001 From: Ignacio Diaz Teijido Date: Mon, 12 Sep 2011 18:00:39 +0200 Subject: [PATCH] [Bug #1176] changed controller to allow a search in only one day (from 00:00:00 to 23:59:59) FEA: ItEr75S04BugFixing --- .../web/reports/HoursWorkedPerWorkerController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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 83cde0931..b2f484c31 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 @@ -24,6 +24,7 @@ package org.navalplanner.web.reports; import static org.navalplanner.web.I18nHelper._; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.Map; @@ -115,11 +116,19 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController } private Date getStartingDate() { - return startingDate.getValue(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(startingDate.getValue()); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), + calendar.get(Calendar.DATE), 0, 0, 0); + return calendar.getTime(); } private Date getEndingDate() { - return endingDate.getValue(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(endingDate.getValue()); + calendar.set(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), + calendar.get(Calendar.DATE), 23, 59, 59); + return calendar.getTime(); } @Override