From c1364d4cccd7a0534b3f08a255299a6a73a6d7ac Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 24 Aug 2010 11:33:55 +0200
Subject: [PATCH] Making grid shortable columns case-insensitive

FEA: ItEr60S16AdaptacionsPantallasNavalPlan
---
 .../src/main/webapp/costcategories/_listCostCategories.zul  | 2 +-
 .../webapp/externalcompanies/_listExternalCompanies.zul     | 2 +-
 .../src/main/webapp/labels/_editLabelType.zul               | 2 +-
 .../src/main/webapp/labels/_listLabelTypes.zul              | 2 +-
 .../webapp/limitingresources/limitingResourcesLayout.zul    | 4 ++--
 navalplanner-webapp/src/main/webapp/orders/_list.zul        | 6 +++---
 .../webapp/orders/_listHoursGroupCriterionRequirement.zul   | 2 +-
 .../webapp/orders/_listOrderElementTaskQualityForms.zul     | 2 +-
 .../webapp/orders/components/_listOrderElementLabels.zul    | 2 +-
 .../src/main/webapp/resources/criterions/_list.zul          | 2 +-
 .../src/main/webapp/resources/criterions/_workers.zul       | 4 ++--
 .../src/main/webapp/resources/machine/_listMachines.zul     | 6 +++---
 .../src/main/webapp/resources/worker/_criterions.zul        | 2 +-
 .../src/main/webapp/resources/worker/_list.zul              | 5 +++--
 .../main/webapp/resources/worker/_listVirtualWorkers.zul    | 2 +-
 .../src/main/webapp/templates/_assignedQualityForms.zul     | 2 +-
 .../src/main/webapp/workreports/_editWorkReportType.zul     | 4 ++--
 .../src/main/webapp/workreports/_listWorkReportTypes.zul    | 2 +-
 18 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
index a906c5e5c..7e8c84cf8 100644
--- a/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
+++ b/navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
@@ -22,7 +22,7 @@
     <newdatasortablegrid id="listing" model="@{controller.costCategories}" mold="paging"
         pageSize="10">
         <columns sizable="true">
-            <newdatasortablecolumn label="${i18n:_('Category name')}" sort="auto(name)" />
+            <newdatasortablecolumn label="${i18n:_('Category name')}" sort="auto(lower(name))" />
             <newdatasortablecolumn label="${i18n:_('Enabled')}" sort="auto(enabled)"/>
             <newdatasortablecolumn label="${i18n:_('Actions')}" />
         </columns>
diff --git a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
index af3ad1982..db8cfb11a 100644
--- a/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
+++ b/navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
@@ -22,7 +22,7 @@
     <newdatasortablegrid id="listing" model="@{controller.companies}" mold="paging"
         pageSize="10">
         <columns sizable="true">
-            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)" />
+            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" />
             <newdatasortablecolumn label="${i18n:_('NIF')}" />
             <newdatasortablecolumn label="${i18n:_('Client')}" />
             <newdatasortablecolumn label="${i18n:_('Subcontractor')}" />
diff --git a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
index b433cf552..21c6b601c 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
@@ -70,7 +70,7 @@
                             model="@{controller.labels}" fixedLayout="true">
                             <columns sizable="true">
                                 <column label="${i18n:_('Name')}" width="400px"
-                                    sort="auto(name)" sortDirection="ascending" />
+                                    sort="auto(lower(name))" sortDirection="ascending" />
                                 <column label="${i18n:_('Code')}" width="400px" />
                                 <column label="${i18n:_('Operations')}" width="100px" />
                             </columns>
diff --git a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
index ccba7af5d..4ad9bdaf1 100644
--- a/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
@@ -22,7 +22,7 @@
     <newdatasortablegrid id="labelTypes" model="@{controller.labelTypes}"
         mold="paging" pageSize="10" fixedLayout="true">
         <columns>
-            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)" sortDirection="ascending" />
+            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
             <newdatasortablecolumn label="${i18n:_('Code')}"/>
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
diff --git a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
index 74c278ba4..4563f224c 100644
--- a/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
+++ b/navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
@@ -130,8 +130,8 @@
                                     tooltiptext="Select/deselect all"/>
                             </hbox>
                         </newdatasortablecolumn>
-                        <newdatasortablecolumn label="${i18n:_('Order')}" sort="auto(orderName)"/>
-                        <newdatasortablecolumn label="${i18n:_('Task')}" sort="auto(taskName)"/>
+                        <newdatasortablecolumn label="${i18n:_('Order')}" sort="auto(lower(orderName))"/>
+                        <newdatasortablecolumn label="${i18n:_('Task')}" sort="auto(lower(taskName))"/>
                         <newdatasortablecolumn label="${i18n:_('Resource / Criteria')}" sort="auto(resourceOrCriteria)"/>
                         <newdatasortablecolumn label="${i18n:_('Earlier starting date')}" sort="auto(date)"/>
                         <newdatasortablecolumn label="${i18n:_('Hours to allocate')}" sort="auto(hoursToAllocate)"/>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index a18774580..f8046840a 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -24,11 +24,11 @@
         rowRenderer= "@{controller.ordersRowRender}"
         onInitRender ="controller.sortOrders();" sclass="clickable-rows">
         <columns>
-            <column label="${i18n:_('Name')}" align="center" sort="auto(name)"/>
-            <column label="${i18n:_('Code')}" align="center" sort="auto(code)"/>
+            <column label="${i18n:_('Name')}" align="center" sort="auto(lower(name))"/>
+            <column label="${i18n:_('Code')}" align="center" sort="auto(lower(code))"/>
             <column id="columnDateStart" label="${i18n:_('Starting date')}" align="center" sort="auto(initDate,deadline)" sortDirection="ascending"/>
             <column label="${i18n:_('Deadline')}" align="center" sort="auto(deadline,initDate)" />
-            <column label="${i18n:_('Customer')}" align="center" sort="auto(customer)" />
+            <column label="${i18n:_('Customer')}" align="center" sort="auto(lower(customer))" />
             <column label="${i18n:_('Customer reference')}" align="center"/>
             <column label="${i18n:_('Total Budget')}" align="center"/>
             <column label="${i18n:_('Total Hours')}" align="center"/>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul b/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
index 9f828bb7c..055bf8678 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
@@ -23,7 +23,7 @@
     <newdatasortablegrid mold="paging" pageSize="5" fixedLayout="true"
             model="@{hoursGroupWrapper.criterionRequirementWrappersView}">
             <columns>
-                <newdatasortablecolumn label="${i18n:_('Criterion name')}" sort="auto(criterionAndType)" sortDirection="ascending"/>
+                <newdatasortablecolumn label="${i18n:_('Criterion name')}" sort="auto(lower(criterionAndType))" sortDirection="ascending"/>
                 <newdatasortablecolumn label="${i18n:_('Type')}" sort="auto(type)" width="120px" align="center"/>
                 <newdatasortablecolumn label="${i18n:_('Operations')}" width="90px" align="center"/>
             </columns>
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
index 6fb82a667..9b8d6528d 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
@@ -43,7 +43,7 @@
                     onInitRender ="assignedTaskQualityFormsController.sortTaskQualityForms();">
                     <columns>
                         <column width="25px"/>
-                        <column label="${i18n:_('Task quality form name')}" sort="auto(qualityForm.name)" sortDirection="descending"/>
+                        <column label="${i18n:_('Task quality form name')}" sort="auto(lower(qualityForm.name))" sortDirection="descending"/>
                         <column label="${i18n:_('Type')}" />
                         <column label="${i18n:_('Report advance')}" />
                         <column label="${i18n:_('Operations')}" />
diff --git a/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
index 3bcbd62bf..8cb21080c 100644
--- a/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
@@ -51,7 +51,7 @@
                 <newdatasortablegrid id="directLabels" height="200px" fixedLayout="true"
                     model="@{assignedLabelsController.labels}">
                     <columns>
-                        <newdatasortablecolumn label="${i18n:_('Label type')}" sort="auto(type.name)"/>
+                        <newdatasortablecolumn label="${i18n:_('Label type')}" sort="auto(lower(type.name))"/>
                         <newdatasortablecolumn label="${i18n:_('Value')}" />
                         <newdatasortablecolumn label="${i18n:_('Operations')}" />
                     </columns>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
index 26adabfbc..a64695a45 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
@@ -21,7 +21,7 @@
 <window id="listing" title="${i18n:_('Criterion Type List')}">
 <newdatasortablegrid model="@{controller.criterionTypes}" fixedLayout="true">
    <columns>
-        <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)"/>
+        <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))"/>
         <newdatasortablecolumn label="${i18n:_('Code')}"/>
         <newdatasortablecolumn width="60px" label="${i18n:_('Enabled')}"/>
         <newdatasortablecolumn width="200px" label="${i18n:_('Operations')}"/>
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
index 6781fdca4..98c39db1b 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
@@ -23,8 +23,8 @@
   mold="paging" pageSize="10" apply="${controller.workers}">
   <columns>
    <column label="${i18n:_('Operations')}" />
-   <column label="${i18n:_('Name')}" sort="auto(firstName)" />
-   <column label="${i18n:_('Surname')}" sort="auto(surname)" />
+   <column label="${i18n:_('Name')}" sort="auto(lower(firstName))" />
+   <column label="${i18n:_('Surname')}" sort="auto(lower(surname))" />
    <column label="${i18n:_('NIF')}" sort="auto(nif)" />
   </columns>
   <rows>
diff --git a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
index 61775858a..8a95003eb 100644
--- a/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
@@ -30,9 +30,9 @@
     <grid id="listing" model="@{controller.machines}" mold="paging"
         pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
-            <column label="${i18n:_('Code')}" sort="auto(code)" />
-            <column label="${i18n:_('Name')}" sort="auto(name)" />
-            <column label="${i18n:_('Description')}" sort="auto(description)" />
+            <column label="${i18n:_('Code')}" sort="auto(lower(code))" />
+            <column label="${i18n:_('Name')}" sort="auto(lower(name))" />
+            <column label="${i18n:_('Description')}" sort="auto(lower(description))" />
             <column label="${i18n:_('Limiting resource')}" sort="auto(limitingResource)" />
             <column label="${i18n:_('Operations')}" />
         </columns>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul
index 28bc4af96..bf0c32277 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul
@@ -34,7 +34,7 @@
         <newdatasortablegrid id="listingCriterions" mold="paging" pageSize="10" fixedLayout="true"
             model="@{assignedCriterionsController.criterionSatisfactionDTOs}">
             <columns>
-                <newdatasortablecolumn label="${i18n:_('Criterion name')}" sort="auto(criterionAndType)" sortDirection="ascending"/>
+                <newdatasortablecolumn label="${i18n:_('Criterion name')}" sort="auto(lower(criterionAndType))" sortDirection="ascending"/>
                 <newdatasortablecolumn label="${i18n:_('Starting date')}" sort="auto(startDate)" width="200px" align="center"/>
                 <newdatasortablecolumn label="${i18n:_('Ending date')}" sort="auto(endDate)" width="200px" align="center"/>
                 <newdatasortablecolumn label="${i18n:_('State')}" sort="auto(state)" width="70px" align="center"/>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
index 37914f0be..ae81c879d 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
@@ -29,8 +29,8 @@
     <newdatasortablegrid id="listing" model="@{controller.realWorkers}" mold="paging"
         pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
-            <newdatasortablecolumn label="${i18n:_('First name')}" sort="auto(firstName)"/>
-            <newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(surname)" />
+            <newdatasortablecolumn label="${i18n:_('First name')}" sort="auto(lower(firstName))"/>
+            <newdatasortablecolumn label="${i18n:_('Surname')}" sort="auto(lower(surname))" />
             <newdatasortablecolumn label="${i18n:_('NIF')}" sort="auto(nif)" />
             <newdatasortablecolumn label="${i18n:_('Code')}"/>
             <newdatasortablecolumn label="${i18n:_('Limiting resource')}" sort="auto(limitingResource)" />
@@ -58,6 +58,7 @@
             </row>
         </rows>
     </newdatasortablegrid>
+
     <button id="show_create_form" onClick="controller.goToCreateForm();"
         label="${i18n:_('Create')}" sclass="create-button global-action">
     </button>
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
index aec1e0119..974fb3207 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
@@ -29,7 +29,7 @@
     <newdatasortablegrid id="listing" model="@{controller.virtualWorkers}" mold="paging"
         pageSize="10" fixedLayout="true" sclass="clickable-rows">
         <columns>
-            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(name)"/>
+            <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))"/>
             <newdatasortablecolumn label="${i18n:_('Capacity')}" sort="auto(capacity)" />
             <newdatasortablecolumn label="${i18n:_('Observations')}" sort="auto(observations)" />
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
diff --git a/navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul b/navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul
index 1c2af4623..9bc4244c9 100644
--- a/navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul
+++ b/navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul
@@ -44,7 +44,7 @@
                     model="@{assignedQualityForms.assigned}">
                     <columns>
                         <column width="25px"/>
-                        <column label="${i18n:_('Name name')}" sort="auto(name)" sortDirection="descending"/>
+                        <column label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="descending"/>
                         <column label="${i18n:_('Type')}" />
                         <column label="${i18n:_('Operations')}" />
                     </columns>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
index 54e811054..2ea6c7bd5 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
@@ -122,7 +122,7 @@
                 <newdatasortablegrid id="listDescriptionFields" mold="paging" pageSize="4" fixedLayout="true"
                     model="@{controller.descriptionFields}" rowRenderer= "@{controller.descriptionFieldsRowRender}">
                     <columns>
-                      <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(fieldName)" sortDirection="ascending"/>
+                      <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(fieldName))" sortDirection="ascending"/>
                       <newdatasortablecolumn label="${i18n:_('Length')}" width="200px" align="center"/>
                       <newdatasortablecolumn label="${i18n:_('Position')}" width="200px" align="center"/>
                       <newdatasortablecolumn visible = "@{controller.editable}" label="${i18n:_('Operations')}" width="150px" align="center"/>
@@ -146,7 +146,7 @@
                 <newdatasortablegrid id="listWorkReportLabelTypeAssigments" mold="paging" pageSize="4" fixedLayout="true"
                     model="@{controller.workReportLabelTypeAssigments}" rowRenderer= "@{controller.workReportLabelTypeAssigmentRowRender}">
                     <columns>
-                      <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(labelType.name)" sortDirection="ascending"/>
+                      <newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(labelType.name))" sortDirection="ascending"/>
                       <newdatasortablecolumn label="${i18n:_('Position')}" width="200px" align="center"/>
                       <newdatasortablecolumn label="${i18n:_('Default Label')}" width="200px" align="center"/>
                       <newdatasortablecolumn visible = "@{controller.editable}" label="${i18n:_('Operations')}" width="150px" align="center"/>
diff --git a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
index e8115a544..00cf7dd73 100644
--- a/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
@@ -23,7 +23,7 @@
         model="@{controller.workReportTypes}"
         onInitRender ="controller.sortWorkReportTypes();">
         <columns>
-            <column id="workReportTypeName" label="${i18n:_('Name')}" sort="auto(name)" sortDirection="descending"/>
+            <column id="workReportTypeName" label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="descending"/>
             <column label="${i18n:_('Operations')}" />
         </columns>
         <rows>