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

ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06: Passing the AllocationResult to AdvancedAllocationController.

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-06 23:26:50 +02:00
parent bd5fd66242
commit 2dfbb35e63
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
navalplanner-webapp/src/main/java/org/navalplanner/web/common/ViewSwitcher.java
View file

@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import org.navalplanner.web.planner.allocation.AdvancedAllocationController;
import org.navalplanner.web.planner.allocation.AllocationResult;
import org.navalplanner.web.resourceload.ResourceLoadController;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -52,18 +53,18 @@ public class ViewSwitcher implements Composer {
isInPlanningOrder = true;
}
public void goToAdvancedAllocation() {
public void goToAdvancedAllocation(AllocationResult allocationResult) {
planningOrder = ComponentsReplacer.replaceAllChildren(parent,
"advance_allocation.zul",
createArgsForAdvancedAllocation());
createArgsForAdvancedAllocation(allocationResult));
isInPlanningOrder = false;
}
private Map<String, Object> createArgsForAdvancedAllocation() {
private Map<String, Object> createArgsForAdvancedAllocation(
AllocationResult allocationResult) {
Map<String, Object> result = new HashMap<String, Object>();
result.put("advancedAllocationController",
new AdvancedAllocationController(
ViewSwitcher.this));
new AdvancedAllocationController(this, allocationResult));
return result;
}

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
View file

@ -57,9 +57,12 @@ public class AdvancedAllocationController extends
private Grid leftPane;
private TimeTrackedTable<FakeData> table;
private final ViewSwitcher switcher;
private final AllocationResult allocationResult;
public AdvancedAllocationController(ViewSwitcher switcher) {
public AdvancedAllocationController(ViewSwitcher switcher,
AllocationResult allocationResult) {
this.switcher = switcher;
this.allocationResult = allocationResult;
}
@Override

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
View file

@ -314,7 +314,7 @@ public class ResourceAllocationController extends GenericForwardComposer {
public void advanceAllocation() {
AllocationResult allocationResult = allocationsBeingEdited
.doAllocation();
switcher.goToAdvancedAllocation();
switcher.goToAdvancedAllocation(allocationResult);
window.setVisible(false);
}