Changeset 589

Timestamp:

Jun 9, 2010, 12:51:59 PM (15 years ago)

Author:

gav

Message:

Improvements to task search filter pane.

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (3 diffs)
• views/taskDetailed/searchCalendar.gsp (modified) (1 diff)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -234 +234 @@
         if(isFilterApplied) {
             // filterPane:
+            params.sort = params.sort ?: "id"
+            params.order = params.order ?: "desc"
             if(params.sort == "attentionFlag") // See ticket #64 in Trac.
                 params.sort = "id"
@@ -298 +300 @@
         filterParams.max = params.max
         filterParams.offset = params.offset?.toInteger() ?: 0
+        filterParams.sort = params.sort ?: "id"
+        filterParams.order = params.order ?: "desc"
+
+        // Get some associatedProperty values for filterpane.
+        def associatedPropertyValues = [:]
+        def associatedPropertyMax = 10000
+        associatedPropertyValues.taskPriorityList = TaskPriority.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        def lastNameQuery = 'select distinct p.lastName from Person p where p.isActive = ? order by p.lastName'
+        associatedPropertyValues.lastNameList = Person.executeQuery(lastNameQuery, [true], [max:associatedPropertyMax])
+        def firstNameQuery = 'select distinct p.firstName from Person p where p.isActive = ? order by p.firstName'
+        associatedPropertyValues.firstNameList = Person.executeQuery(firstNameQuery, [true], [max:associatedPropertyMax])
+        associatedPropertyValues.taskGroupList = TaskGroup.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.assetList = Asset.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.taskStatusList = TaskStatus.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        associatedPropertyValues.taskTypeList = TaskType.findAllByIsActive(true, [max:associatedPropertyMax, sort:'name'])
+        def startOfYearRange = dateUtilService.getYearFromDate(dateUtilService.plusYear(new Date(), -10))
+        def endOfYearRange = dateUtilService.getYearFromDate(dateUtilService.plusYear(new Date(), 10))
+        associatedPropertyValues.yearRange = startOfYearRange..endOfYearRange
 
         return[taskInstanceList: taskInstanceList,
@@ -303 +323 @@
                         filterParams: filterParams,
                         params: params,
+                        associatedPropertyValues: associatedPropertyValues,
                         showDate: showDate,
                         today: calendarMonthControls.today,

trunk/grails-app/views/taskDetailed/searchCalendar.gsp

@@ -115 +115 @@
                                     class="overlayPane"
                                     additionalProperties="id"
-                                    excludeProperties="trash, comment, targetCompletionDate"
-                                    associatedProperties="leadPerson.lastName, leadPerson.firstName, taskPriority.name"
-                                    filterPropertyValues="${['taskPriority.name':[values:TaskPriority.list()],
-                                                                                'leadPerson.lastName':[values:Person.executeQuery('select t.lastName from Person t')],
-                                                                                'leadPerson.firstName':[values:Person.executeQuery('select distinct t.firstName from Person t')],
-                                                                                targetStartDate:[years:2020..2000,precision:'day']]}"/>
+                                    excludeProperties="trash, targetCompletionDate"
+                                    associatedProperties="taskPriority.name,
+                                                                                leadPerson.lastName,
+                                                                                leadPerson.firstName,
+                                                                                taskGroup.name,
+                                                                                associatedAssets.name,
+                                                                                primaryAsset.name,
+                                                                                taskStatus.name,
+                                                                                taskType.name"
+                                    filterPropertyValues="${['taskPriority.name':[values: associatedPropertyValues.taskPriorityList],
+                                                                                'leadPerson.lastName':[values: associatedPropertyValues.lastNameList],
+                                                                                'leadPerson.firstName':[values: associatedPropertyValues.firstNameList],
+                                                                                'taskGroup.name':[values: associatedPropertyValues.taskGroupList],
+                                                                                'associatedAssets.name':[values: associatedPropertyValues.assetList],
+                                                                                'primaryAsset.name':[values: associatedPropertyValues.assetList],
+                                                                                'taskStatus.name':[values: associatedPropertyValues.taskStatusList],
+                                                                                'taskType.name':[values: associatedPropertyValues.taskTypeList],
+                                                                                targetCompletionDate:[years: associatedPropertyValues.yearRange,precision:'day'],
+                                                                                targetStartDate:[years: associatedPropertyValues.yearRange,precision:'day']
+                                                                                ]}"/>
 
             <g:render template="quickSearchPane" />