From c7aae8dee33a9da909d0357afd3f268cf2a715d0 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smontes@wirelessgalicia.com>
Date: Fri, 12 Mar 2010 14:12:32 +0100
Subject: [PATCH]  ItEr50S04ValidacionEProbasFuncionaisItEr49S04 : [Bug #382]
 Fixing bug.

It should select the advance type before add new advance measurements to the advance assignment.
---
 .../ManageOrderElementAdvancesController.java       | 13 ++++++++++++-
 .../webapp/orders/_listOrderElementAdvances.zul     |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
index c29ad8eb9..c259a6f71 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
@@ -166,12 +166,23 @@ public class ManageOrderElementAdvancesController extends
 
     private Listbox editAdvances;
 
-    public void prepareEditAdvanceMeasurements(AdvanceAssignment advanceAssignment) {
+    public void prepareEditAdvanceMeasurements(Listitem selectedItem) {
+        AdvanceAssignment advanceAssignment = (AdvanceAssignment) selectedItem
+                .getValue();
+        if (advanceAssignment.getAdvanceType() != null) {
         validateListAdvanceMeasurement();
         manageOrderElementAdvancesModel
                 .prepareEditAdvanceMeasurements(advanceAssignment);
         this.indexSelectedItem = editAdvances.getIndexOfItem(editAdvances.getSelectedItem());
         Util.reloadBindings(self);
+        } else {
+            Component comboAdvanceType = selectedItem.getFirstChild()
+                    .getFirstChild();
+            if (comboAdvanceType instanceof Combobox) {
+                throw new WrongValueException(comboAdvanceType,
+                    _("should select a advance type"));
+            }
+        }
     }
 
     public void goToCreateLineAdvanceAssignment() {
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
index e33e5c8af..b73d0b2ad 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
@@ -34,7 +34,7 @@
             <listbox id="editAdvances" height="200px"
                      model="@{manageOrderElementAdvancesController.advanceAssignments}"
                      itemRenderer="@{manageOrderElementAdvancesController.advancesRenderer}" mold="paging"
-                     onSelect="manageOrderElementAdvancesController.prepareEditAdvanceMeasurements(self.selectedItem.value);"
+                     onSelect="manageOrderElementAdvancesController.prepareEditAdvanceMeasurements(self.selectedItem);"
                      pageSize="10">
                     <listhead sizable="true">
                          <listheader label="${i18n:_('Type')}" tooltiptext="Advance unit type" />