From 53afd6e865b049b413b4ba1eba85fbdf65602053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 23 Sep 2009 13:28:18 +0200 Subject: [PATCH] ItEr27S06CUAsignacionGrupoRecursosAPlanificacionItEr26S07: When reattaching a resource the calendar is also loaded --- .../web/planner/allocation/ResourceAllocationModel.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java index 076185fdf..42386a907 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.joda.time.LocalDate; import org.navalplanner.business.orders.daos.IHoursGroupDAO; import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.planner.daos.IResourceAllocationDAO; @@ -178,6 +179,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel { resourceDAO.save(resource); reattachCriterionSatisfactions(resource.getCriterionSatisfactions()); resource.getAssignments(); + if (resource.getCalendar() != null) { + resource.getCalendar().getWorkableHours(new LocalDate()); + } } private void reattachCriterionSatisfactions(