From 7ee3d555f4329696ddafbf6ebc30e8f39fa4161b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 17 Mar 2011 17:34:58 +0100
Subject: [PATCH] [Bug #885] Added single-click edition support to CRUD grids

FEA: ItEr72S04BugFixing
---
 .../web/advance/AdvanceTypeCRUDController.java      | 10 ++++++++--
 .../web/materials/UnitTypeController.java           | 13 ++++++++++---
 .../src/main/webapp/advance/_listAdvanceTypes.zul   |  2 +-
 .../webapp/costcategories/_listCostCategories.zul   |  4 ++--
 .../webapp/costcategories/_listTypesOfWorkHours.zul |  4 ++--
 .../webapp/excetiondays/_listExceptionDayTypes.zul  |  4 ++--
 .../externalcompanies/_listExternalCompanies.zul    |  4 ++--
 .../src/main/webapp/labels/_listLabelTypes.zul      |  4 ++--
 .../src/main/webapp/materials/_listUnitTypes.zul    |  2 +-
 .../main/webapp/qualityforms/_listQualityForm.zul   |  4 ++--
 .../webapp/resources/worker/_listVirtualWorkers.zul |  2 +-
 .../src/main/webapp/templates/_list.zul             |  4 ++--
 .../src/main/webapp/users/_listProfiles.zul         |  4 ++--
 .../src/main/webapp/users/_listUsers.zul            |  4 ++--
 .../webapp/workreports/_listWorkReportTypes.zul     |  4 ++--
 .../src/main/webapp/workreports/workReport.zul      |  4 ++--
 16 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
index ff929ee88..74cc3379b 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java
@@ -38,6 +38,7 @@ import org.zkoss.zk.ui.Component;
 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.util.GenericForwardComposer;
 import org.zkoss.zul.Button;
 import org.zkoss.zul.Checkbox;
@@ -263,12 +264,17 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer {
 
             @Override
             public void render(Row row, Object data) throws Exception {
-                AdvanceType advanceType = (AdvanceType) data;
-
+                final AdvanceType advanceType = (AdvanceType) data;
                 appendLabelName(row, advanceType);
                 appendCheckboxEnabled(row, advanceType);
                 appendCheckboxPredefined(row, advanceType);
                 appendOperations(row, advanceType);
+                row.addEventListener(Events.ON_CLICK, new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        goToEditForm(advanceType);
+                    }
+                });
             }
 
             private void appendLabelName(Row row, AdvanceType advanceType) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
index 0aeb33e20..1fedc2466 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/UnitTypeController.java
@@ -39,6 +39,7 @@ import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.CheckEvent;
 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.util.GenericForwardComposer;
 import org.zkoss.zul.Constraint;
 import org.zkoss.zul.Hbox;
@@ -95,10 +96,16 @@ public class UnitTypeController extends GenericForwardComposer {
         return new RowRenderer() {
             @Override
             public void render(Row row, Object data) throws Exception {
-                UnitType unitType = (UnitType) data;
+                final UnitType unitType = (UnitType) data;
 
                 appendUnitTypeName(row, unitType);
                 appendOperations(row, unitType);
+                row.addEventListener(Events.ON_CLICK, new EventListener() {
+                    @Override
+                    public void onEvent(Event event) throws Exception {
+                        goToEditFormInEditionMode(unitType);
+                    }
+                });
             }
 
             private void appendUnitTypeName(Row row, UnitType unitType) {
@@ -248,11 +255,11 @@ public class UnitTypeController extends GenericForwardComposer {
     private void validateAll() {
         Textbox codeTextBox = (Textbox) editWindow.
             getFellowIfAny("codeTextBox");
-        validate((InputElement) codeTextBox,codeTextBox.getValue());
+        validate(codeTextBox,codeTextBox.getValue());
 
         Textbox measureTextBox = (Textbox) editWindow.
             getFellowIfAny("measureTextBox");
-        validate((InputElement) measureTextBox,measureTextBox.getValue());
+        validate(measureTextBox,measureTextBox.getValue());
     }
 
     /**
diff --git a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
index 65592a80c..87730cf40 100644
--- a/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/_listAdvanceTypes.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Progress Types List')}">
     <newdatasortablegrid id="listing" model="@{controller.advanceTypes}" mold="paging"
-        pageSize="10" fixedLayout="true"
+        pageSize="10" fixedLayout="true" sclass="clickable-rows"
         rowRenderer="@{controller.advanceTypeRenderer}" >
         <columns>
             <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(unitName)"/>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
index f3944440f..9f48961e8 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
@@ -21,14 +21,14 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Cost Categories List')}">
     <newdatasortablegrid id="listing" model="@{controller.costCategories}" mold="paging"
-        pageSize="10">
+        pageSize="10" sclass="clickable-rows">
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('Category name')}" sort="auto(lower(name))" />
             <newdatasortablecolumn label="${i18n:_('Enabled')}" sort="auto(enabled)"/>
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
-            <row self="@{each='costCategory'}" value="@{costCategory}">
+            <row self="@{each='costCategory'}" value="@{costCategory}" onClick="controller.goToEditForm(self.value);">
                 <label value="@{costCategory.name}" />
                 <checkbox checked="@{costCategory.enabled}" disabled="true" />
                 <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
index dc0d9fde1..c101c834f 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listTypesOfWorkHours.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Work Hours Types List')}">
     <newdatasortablegrid id="listing" model="@{controller.typesOfWorkHours}" mold="paging"
-        pageSize="10" fixedLayout="true">
+        pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('Code')}" sort="auto(code)" />
             <newdatasortablecolumn label="${i18n:_('Type name')}" sort="auto(name)" />
@@ -30,7 +30,7 @@
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
-            <row self="@{each='typeOfWorkHours'}" value="@{typeOfWorkHours}">
+            <row self="@{each='typeOfWorkHours'}" value="@{typeOfWorkHours}" onClick="controller.goToEditForm(self.value);">
                 <label value="@{typeOfWorkHours.code}" />
                 <label value="@{typeOfWorkHours.name}" />
                 <label value="@{typeOfWorkHours.defaultPrice}" />
diff --git a/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul b/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
index 182bf73f4..67302dc52 100644
--- a/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/excetiondays/_listExceptionDayTypes.zul
@@ -23,7 +23,7 @@
 
     <newdatasortablegrid id="listExceptionDayTypes"
         model="@{controller.exceptionDayTypes}"
-        mold="paging" pageSize="10"
+        mold="paging" pageSize="10" class="clickable-rows"
         fixedLayout="true">
 
         <columns>
@@ -35,7 +35,7 @@
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='exceptionDayType'}" value="@{exceptionDayType}">
+            <row self="@{each='exceptionDayType'}" value="@{exceptionDayType}" onClick="controller.goToEditForm(self.value)">
                 <label value="@{exceptionDayType.name}" />
                 <label value="@{exceptionDayType.color}" />
                 <label value="@{exceptionDayType.overAssignableStr}" />
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
index e4b8ddc37..9a329bf99 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Companies List')}">
     <newdatasortablegrid id="listing" model="@{controller.companiesDTO}" mold="paging"
-        pageSize="10"
+        pageSize="10" sclass="clickable-rows"
         onInitRender="controller.sortByDefaultByName();">
         <columns sizable="true">
             <newdatasortablecolumn id="columnName" label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="descending"/>
@@ -32,7 +32,7 @@
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
-            <row self="@{each='company'}" value="@{company}">
+            <row self="@{each='company'}" value="@{company}" onClick="controller.goToEditForm(self.value)">
                 <label value="@{company.name}" />
                 <label value="@{company.nif}" />
                 <checkbox checked="@{company.client}" disabled="true" />
diff --git a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
index 170ad918f..1349f5ec4 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
@@ -21,14 +21,14 @@
 
 <window id="${arg.id}" title="${i18n:_('Label Types List')}">
     <newdatasortablegrid id="labelTypes" model="@{controller.labelTypes}"
-        mold="paging" pageSize="10" fixedLayout="true">
+        mold="paging" pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
             <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
             <newdatasortablecolumn label="${i18n:_('Code')}"/>
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='labelType'}" value="@{labelType}">
+            <row self="@{each='labelType'}" value="@{labelType}" onClick="controller.goToEditForm(self.value);">
                 <label value="@{labelType.name}" />
                 <label value="@{labelType.code}" />
                 <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul b/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
index a323f1c54..858ab8e05 100644
--- a/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/materials/_listUnitTypes.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Unit Measures List')}">
     <newdatasortablegrid id="listing" model="@{controller.unitTypes}" mold="paging"
-        pageSize="10" fixedLayout="true"
+        pageSize="10" fixedLayout="true" sclass="clickable-rows"
         rowRenderer="@{controller.unitTypeRenderer}" >
         <columns>
             <newdatasortablecolumn label="${i18n:_('Unit Measure')}"
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul b/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
index 53ea848e0..7709500e2 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/_listQualityForm.zul
@@ -30,7 +30,7 @@
         </hbox>
     </div>
     <separator bar="false" spacing="5px" orient="vertical"/>
-    <grid id="qualityFormsList" model="@{controller.qualityForms}"
+    <grid id="qualityFormsList" model="@{controller.qualityForms}" sclass="clickable-rows"
         mold="paging" pageSize="10" fixedLayout="true">
         <columns>
             <column label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
@@ -38,7 +38,7 @@
             <column label="${i18n:_('Operations')}" width="120px"/>
         </columns>
         <rows>
-            <row self="@{each='qualityForm'}" value="@{qualityForm}">
+            <row self="@{each='qualityForm'}" value="@{qualityForm}" onClick="controller.goToEditForm(self.value)">
                 <label value="@{qualityForm.name}" />
                 <label value="@{qualityForm.description}" />
                 <hbox>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
index afacdfda4..fbf3c357f 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
@@ -37,7 +37,7 @@
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='virtualWorker'}" value="@{virtualWorker}" onDoubleClick="controller.goToEditVirtualWorkerForm(self.value);">
+            <row self="@{each='virtualWorker'}" value="@{virtualWorker}" onClick="controller.goToEditVirtualWorkerForm(self.value);">
                 <label value="@{virtualWorker.firstName}" />
                 <label value="@{virtualWorker.calendar.capacity}" />
                 <label value="@{virtualWorker.observations}" maxlength="40"/>
diff --git a/navalplanner-webapp/src/main/webapp/templates/_list.zul b/navalplanner-webapp/src/main/webapp/templates/_list.zul
index 16ffdb22f..baf0202f2 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_list.zul
@@ -20,7 +20,7 @@
 -->
 <window id="${arg.top_id}" title="${i18n:_('Templates List')}">
     <grid id="listing" model="@{templatesForOrdersController.templates}" mold="paging"
-        pageSize="10" fixedLayout="true">
+        pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
             <column label="${i18n:_('Type')}" sort="auto(type)" />
             <column label="${i18n:_('Code')}" sort="auto(code)" />
@@ -34,7 +34,7 @@
             <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='template'}" value="@{template}">
+            <row self="@{each='template'}" value="@{template}" onClick="templatesForOrdersController.goToEditForm(self.value);">
                 <label value="@{template.type}" />
                 <label value="@{template.code}" />
                 <label value="@{template.name}" />
diff --git a/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul b/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
index 741a4c736..468c25c88 100644
--- a/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_listProfiles.zul
@@ -21,13 +21,13 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Profiles List')}">
     <newdatasortablegrid id="listing" model="@{controller.profiles}" mold="paging"
-        pageSize="10">
+        pageSize="10" sclass="clickable-rows">
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('Profile name')}" sort="auto(profileName)" />
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
-            <row self="@{each='profile'}" value="@{profile}">
+            <row self="@{each='profile'}" value="@{profile}" onClick="controller.goToEditForm(self.value);">
                 <label value="@{profile.profileName}" />
                 <hbox>
                     <button sclass="icono" image="/common/img/ico_editar1.png"
diff --git a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
index 59861dc26..d7d5098ce 100644
--- a/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
+++ b/navalplanner-webapp/src/main/webapp/users/_listUsers.zul
@@ -21,7 +21,7 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Users List')}">
     <newdatasortablegrid id="listing" model="@{controller.users}" mold="paging"
-        pageSize="10">
+        pageSize="10" sclass="clickable-rows">
         <columns sizable="true">
             <newdatasortablecolumn label="${i18n:_('User login name')}" sort="auto(loginName)" />
             <newdatasortablecolumn label="${i18n:_('Disabled')}" />
@@ -29,7 +29,7 @@
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
         <rows>
-            <row self="@{each='user'}" value="@{user}">
+            <row self="@{each='user'}" value="@{user}" onClick="controller.goToEditForm(self.value);">
                 <label value="@{user.loginName}" />
                 <checkbox checked="@{user.disabled}" disabled="true" />
                 <checkbox checked="@{user.administrator}" disabled="true" />
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
index 2ad1508c7..e2c920fd4 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
@@ -21,14 +21,14 @@
 
 <window id="${arg.top_id}" title="${i18n:_('Work Report Models')}">
     <grid id="listing" mold="paging" pageSize="10"
-        model="@{controller.workReportTypes}"
+        model="@{controller.workReportTypes}" sclass="clickable-rows"
         onInitRender ="controller.sortWorkReportTypes();">
         <columns>
             <column id="workReportTypeName" label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="descending"/>
             <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='workReportType'}" value="@{workReportType}">
+            <row self="@{each='workReportType'}" value="@{workReportType}" onClick="controller.goToEditNewWorkReportForm(self.value);">
                 <label value="@{workReportType.name}" />
                 <hbox>
 
diff --git a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
index 6cb10567f..a85741547 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/workReport.zul
@@ -56,7 +56,7 @@
                 </div>
                 <separator bar="false" spacing="20px" orient="horizontal"/>
                 <grid id="listing"  mold="paging" pageSize="10"
-                model="@{controller.workReportDTOs}"
+                model="@{controller.workReportDTOs}" sclass="clickable-rows"
                 onInitRender ="controller.sortWorkReports();">
                 <columns sizable="true">
                     <column id="columnDateStart" label="${i18n:_('Date Start')}" sort="auto(dateStart, dateFinish)" sortDirection="ascending"/>
@@ -66,7 +66,7 @@
                     <column label="${i18n:_('Actions')}" />
                 </columns>
                 <rows>
-                    <row self="@{each='workReportDTO'}" value="@{workReportDTO}">
+                    <row self="@{each='workReportDTO'}" value="@{workReportDTO}" onClick="controller.goToEditForm(self.value);">
                         <label value="@{workReportDTO.dateStart, converter='org.navalplanner.web.common.typeconverters.DateConverter'}" />
                         <label value="@{workReportDTO.dateFinish, converter='org.navalplanner.web.common.typeconverters.DateConverter'}"/>
                         <label value="@{workReportDTO.type}" />