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

Reattach the order

Browse source 
The order and resources already present in PlanningState are reused.

FEA: ItEr75S11PreventLooseChanges
This commit is contained in:
Óscar González Fernández 2011-07-20 17:08:55 +02:00
parent 7638720136
commit 9fe98c932d
2 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
View file

@ -502,6 +502,13 @@ public class PlanningStateCreator {
return getScenarioInfo().getCurrentScenario();
}
public void reattach() {
orderDAO.reattach(order);
if (getRootTask() != null) {
taskDAO.reattach(getRootTask());
}
}
}
private class EmptyPlannigState extends PlanningState {

26
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -112,7 +112,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
private List<LoadTimeLine> loadTimeLines;
private Interval viewInterval;
private Order filterBy;
private PlanningState filterBy;
private boolean filterByResources = true;
@ -164,7 +164,9 @@ public class ResourceLoadModel implements IResourceLoadModel {
@Override
@Transactional(readOnly = true)
public void initGlobalView(PlanningState filterBy, boolean filterByResources) {
this.filterBy = filterBy.getOrder();
this.filterBy = filterBy;
this.filterBy.reattach();
this.filterBy.reassociateResourcesWithSession();
this.filterByResources = filterByResources;
doGlobalView();
}
@ -252,7 +254,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
private Map<Criterion, List<GenericResourceAllocation>> findAllocationsByCriterion() {
if (filter()) {
List<Task> tasks = justTasks(filterBy
List<Task> tasks = justTasks(filterBy.getOrder()
.getAllChildrenAssociatedTaskElements());
return findAllocationsGroupedByCriteria(getCriterionsOn(tasks));
} else {
@ -404,7 +406,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
private List<Resource> resourcesForActiveTasks() {
return Resource.sortByName(resourcesDAO
.findResourcesRelatedTo(justTasks(filterBy
.findResourcesRelatedTo(justTasks(filterBy.getOrder()
.getAllChildrenAssociatedTaskElements())));
}
@ -484,11 +486,11 @@ public class ResourceLoadModel implements IResourceLoadModel {
// REVISAR ESTO ANTES DE ACABAR
if (filter()) {
// build time lines for current order
if (byOrder.get(filterBy) != null) {
result.addAll(buildTimeLinesForOrder(filterBy, criterion,
byOrder.get(filterBy)));
if (byOrder.get(filterBy.getOrder()) != null) {
result.addAll(buildTimeLinesForOrder(filterBy.getOrder(),
criterion, byOrder.get(filterBy.getOrder())));
}
byOrder.remove(filterBy);
byOrder.remove(filterBy.getOrder());
// build time lines for other orders
LoadTimeLine lineOthersOrders = buildTimeLinesForOtherOrders(
criterion, byOrder);
@ -674,12 +676,12 @@ public class ResourceLoadModel implements IResourceLoadModel {
Map<Order, List<ResourceAllocation<?>>> byOrder = byOrder(sortedByStartDate);
if (filter()) {
if (byOrder.get(filterBy) != null) {
if (byOrder.get(filterBy.getOrder()) != null) {
// build time lines for current order
result.addAll(buildTimeLinesForOrder(resource, byOrder
.get(filterBy)));
result.addAll(buildTimeLinesForOrder(resource,
byOrder.get(filterBy.getOrder())));
}
byOrder.remove(filterBy);
byOrder.remove(filterBy.getOrder());
// build time lines for other orders
LoadTimeLine lineOthersOrders = buildTimeLinesForOtherOrders(
resource, byOrder);