From d4ef0a73cf53392f21d55c4657fe63691c7a1e27 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Mon, 15 Feb 2010 18:13:39 +0100
Subject: [PATCH]  ItEr48S08RFNavegacionOrganizacionTraballoItEr47S08: Load the
 assigned hours of the current order element on demand.

---
 .../web/orders/OrderElementController.java    | 23 +++++++++++--------
 .../main/webapp/orders/_editOrderElement.zul  |  5 ++--
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
index 0cd11a28a..1b6c0f146 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
@@ -80,23 +80,28 @@ public class OrderElementController extends GenericForwardComposer {
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
         comp.setVariable("orderElementController", this, true);
-        setupDetailsOrderElementController(comp);
-        setupAssignedHoursToOrderElementController(comp);
+        setupDetailsOrderElementController();
+
         setupAssignedLabelsToOrderElementController(comp);
         setupAssignedCriterionRequirementToOrderElementController(comp);
         setupAssignedMaterialsToOrderElementController(comp);
         setupAssignedTaskQualityFormsToOrderElementController(comp);
     }
 
-    private void setupDetailsOrderElementController(Component comp) throws Exception{
+    private void setupDetailsOrderElementController() throws Exception {
         detailsController = (DetailsOrderElementController)
         orderElementDetails.getVariable("detailsController", true);
     }
 
-    private void setupAssignedHoursToOrderElementController(Component comp) throws Exception{
-        assignedHoursToOrderElementController = (AssignedHoursToOrderElementController)
- orderElementHours
-                .getVariable("assignedHoursToOrderElementController", true);
+    public void setupAssignedHoursToOrderElementController() throws Exception {
+        if (assignedHoursToOrderElementController == null) {
+            assignedHoursToOrderElementController = (AssignedHoursToOrderElementController) orderElementHours
+                    .getVariable("assignedHoursToOrderElementController", true);
+            assignedHoursToOrderElementController.openWindow(orderElementModel);
+        } else {
+            Util.createBindingsFor(orderElementHours);
+            Util.reloadBindings(orderElementHours);
+        }
     }
 
     public void setupManageOrderElementAdvancesController()
@@ -150,12 +155,12 @@ public class OrderElementController extends GenericForwardComposer {
     public void openWindow(IOrderElementModel model){
         clearAll();
         setOrderElementModel(model);
+        detailsController.openWindow(model);
 
         // initialize the controllers
         manageOrderElementAdvancesController = null;
+        assignedHoursToOrderElementController = null;
 
-        detailsController.openWindow(model);
-        assignedHoursToOrderElementController.openWindow(model);
         assignedLabelsController.openWindow(model);
         assignedCriterionRequirementController.openWindow(model);
         assignedMaterialsController.openWindow(model.getOrderElement());
diff --git a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
index 63b428b1f..f02e728f3 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
@@ -33,7 +33,8 @@
 <tabbox height="620px" id="tabboxOrderElement">
 	<tabs>
             <tab id="tabDetails" label="${i18n:_('Details')}"></tab>
-            <tab label="${i18n:_('Assigned hours')}"></tab>
+            <tab id="tabAssignedHours" label="${i18n:_('Assigned hours')}"
+                onSelect="orderElementController.setupAssignedHoursToOrderElementController();"/>
             <tab id="tabAdvances" label="${i18n:_('Advances')}"
                 onSelect="orderElementController.setupManageOrderElementAdvancesController();"/>
             <tab label="${i18n:_('Labels')}"></tab>
@@ -46,7 +47,7 @@
                 <orderElementDetails id="orderElementDetails" />
             </tabpanel>
             <tabpanel>
-                <listOrderElementHours id="orderElementHours" />
+                <listOrderElementHours id="orderElementHours" fulfill="tabAssignedHours.onSelect"/>
             </tabpanel>
             <tabpanel>
                 <listOrderElementAdvances id="orderElementAdvances" fulfill="tabAdvances.onSelect"/>