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

[Bug #1214] Fix problem reattaching HoursGroup in allocation pop-up

Browse source 
HoursGroup are already loaded in PlanningStateCreator, so there's no
need to load them again when you open the resource allocation pop-up.

FEA: ItEr75S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-10-20 16:15:45 +02:00
parent b87ea09c0f
commit 7ac315ba88
1 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import org.navalplanner.business.common.IOnTransaction;
import org.navalplanner.business.common.ProportionalDistributor;
import org.navalplanner.business.orders.daos.IHoursGroupDAO;
import org.navalplanner.business.orders.entities.AggregatedHoursGroup;
import org.navalplanner.business.orders.entities.HoursGroup;
import org.navalplanner.business.orders.entities.TaskSource;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.daos.ITaskSourceDAO;
@ -265,7 +264,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
taskElementDAO.reattach(this.task);
reattachTaskSource();
loadCriterionsOfGenericAllocations();
reattachHoursGroup(this.task.getHoursGroup());
loadResources(this.task.getSatisfiedResourceAllocations());
loadDerivedAllocations(this.task.getSatisfiedResourceAllocations());
List<AllocationRow> initialRows = AllocationRow.toRows(
@ -303,11 +301,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
}
}
private void reattachHoursGroup(HoursGroup hoursGroup) {
hoursGroupDAO.reattachUnmodifiedEntity(hoursGroup);
hoursGroup.getPercentage();
}
private void loadResources(Set<ResourceAllocation<?>> resourceAllocations) {
for (ResourceAllocation<?> each : resourceAllocations) {
each.getAssociatedResources();
@ -336,10 +329,6 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
private void reattachTaskSource() {
TaskSource taskSource = task.getTaskSource();
taskSourceDAO.reattach(taskSource);
Set<HoursGroup> hoursGroups = taskSource.getHoursGroups();
for (HoursGroup hoursGroup : hoursGroups) {
reattachHoursGroup(hoursGroup);
}
}
private void reattachCriterion(Criterion criterion) {