From 2bf13fef807d30f060a23868dacee8c0f7f8218d Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 29 Jan 2013 14:05:48 +0100 Subject: [PATCH] Bug #1607: Fix issue filtering the resources load window The issue was introduced in commit 05132fd5a75a6b44ee7e15b49bac233008f708a7. Where it was defined an algorithm: 2.4) FSD is not null and FED is not null: 2.4.1) APED is null: Check if APSD is between FSD and FED This was wrong, it should be: 2.4) FSD is not null and FED is not null: 2.4.1) APED is null: Check if APSD is lower or equals than FSD or APSD is lower or equals than FED FEA: ItEr77S04BugFixing --- .../business/calendars/entities/CalendarAvailability.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarAvailability.java b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarAvailability.java index 144cde82c..a9cf1c403 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarAvailability.java +++ b/libreplan-business/src/main/java/org/libreplan/business/calendars/entities/CalendarAvailability.java @@ -150,8 +150,8 @@ public class CalendarAvailability extends IntegrationEntity { } if (endDate == null) { - return startDate.compareTo(filterStartDate) >= 0 - && startDate.compareTo(filterEndDate) <= 0; + return startDate.compareTo(filterStartDate) <= 0 + || startDate.compareTo(filterEndDate) <= 0; } Interval filterPeriod = new Interval(