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

ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Fixing. It must use the resource calendar when sharing out.

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-17 13:22:05 +02:00
parent 447f4c162c
commit 6b54cc723a
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java
View file

@ -9,8 +9,6 @@ import java.util.Map;
import java.util.Set;
import org.joda.time.LocalDate;
import org.navalplanner.business.calendars.entities.BaseCalendar;
import org.navalplanner.business.calendars.entities.CombinedWorkHours;
import org.navalplanner.business.calendars.entities.IWorkHours;
import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
import org.navalplanner.business.resources.entities.Criterion;
@ -100,16 +98,8 @@ public class GenericResourceAllocation extends ResourceAllocation {
}
private final IWorkHours generateWorkHoursFor(Resource resource) {
List<BaseCalendar> calendars = new ArrayList<BaseCalendar>();
if (resource.getCalendar() != null) {
calendars.add(resource.getCalendar());
}
if (getTaskCalendar() != null) {
calendars.add(getTaskCalendar());
}
if (!calendars.isEmpty()) {
return CombinedWorkHours.minOf(calendars
.toArray(new IWorkHours[0]));
return resource.getCalendar();
} else {
return SameWorkHoursEveryDay.getDefaultWorkingDay();
}