From 9f3b856c0aaa26847b2026c26dea6e8fd0c2bcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 7 May 2010 14:29:59 +0200 Subject: [PATCH] ItEr57S16EscaladoPantallaGanttEmpresa: Changed the behaviour of the time filter in the company view. Now the start date of the filter is compared with the end date of the orders, and the end date of the filter is compared with the start date of the order. --- .../org/navalplanner/web/orders/OrderPredicate.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java index 45a80b0f1..6207afe09 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderPredicate.java @@ -195,20 +195,14 @@ public class OrderPredicate implements IPredicate { if ((initDate == null) && (startDate == null)) { return true; } - return isInTheRangeFilterDates(initDate); + return isLowerToFinishDate(initDate, finishDate); } protected boolean acceptFinishDate(Date deadLine) { if ((deadLine == null) && (finishDate == null)) { return true; } - return isInTheRangeFilterDates(deadLine); - } - - private boolean isInTheRangeFilterDates(Date date) { - // Check if date is into interval between the startdate and finish date - return (isGreaterToStartDate(date, startDate) && isLowerToFinishDate( - date, finishDate)); + return isGreaterToStartDate(deadLine, startDate); } private boolean isGreaterToStartDate(Date date, Date startDate) {