RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr49S10CUVisualizacionResponsabilidadesTRaballoNaPlanificacionItEr48S10: Pulling up isActive implementation to BaseCalendar

Browse source
This commit is contained in:
Óscar González Fernández 2010-02-25 18:51:50 +01:00
parent 2fcc514e38
commit 7fff669be4
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/BaseCalendar.java
View file

@ -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() {

13
navalplanner-business/src/main/java/org/navalplanner/business/calendars/entities/ResourceCalendar.java
View file

@ -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;