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

ItEr31S14CUConfiguracionDeOrganizacionsDeTraballoConUnidadesTraballoItEr19S09: Change setting up of tab AssignedHours in OrderElement edit form

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-29 17:27:37 +01:00 • committed by Javier Moran Rua
parent a158084d8c
commit 72cbbfd7ef
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
View file

@ -38,7 +38,7 @@ public class AsignedHoursToOrderElementController extends
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp.getFellow("listOrderElementHours"));
super.doAfterCompose(comp);
comp.setVariable("asignedHoursToOrderElementController", this, true);
}

12
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -46,8 +46,6 @@ public class OrderElementController extends GenericForwardComposer {
*/
private IOrderElementModel orderElementModel;
private AsignedHoursToOrderElementController asignedHoursController;
private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
private AssignedLabelsToOrderElementController assignedLabelsController;
@ -56,6 +54,10 @@ public class OrderElementController extends GenericForwardComposer {
private DetailsOrderElementController detailsController;
private Component orderElementHours;
private AsignedHoursToOrderElementController assignedHoursController;
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
@ -73,8 +75,8 @@ public class OrderElementController extends GenericForwardComposer {
}
private void setupAsignedHoursToOrderElementController(Component comp)throws Exception{
asignedHoursController = new AsignedHoursToOrderElementController();
asignedHoursController.doAfterCompose(comp);
assignedHoursController = (AsignedHoursToOrderElementController)
orderElementHours.getVariable("asignedHoursToOrderElementController", true);
}
private void setupAssignedLabelsToOrderElementController(Component comp)
@ -104,7 +106,7 @@ public class OrderElementController extends GenericForwardComposer {
setOrderElementModel(model);
detailsController.openWindow(model);
asignedHoursController.openWindow(model);
assignedHoursController.openWindow(model);
manageOrderElementAdvancesController.openWindow(model);
assignedLabelsController.openWindow(model);

2
navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
View file

@ -38,7 +38,7 @@
<orderElementDetails id="orderElementDetails" />
</tabpanel>
<tabpanel>
<listOrderElementHours id="listOrderElementHours" />
<listOrderElementHours id="orderElementHours" />
</tabpanel>
<tabpanel>
<listOrderElementAdvances/>

1
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -19,6 +19,7 @@
-->
<?component name="orderElementTree" inline="true" macroURI="_orderElementTree.zul"?>
<window id="${arg.top_id}">
<tabbox>
<tabs>