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

ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Fixing bug at ResourceAllocationModel reattachments

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-16 23:34:03 +02:00
parent a9c0d57fdd
commit 3ca6fc59ce
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationModel.java
View file

@ -19,7 +19,6 @@ import org.navalplanner.business.planner.entities.ResourcesPerDay;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.resources.daos.IWorkerDAO;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionSatisfaction;
import org.navalplanner.business.resources.entities.CriterionType;
@ -43,9 +42,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Autowired
private ITaskElementDAO taskElementDAO;
@Autowired
private IWorkerDAO workerDAO;
@Autowired
private IResourceDAO resourceDAO;
@ -221,9 +217,8 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private void reattachSpecificResourceAllocation(
SpecificResourceAllocation resourceAllocation) {
resourceAllocation.getResource().getDescription();
reattachCriterionSatisfactions(resourceAllocation.getResource()
.getCriterionSatisfactions());
Resource resource = resourceAllocation.getResource();
reattachResource(resource);
}
private void reattachHoursGroup(HoursGroup hoursGroup) {
@ -245,9 +240,9 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
criterionType.getName();
}
private void reattachWorker(Worker worker) {
workerDAO.save(worker);
reattachCriterionSatisfactions(worker.getCriterionSatisfactions());
private void reattachResource(Resource resource) {
resourceDAO.save(resource);
reattachCriterionSatisfactions(resource.getCriterionSatisfactions());
}
private void reattachCriterionSatisfactions(