RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Making grid shortable columns case-insensitive

Browse source 
FEA: ItEr60S16AdaptacionsPantallasNavalPlan
This commit is contained in:
Lorenzo Tilve 2010-08-24 11:33:55 +02:00
parent 090074194c
commit c1364d4ccc
18 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/webapp/costcategories/_listCostCategories.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
View file

@ -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')}" />

2
navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul
View file

@ -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>

4
navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
View file

@ -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)"/>

6
navalplanner-webapp/src/main/webapp/orders/_list.zul
View file

@ -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"/>

2
navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
View file

@ -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')}" />

2
navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/resources/criterions/_list.zul
View file

@ -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')}"/>

4
navalplanner-webapp/src/main/webapp/resources/criterions/_workers.zul
View file

@ -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>

6
navalplanner-webapp/src/main/webapp/resources/machine/_listMachines.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul
View file

@ -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"/>

5
navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
View file

@ -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>

2
navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul
View file

@ -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')}" />

2
navalplanner-webapp/src/main/webapp/templates/_assignedQualityForms.zul
View file

@ -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>

4
navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
View file

@ -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"/>

2
navalplanner-webapp/src/main/webapp/workreports/_listWorkReportTypes.zul
View file

@ -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>