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

ItEr31S12ValidacionEProbasFuncionaisItEr30S17: Removing no needed reattachments

Browse source 
bug #66
This commit is contained in:
Óscar González Fernández 2009-10-22 16:09:45 +02:00
parent a97dec36cd
commit 663d86c57d
1 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,8 @@ 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;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.entities.GenericResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
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.entities.Criterion;
@ -65,9 +62,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
@Autowired
private IHoursGroupDAO hoursGroupDAO;
@Autowired
private IResourceAllocationDAO resourceAllocationDAO;
private Task task;
private org.zkoss.ganttz.data.Task ganttTask;
@ -154,7 +148,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
this.planningState = planningState;
planningState.reassociateResourcesWithSession(resourceDAO);
taskElementDAO.save(this.task);
reattachResourceAllocations(this.task.getResourceAllocations());
hoursGroupDAO.save(this.task.getHoursGroup());
reattachHoursGroup(this.task.getHoursGroup());
reattachCriterions(this.task.getHoursGroup().getCriterions());
@ -166,27 +159,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
return resourceAllocationsBeingEdited;
}
private void reattachResourceAllocations(
Set<ResourceAllocation<?>> resourceAllocations) {
resourceAllocations.size();
for (ResourceAllocation<?> resourceAllocation : resourceAllocations) {
resourceAllocation.getAssignments().size();
if (resourceAllocation instanceof SpecificResourceAllocation) {
reattachSpecificResourceAllocation((SpecificResourceAllocation) resourceAllocation);
} else if (resourceAllocation instanceof GenericResourceAllocation) {
((GenericResourceAllocation) resourceAllocation)
.getCriterions().size();
}
resourceAllocationDAO.save(resourceAllocation);
}
}
private void reattachSpecificResourceAllocation(
SpecificResourceAllocation resourceAllocation) {
Resource resource = resourceAllocation.getResource();
reattachResource(resource);
}
private void reattachHoursGroup(HoursGroup hoursGroup) {
hoursGroup.getPercentage();
}
@ -217,7 +189,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private void reattachResource(Resource resource) {
resourceDAO.save(resource);
reattachCriterionSatisfactions(resource.getCriterionSatisfactions());
resource.getAssignments();
if (resource.getCalendar() != null) {
resource.getCalendar().getWorkableHours(new LocalDate());
}