From 3de4983fb63e1f0346ebd9a4ac98ff02507306e5 Mon Sep 17 00:00:00 2001
From: Susana Montes Pedreira <smpedreira@gmail.com>
Date: Fri, 18 Dec 2009 13:46:05 +0100
Subject: [PATCH]  ItEr39S05ValidacionEProbasFuncionaisItEr38S05 : Allows show
 the work reports list and the work report type list, orderly way.

---
 .../workreports/WorkReportCRUDController.java  | 18 +++++++++++++++++-
 .../web/workreports/WorkReportModel.java       |  2 +-
 .../WorkReportTypeCRUDController.java          | 16 ++++++++++++++++
 .../webapp/workreports/_listWorkReport.zul     |  7 ++++---
 .../workreports/_listWorkReportTypes.zul       |  7 ++++---
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
index e210847f3..cc95220ff 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
@@ -60,6 +60,7 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.Column;
 import org.zkoss.zul.Columns;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Datebox;
@@ -127,7 +128,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
         final URLHandler<IWorkReportCRUDControllerEntryPoints> handler = URLHandlerRegistry
                 .getRedirectorFor(IWorkReportCRUDControllerEntryPoints.class);
         handler.registerListener(this, page);
-        getVisibility().showOnly(listWindow);
+        goToList();
     }
 
     /**
@@ -1214,4 +1215,19 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
         listWorkReportLines.setModel(new SimpleListModel(getWorkReportLines()
                 .toArray()));
     }
+
+    public void sortWorkReports() {
+        Column columnDateStart = (Column) listWindow
+                .getFellow("columnDateStart");
+        if (columnDateStart != null) {
+            if (columnDateStart.getSortDirection().equals("ascending")) {
+                columnDateStart.sort(false, false);
+                columnDateStart.setSortDirection("ascending");
+            } else if (columnDateStart.getSortDirection().equals("descending")) {
+                columnDateStart.sort(true, false);
+                columnDateStart.setSortDirection("descending");
+            }
+        }
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
index bfe6e49b8..ff7b7c23e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
@@ -248,7 +248,7 @@ public class WorkReportModel implements IWorkReportModel {
     @Override
     @Transactional(readOnly = true)
     public List<WorkReportDTO> getWorkReportDTOs() {
-        // load the work reports
+        // load the work reports DTOs
         List<WorkReport> listWorkReports = getAllWorkReports();
         List<WorkReportDTO> resultDTOs = new ArrayList<WorkReportDTO>();
         for (WorkReport workReport : listWorkReports) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
index 6140e51f1..45a7f2ca6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeCRUDController.java
@@ -50,6 +50,7 @@ import org.zkoss.zk.ui.event.EventListener;
 import org.zkoss.zk.ui.event.Events;
 import org.zkoss.zk.ui.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
+import org.zkoss.zul.Column;
 import org.zkoss.zul.Combobox;
 import org.zkoss.zul.Comboitem;
 import org.zkoss.zul.Constraint;
@@ -995,4 +996,19 @@ public class WorkReportTypeCRUDController extends GenericForwardComposer
             tab.setSelected(true);
         }
     }
+
+    public void sortWorkReportTypes() {
+        Column columnName = (Column) listWindow
+                .getFellow("workReportTypeName");
+        if (columnName != null) {
+            if (columnName.getSortDirection().equals("ascending")) {
+                columnName.sort(false, false);
+                columnName.setSortDirection("ascending");
+            } else if (columnName.getSortDirection().equals("descending")) {
+                columnName.sort(true, false);
+                columnName.setSortDirection("descending");
+            }
+        }
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
index 837c011d4..d072ace1e 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReport.zul
@@ -20,10 +20,11 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Work report listing')}">
     <grid id="listing"  mold="paging" pageSize="10"
-        model="@{controller.workReportDTOs}">
+        model="@{controller.workReportDTOs}"
+        onInitRender ="controller.sortWorkReports();">
         <columns sizable="true">
-            <column label="${i18n:_('Date Start')}" sort="auto(dateStart)"/>
-            <column label="${i18n:_('Date Finish')}" sort="auto(dateFinish)"/>
+            <column id="columnDateStart" label="${i18n:_('Date Start')}" sort="auto(dateStart, dateFinish)" sortDirection="ascending"/>
+            <column id="columnDateFinish" label="${i18n:_('Date Finish')}" sort="auto(dateFinish, dateStart)" sortDirection="ascending"/>
             <column label="${i18n:_('Type')}" sort="auto(type)"/>
             <column label="${i18n:_('Actions')}" />
         </columns>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
index c33333403..a1e18bd8b 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
@@ -19,10 +19,11 @@
 -->
 
 <window id="${arg.top_id}" title="${i18n:_('Work Report types')}">
-    <grid id="listing" model="@{controller.workReportTypes}" mold="paging"
-        pageSize="10">
+    <grid id="listing" mold="paging" pageSize="10"
+        model="@{controller.workReportTypes}"
+        onInitRender ="controller.sortWorkReportTypes();">
         <columns>
-            <column label="${i18n:_('Name')}" sort="auto(name)" />
+            <column id="workReportTypeName" label="${i18n:_('Name')}" sort="auto(name)" sortDirection="descending"/>
             <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>