From 3de2358f776b47717f6b69c7fa02644344ebdf45 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Thu, 11 Feb 2010 18:23:52 +0100
Subject: [PATCH]  ItEr47S08RFNavegacionOrganizacionTraballoItEr46S09 : Load
 the order elements tree on demand.

---
 .../web/orders/OrderCRUDController.java       | 51 ++++++++++++++-----
 .../src/main/webapp/orders/_edition.zul       |  7 +--
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 84bbb315e..00ccc9868 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -72,6 +72,8 @@ import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.Events;
+import org.zkoss.zk.ui.event.SelectEvent;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
@@ -267,11 +269,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void setupEditControllers() throws Exception {
         Component comp = self;
-        OrderElementController orderElementController = new OrderElementController();
-        orderElementController.doAfterCompose(comp
-                .getFellow("editOrderElement"));
 
-        setupOrderElementTreeController(comp, orderElementController);
         setupAsignedHoursToOrderElementController(comp);
         setupManageOrderElementAdvancesController(comp);
         setupAssignedLabelsToOrderElementController(comp);
@@ -281,13 +279,24 @@ public class OrderCRUDController extends GenericForwardComposer {
         setupOrderAuthorizationController(comp);
     }
 
-    private void setupOrderElementTreeController(Component comp,
-            OrderElementController orderElementController) throws Exception {
-        TreeComponent orderElementsTree = (TreeComponent) editWindow
-                .getFellow("orderElementTree");
-        orderElementTreeController = new OrderElementTreeController(
-                orderModel, orderElementController);
-        orderElementsTree.useController(orderElementTreeController);
+    public void setupOrderElementTreeController() throws Exception {
+        if (orderElementTreeController == null) {
+            OrderElementController orderElementController = new OrderElementController();
+            orderElementController.doAfterCompose(self
+                    .getFellow("editOrderElement"));
+            orderElementTreeController = new OrderElementTreeController(
+                    orderModel, orderElementController);
+
+            TreeComponent orderElementsTree = (TreeComponent) editWindow
+                    .getFellow("orderElementTree");
+            orderElementsTree.useController(orderElementTreeController);
+            redraw(orderElementsTree);
+        }
+    }
+
+    private void redraw(Component comp) {
+        Util.createBindingsFor(comp);
+        Util.reloadBindings(comp);
     }
 
     private IOrderElementModel getOrderElementModel() {
@@ -435,6 +444,12 @@ public class OrderCRUDController extends GenericForwardComposer {
         return false;
     }
 
+    Tab tabGeneralData;
+
+    private void selectDefaultTab() {
+        selectTab("tabGeneralData");
+    }
+
     private void setCurrentTab() {
         Tabbox tabboxOrder = (Tabbox) editWindow.getFellowIfAny("tabboxOrder");
         if (tabboxOrder != null) {
@@ -576,7 +591,7 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private void showEditWindow(String title) {
         addEditWindowIfNeeded();
-        clearEditWindow();
+        selectDefaultTab();
         initializeTabs();
         editWindow.setTitle(title);
         showWindow(editWindow);
@@ -585,6 +600,11 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void initializeTabs() {
         final IOrderElementModel orderElementModel = getOrderElementModel();
 
+        if(orderElementTreeController != null){
+            TreeComponent orderElementsTree = (TreeComponent) editWindow
+            .getFellow("orderElementTree");
+            redraw(orderElementsTree);
+        }
         assignedHoursController.openWindow(orderElementModel);
         manageOrderElementAdvancesController.openWindow(orderElementModel);
         assignedLabelsController.openWindow(orderElementModel);
@@ -907,7 +927,12 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     public void highLight(OrderElement orderElement) {
-        selectTab("tabOrderElements");
+        Tab tab = (Tab) editWindow.getFellowIfAny("tabOrderElements");
+        if (tab != null) {
+            tab.setSelected(true);
+            Events.sendEvent(new SelectEvent(Events.ON_SELECT, tab, null));
+        }
+
         if ((!(orderElement instanceof Order))
                 && (orderElementTreeController != null)) {
             final Treeitem item = orderElementTreeController
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index d66fa1dfe..192dd68e3 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -33,8 +33,9 @@
 
     <tabbox id="tabboxOrder">
         <tabs>
-            <tab id="tabGeneralData" label="${i18n:_('General data')}" />
-            <tab id="tabOrderElements" label="${i18n:_('Order elements')}" />
+            <tab id="tabGeneralData" label="${i18n:_('General data')}" selected="true"/>
+            <tab id="tabOrderElements" label="${i18n:_('Order elements')}"
+                onSelect = "controller.setupOrderElementTreeController();"/>
             <tab id="tabAssignedHours" label="${i18n:_('Assigned hours')}" />
             <tab id="tabAdvances" label="${i18n:_('Advances')}" />
             <tab id="tabLabels" label="${i18n:_('Label')}" />
@@ -145,7 +146,7 @@
                     </rows>
                 </grid>
             </tabpanel>
-            <tabpanel sclass="orderelements-tab">
+            <tabpanel sclass="orderelements-tab" fulfill="tabOrderElements.onSelect">
                 <orderElementTree id="orderElementTree"/>
             </tabpanel>
             <tabpanel>