From 4d72cca8207b0370a66f84bb9237e11cc1d2be0c Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Wed, 15 Dec 2010 13:12:11 +0100
Subject: [PATCH] it changes the name of the Order Elements tab and it places
 at first position.

FEA : ItEr65S09CreateProject
---
 .../web/orders/OrderCRUDController.java       | 24 +++++++++++--------
 .../src/main/webapp/orders/_edition.zul       | 12 +++++-----
 2 files changed, 20 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 d7f6d7677..399eeb951 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
@@ -40,9 +40,9 @@ import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.externalcompanies.entities.ExternalCompany;
 import org.navalplanner.business.orders.entities.HoursGroup;
 import org.navalplanner.business.orders.entities.Order;
-import org.navalplanner.business.orders.entities.Order.SchedulingMode;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.orders.entities.OrderStatusEnum;
+import org.navalplanner.business.orders.entities.Order.SchedulingMode;
 import org.navalplanner.business.templates.entities.OrderTemplate;
 import org.navalplanner.business.users.entities.UserRole;
 import org.navalplanner.web.common.IMessagesForUser;
@@ -271,9 +271,6 @@ public class OrderCRUDController extends GenericForwardComposer {
         Component parent = listWindow.getParent();
         editWindow = (Window) Executions.createComponents(
                 "/orders/_edition.zul", parent, editWindowArgs);
-        orderDatesHandler = new OrderDatesHandler(editWindow);
-
-        bindListOrderStatusSelectToOnStatusChange();
 
         Util.createBindingsFor(editWindow);
         Util.reloadBindings(editWindow);
@@ -369,7 +366,7 @@ public class OrderCRUDController extends GenericForwardComposer {
         });
     }
 
-    public void setupOrderElementTreeController() throws Exception {
+    public void setupOrderElementTreeController() {
         if (!confirmLastTab()) {
             return;
         }
@@ -381,8 +378,12 @@ public class OrderCRUDController extends GenericForwardComposer {
             if (editOrderElementWindow == null) {
                 initEditOrderElementWindow();
             }
-            orderElementController.doAfterCompose(self
-                    .getFellow("editOrderElement"));
+            try {
+                orderElementController.doAfterCompose(self
+                        .getFellow("editOrderElement"));
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
 
             // Prepare tree, attach edit window to tree
             orderElementTreeController = new OrderElementTreeController(
@@ -760,7 +761,7 @@ public class OrderCRUDController extends GenericForwardComposer {
     }
 
     private void selectDefaultTab() {
-        selectTab("tabGeneralData");
+        selectTab("tabOrderElements");
     }
 
     private void resetSelectedTab() {
@@ -934,9 +935,8 @@ public class OrderCRUDController extends GenericForwardComposer {
     private void prepareEditWindow() {
         addEditWindowIfNecessary();
         updateDisabilitiesOnInterface();
-        initializeCustomerComponent();
+        setupOrderElementTreeController();
         selectDefaultTab();
-        orderDatesHandler.chooseCurrentSchedulingMode();
     }
 
     private void showEditWindow(String title) {
@@ -962,7 +962,11 @@ public class OrderCRUDController extends GenericForwardComposer {
     public void setupOrderDetails() {
         confirmLastTab();
         setCurrentTab();
+        orderDatesHandler = new OrderDatesHandler(editWindow);
+        bindListOrderStatusSelectToOnStatusChange();
+        initializeCustomerComponent();
         reloadDefaultTab();
+        orderDatesHandler.chooseCurrentSchedulingMode();
     }
 
     public void reloadDefaultTab() {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 0f0fcfe73..57c1a7213 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -36,10 +36,10 @@
 
     <tabbox id="tabboxOrder">
         <tabs>
+            <tab id="tabOrderElements" label="${i18n:_('WBS (tasks)')}"
+                onSelect = "controller.setupOrderElementTreeController();"/>
             <tab id="tabGeneralData" label="${i18n:_('General data')}" selected="true"
                 onSelect = "controller.setupOrderDetails();"/>
-            <tab id="tabOrderElements" label="${i18n:_('Order elements')}"
-                onSelect = "controller.setupOrderElementTreeController();"/>
             <tab id="tabAssignedHours" label="${i18n:_('Imputed hours')}"
                 onSelect = "controller.setupAssignedHoursToOrderElementController();"/>
             <tab id="tabAdvances" label="${i18n:_('Advances')}"
@@ -57,7 +57,10 @@
                 onSelect = "controller.setupOrderAuthorizationController();"/>
         </tabs>
         <tabpanels>
-            <tabpanel id="tabPanelGeneralData">
+            <tabpanel sclass="orderelements-tab">
+                <orderElementTree id="orderElementTree"/>
+            </tabpanel>
+            <tabpanel id="tabPanelGeneralData" fulfill="tabGeneralData.onSelect">
                 <grid fixedLayout="true">
                     <columns>
                         <column width="200px" />
@@ -161,9 +164,6 @@
                     </rows>
                 </grid>
             </tabpanel>
-            <tabpanel sclass="orderelements-tab" fulfill="tabOrderElements.onSelect">
-                <orderElementTree id="orderElementTree"/>
-            </tabpanel>
             <tabpanel>
                 <listOrderElementHours id="orderElementHours" fulfill="tabAssignedHours.onSelect"/>
             </tabpanel>