From a9402cb3274a1fd3cbaa39a2bbb6ee6881a5fda4 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Thu, 10 Dec 2009 13:30:00 +0100
Subject: [PATCH]  ItEr38S05ValidacionEProbasFuncionaisItEr37S06 : Fix and add
 the NewDataSortableGrid to HoursGroupWrapper managment.

---
 ...ionRequirementToOrderElementController.java |  3 +--
 ...riterionRequirementToOrderElementModel.java |  2 +-
 .../web/orders/HoursGroupWrapper.java          | 11 +++++++++--
 .../_listOrderElementCriterionRequirements.zul | 18 +++++++++---------
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
index bb85b5c3d..8c1742101 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementController.java
@@ -50,7 +50,6 @@ import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Bandbox;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Constraint;
-import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hbox;
 import org.zkoss.zul.Intbox;
 import org.zkoss.zul.Label;
@@ -90,7 +89,7 @@ public class AssignedCriterionRequirementToOrderElementController extends
 
     private NewDataSortableGrid listingRequirements;
 
-    private Grid listHoursGroups;
+    private NewDataSortableGrid listHoursGroups;
 
     private Intbox orderElementTotalHours;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
index 5513dbdc1..a6708e080 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
@@ -316,7 +316,7 @@ public class AssignedCriterionRequirementToOrderElementModel  implements
             (asOrderLine()).addHoursGroup(newHoursGroup);
 
             // Set generated name
-            int number = (asOrderLine()).getHoursGroups().size();
+            int number = (asOrderLine()).getHoursGroups().size() - 1;
             newHoursGroup.setName(_("New hours group ") + number);
 
             return newHoursGroup;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
index efce45012..d0158f947 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
@@ -40,7 +40,7 @@ import org.navalplanner.business.resources.entities.ResourceEnum;
  * requirement.
  * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
  */
-public class HoursGroupWrapper implements INewObject {
+public class HoursGroupWrapper implements INewObject, Comparable {
 
     private Boolean newObject = false;
 
@@ -82,7 +82,9 @@ public class HoursGroupWrapper implements INewObject {
     }
 
     public void setName(String name) {
-        this.hoursGroup.setName(name);
+        if (hoursGroup != null) {
+            hoursGroup.setName(name);
+        }
     }
 
     public ResourceEnum getResourceType() {
@@ -349,4 +351,9 @@ public class HoursGroupWrapper implements INewObject {
         return result;
     }
 
+    @Override
+    public int compareTo(Object arg0) {
+        final HoursGroupWrapper hoursGroupWrapper = (HoursGroupWrapper) arg0;
+        return getName().compareTo(hoursGroupWrapper.getName());
+    }
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
index f29bca70d..293734f63 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
@@ -145,16 +145,16 @@ criterionRequirementsController = new org.navalplanner.web.orders.AssignedCriter
             onClick="criterionRequirementsController.addHoursGroup()" />
         <separator bar="false" spacing="20px" orient="vertical"/>
     </hbox>
-    <grid id = "listHoursGroups" mold="paging" pageSize="4" fixedLayout="true"
+    <newdatasortablegrid id = "listHoursGroups" mold="paging" pageSize="4" fixedLayout="true"
         model="@{criterionRequirementsController.hoursGroupWrappers}">
         <columns>
-            <column width="25px" />
-            <column label="Name" width="160px" align="center"/>
-            <column label="Type" width="130px" align="center"/>
-            <column label="Hours" width="120px" align="center"/>
-            <column label="%" width="100px" align="center"/>
-            <column label="Fixed %" width="50px" align="center"/>
-            <column label="Operations" align="center"/>
+            <newdatasortablecolumn width="25px" sort="auto"/>
+            <newdatasortablecolumn label="Name" width="160px" sort="auto(name)" sortDirection="ascending" align="center"/>
+            <newdatasortablecolumn label="Type" width="130px" align="center"/>
+            <newdatasortablecolumn label="Hours" width="120px" align="center"/>
+            <newdatasortablecolumn label="%" width="100px" align="center"/>
+            <newdatasortablecolumn label="Fixed %" width="50px" align="center"/>
+            <newdatasortablecolumn label="Operations" align="center"/>
         </columns>
         <rows>
             <row self="@{each='hoursGroupWrapper'}" value="@{hoursGroupWrapper}">
@@ -195,7 +195,7 @@ criterionRequirementsController = new org.navalplanner.web.orders.AssignedCriter
                 </hbox>
             </row>
         </rows>
-    </grid>
+    </newdatasortablegrid>
     </panelchildren>
 </panel>
 </vbox>