diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java index d2f994bc9..e3ead5682 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java @@ -748,11 +748,16 @@ public class BaseCalendar extends BaseEntity implements IWorkHours { return isActive(new LocalDate(date)); } - /** - * This method is intended to be overridable - */ public boolean isActive(LocalDate date) { - return true; + if (getCalendarAvailabilities().isEmpty()) { + return true; + } + for (CalendarAvailability calendarAvailability : getCalendarAvailabilities()) { + if (calendarAvailability.isActive(date)) { + return true; + } + } + return false; } public CalendarAvailability getLastCalendarAvailability() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java index df680696a..99abba5c8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java @@ -72,19 +72,6 @@ public class ResourceCalendar extends BaseCalendar { return multiplyByCapacity(super.getCapacityAt(date)); } - @Override - public boolean isActive(LocalDate date) { - if (getCalendarAvailabilities().isEmpty()) { - return true; - } - for (CalendarAvailability calendarAvailability : getCalendarAvailabilities()) { - if (calendarAvailability.isActive(date)) { - return true; - } - } - return false; - } - protected int multiplyByCapacity(Integer workableHours) { if (workableHours == null) { return 0;