Changeset 552 for trunk/grails-app/controllers

Timestamp:

May 31, 2010, 1:29:04 PM (15 years ago)

Author:

gav

Message:

Get Task Search filterpane associatedPropertyValues in controller instead of in gsp.
Sort and only get active items for associatedPropertyValues.
Small refator of DateUtilService with new plusYear().

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (2 diffs)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -149 +149 @@
         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,
                         taskInstanceTotal: taskInstanceTotal,
                         filterParams: filterParams,
-                        params: params ]
+                        params: params,
+                        associatedPropertyValues: associatedPropertyValues]
 
     } // search
@@ -800 +817 @@
         result.previousMonth.year = dateUtilService.getYearFromDate(result.previousMonth.date)
         result.nextYear = [:]
-        result.nextYear.date = dateUtilService.getNextYear(showDate)
+        result.nextYear.date = dateUtilService.plusYear(showDate)
         result.nextYear.month = dateUtilService.getMonthFromDate(result.nextYear.date)
         result.nextYear.year = dateUtilService.getYearFromDate(result.nextYear.date)
         result.previousYear = [:]
-        result.previousYear.date = dateUtilService.getPreviousYear(showDate)
+        result.previousYear.date = dateUtilService.plusYear(showDate, -1)
         result.previousYear.month = dateUtilService.getMonthFromDate(result.previousYear.date)
         result.previousYear.year = dateUtilService.getYearFromDate(result.previousYear.date)