Changeset 476 for trunk/grails-app/controllers/TaskDetailedController.groovy

Timestamp:

04/07/10 13:49:22 (3 years ago)

Author:

gav

Message:

Improve task search and calendar logic.
Move task quick search links to a template.
Set targetCompletionDate when creating task from calendar.
Remove task budget action and view, functionality moved to task search.
Customise calendar css.

Files:

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

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -2 +2 @@
 import org.codehaus.groovy.grails.commons.ConfigurationHolder
 import com.zeddware.grails.plugins.filterpane.FilterUtils
+import org.springframework.web.servlet.support.RequestContextUtils as RCU
 
 @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager'])
@@ -35 +36 @@
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
+    def setSearchCalendarParamsMax = {
+        def max = 1000
+        if(params.newMax.isInteger()) {
+            def i = params.newMax.toInteger()
+            if(i > 0 && i <= max)
+                session.taskSearchCalendarParamsMax = params.newMax
+            if(i > max)
+                session.taskSearchCalendarParamsMax = max
+        }
+        forward(action: 'searchCalendar', params: params)
+    }
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
     def search = {
 
@@ -41 +55 @@
 
         // Protect filterPane.
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  1000 )
+        params.max = Math.min( params.max ? params.max.toInteger() : 20,  1000 )
 
         def taskInstanceList = []
         def taskInstanceTotal
-        def filterParams = [:]
-        def personInstance = authService.currentUser
-
-        // Quick Search:
-        if(!FilterUtils.isFilterApplied(params)) {
-
-            if(params.quickSearch == "searchMyTodays") {
-                taskInstanceList = taskSearchService.getMyTodays(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks for ${personInstance.firstName} ${personInstance.lastName}." }
-                else { params.message = "No tasks found for today." }
-            }
-            else if(params.quickSearch == "searchInTheLastWeek") {
-                taskInstanceList = taskSearchService.getInTheLastWeek(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Tasks with Target Start Date in the last week." }
-                else { params.message = "No tasks found for the last week." }
-            }
-            else if(params.quickSearch == "searchMyInTheLastWeek") {
-                taskInstanceList = taskSearchService.getMyInTheLastWeek(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Tasks with Target Start Date in the last week for ${personInstance.firstName} ${personInstance.lastName}." }
-                else { params.message = "No tasks found for the last week." }
-            }
-            else {
-                //Default:
-                taskInstanceList = taskSearchService.getTodays(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks." }
-                else { params.message = "No tasks found for today." }
-                params.quickSearch = "searchTodays"
-            }
-
-            taskInstanceTotal = taskInstanceList.totalCount
-            filterParams.quickSearch = params.quickSearch
-        }
-        else {
+        def filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+        def isFilterApplied = FilterUtils.isFilterApplied(params)
+
+        // Restore search unless a new search is being requested.
+        if(!params.quickSearch && !filterParams) {
+            if(session.taskSearchQuickSearch)
+                params.quickSearch = session.taskSearchQuickSearch
+            else if(session.taskSearchFilterParams) {
+                session.taskSearchFilterParams.each() { params[it.key] = it.value }
+                params.filter = session.taskSearchFilter
+                isFilterApplied = FilterUtils.isFilterApplied(params)
+            }
+        }
+
+        if(isFilterApplied) {
             // filterPane:
             taskInstanceList = filterService.filter( params, Task )
             taskInstanceTotal = filterService.count( params, Task )
             filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+            // Remember search.
+            session.taskSearchFilterParams = new LinkedHashMap(filterParams)
+            session.taskSearchFilter = new LinkedHashMap(params.filter)
+            session.taskSearchQuickSearch = null
+        }
+        else {
+            // Quick Search:
+            if(!params.quickSearch) params.quickSearch = "myTodays"
+            def result = taskSearchService.getQuickSearch(params, RCU.getLocale(request))
+            taskInstanceList = result.taskInstanceList
+            taskInstanceTotal = result.taskInstanceList.totalCount
+            params.message = result.message
+            filterParams.quickSearch = result.quickSearch
+            // Remember search.
+            session.taskSearchFilterParams = null
+            session.taskSearchFilter = null
+            session.taskSearchQuickSearch = result.quickSearch
         }
 
@@ -93 +106 @@
             String title
             if(params.quickSearch)
-                title = "${params.quickSearch} tasks."
+                title = params.message
             else
                 title = "Filtered tasks."
@@ -116 +129 @@
 
         return[ taskInstanceList: taskInstanceList,
-                taskInstanceTotal: taskInstanceTotal,
-                filterParams: filterParams ]
-
-    } // end search()
+                        taskInstanceTotal: taskInstanceTotal,
+                        filterParams: filterParams,
+                        params: params ]
+
+    } // search
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
     def searchCalendar = {
 
-        if(session.taskSearchParamsMax)
-            params.max = session.taskSearchParamsMax
+        // No pagination for calendar.
+        params.offset = 0
+
+        // Restore params.max
+        if(session.taskSearchCalendarParamsMax)
+            params.max = session.taskSearchCalendarParamsMax
 
         // Protect filterPane.
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-
-        // Set the month to show.
-        def showMonth = new Date()
-        if(session.taskSearchCalendarShowMonth)
-            showMonth = session.taskSearchCalendarShowMonth
-
-        if(params.nextMonth)
-            showMonth = dateUtilService.getNextMonth(showMonth)
-        else if(params.previousMonth)
-            showMonth = dateUtilService.getPreviousMonth(showMonth)
-        session.taskSearchCalendarShowMonth = showMonth
-
-        // Quick Search:
-        if(!FilterUtils.isFilterApplied(params)) {
-            def taskInstanceList = []
-            def personInstance = authService.currentUser
-
-            if(params.quickSearch == "searchMyTodays") {
-                taskInstanceList = taskSearchService.getMyTodays(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks for ${personInstance.firstName} ${personInstance.lastName}." }
-                else { params.message = "No tasks found for today." }
-                if(taskInstanceList.totalCount > params.max) { params.message = "Too many results, only the first ${params.max} shown" }
-            }
-            else if(params.quickSearch == "searchInTheLastWeek") {
-                taskInstanceList = taskSearchService.getInTheLastWeek(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Tasks with Target Start Date in the last week." }
-                else { params.message = "No tasks found for the last week." }
-                if(taskInstanceList.totalCount > params.max) { params.message = "Too many results, only the first ${params.max} shown" }
-            }
-            else if(params.quickSearch == "searchMyInTheLastWeek") {
-                taskInstanceList = taskSearchService.getMyInTheLastWeek(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Tasks with Target Start Date in the last week for ${personInstance.firstName} ${personInstance.lastName}." }
-                else { params.message = "No tasks found for the last week." }
-                if(taskInstanceList.totalCount > params.max) { params.message = "Too many results, only the first ${params.max} shown" }
-            }
-            else {
-                //Default:
-                taskInstanceList = taskSearchService.getTodays(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks." }
-                else { params.message = "No tasks found for today." }
-                if(taskInstanceList.totalCount > params.max) { params.message = "Too many results, only the first ${params.max} shown" }
-                params.quickSearch = "searchTodays"
-            }
-            return[taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount, showMonth: showMonth, filterParams: params]
-        }
-        // filterPane:
-        def taskInstanceTotal = filterService.count( params, Task )
-        if(taskInstanceTotal > params.max) { params.message = "Too many results, only the first ${params.max} shown" }
-        return[ taskInstanceList: filterService.filter( params, Task ),
-            taskInstanceTotal: taskInstanceTotal,
-            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
-            showMonth: showMonth,
-            params:params ]
-    }
-
-    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
-    def budget = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
-
-        // Quick Search:
-        if(!FilterUtils.isFilterApplied(params)) {
-            def taskInstanceList = []
-            def personInstance = authService.currentUser
-
-            if(params.quickSearch == "budgetUnplanned") {
-                taskInstanceList = taskSearchService.getBudgetUnplanned(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Budget unplanned tasks in the last week." }
-                else { params.message = "No tasks found." }
-            }
-            //else if(params.quickSearch == "budgetPlanned") {
-            else {
-                //Default:
-                taskInstanceList = taskSearchService.getBudgetPlanned(params)
-                if(taskInstanceList.totalCount > 0) { params.message = "Budget planned Tasks in the last week." }
-                else { params.message = "No tasks found.." }
-            }
-            // export plugin:
-            if(params?.format && params.format != "html") {
-
-                def dateFmt = { date ->
-                    formatDate(format: "EEE, dd-MMM-yyyy", date: date)
-                }
-                response.contentType = ConfigurationHolder.config.grails.mime.types[params.format]
-                response.setHeader("Content-disposition", "attachment; filename=tasks.${params.extension}")
-                List fields = ["id", "targetStartDate", "description", "leadPerson", "taskStatus", "taskType"]
-                Map labels = ["id": "ID", "targetStartDate": "Target Start Date", "description": "Description",
-                                        "leadPerson": "Lead Person", "taskStatus": "Task Status", "taskType": "Task Type"]
-                Map formatters = [ targetStartDate: dateFmt]
-                String title = "${params.quickSearch} tasks in the last week."
-                Map parameters = [title: title, separator: ","]
-
-                exportService.export(params.format, response.outputStream, taskInstanceList, fields, labels, formatters, parameters) 
-            }
-            return[taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount, filterParams: params]
-        }
-        // filterPane:
-        return[ taskInstanceList: filterService.filter( params, Task ),
-            taskInstanceTotal: filterService.count( params, Task ),
-            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
-            params:params ]
-    }
+        params.max = Math.min( params.max ? params.max.toInteger() : 100,  1000 )
+
+        def taskInstanceList = []
+        def taskInstanceTotal
+        def filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+        def isFilterApplied = FilterUtils.isFilterApplied(params)
+
+        // Restore search unless a new search is being requested.
+        if(!params.quickSearch && !filterParams) {
+            if(session.taskSearchCalendarQuickSearch)
+                params.quickSearch = session.taskSearchCalendarQuickSearch
+            else if(session.taskSearchCalendarFilterParams) {
+                session.taskSearchCalendarFilterParams.each() { params[it.key] = it.value }
+                params.filter = session.taskSearchCalendarFilter
+                isFilterApplied = FilterUtils.isFilterApplied(params)
+            }
+        }
+
+        // The date the calendar will use to determine the month to show.
+        // Use session, if not specified in params, otherwise use today.
+        def showDate = new Date()
+        if(params.showMonth) {
+            if(params.showYear)
+                showDate = dateUtilService.makeDate(params.showYear, params.showMonth)
+            else
+                showDate = dateUtilService.makeDate(dateUtilService.getYearFromDate(showDate), params.showMonth)
+            // Remember the showDate.
+            session.taskSearchCalendarShowDate = showDate
+        }
+        else if(session.taskSearchCalendarShowDate)
+            showDate = session.taskSearchCalendarShowDate
+
+        // Get the dates for the calendar month controls.
+        def calendarMonthControls = getCalendarMonthControls(showDate)
+
+        if(isFilterApplied) {
+            // filterPane:
+            taskInstanceList = filterService.filter( params, Task )
+            taskInstanceTotal = filterService.count( params, Task )
+            filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+            // Remember search.
+            session.taskSearchCalendarFilterParams = new LinkedHashMap(filterParams)
+            session.taskSearchCalendarFilter = new LinkedHashMap(params.filter)
+            session.taskSearchCalendarQuickSearch = null
+        }
+        else {
+            // Quick Search:
+            def result = taskSearchService.getQuickSearch(params, RCU.getLocale(request))
+            taskInstanceList = result.taskInstanceList
+            taskInstanceTotal = result.taskInstanceList.totalCount
+            params.message = result.message
+            filterParams.quickSearch = result.quickSearch
+            // Remember search.
+            session.taskSearchCalendarFilterParams = null
+            session.taskSearchCalendarFilter = null
+            session.taskSearchCalendarQuickSearch = result.quickSearch
+        }
+
+        // export plugin:
+        if(params?.format && params.format != "html") {
+
+            def dateFmt = { date ->
+                formatDate(format: "EEE, dd-MMM-yyyy", date: date)
+            }
+
+            String title
+            if(params.quickSearch)
+                title = params.message
+            else
+                title = "Filtered tasks."
+
+            response.contentType = ConfigurationHolder.config.grails.mime.types[params.format]
+            response.setHeader("Content-disposition", "attachment; filename=Tasks.${params.extension}")
+            List fields = ["id", "targetStartDate", "description", "leadPerson", "taskPriority", "taskType", "taskStatus"]
+            Map labels = ["id": "ID", "targetStartDate": "Target Start Date", "description": "Description",
+                                    "leadPerson": "Lead Person", "taskPriority": "Task Priority",
+                                    "taskType": "Task Type", "taskStatus": "Task Status"]
+            Map formatters = [ targetStartDate: dateFmt]
+            Map parameters = [title: title, separator: ","]
+
+            exportService.export(params.format, response.outputStream, taskInstanceList, fields, labels, formatters, parameters)
+        }
+
+        if(taskInstanceTotal > params.max)
+            params.errorMessage = g.message(code:"task.search.calendar.text.too.many.results", args:[params.max])
+
+        // Add some basic params to filterParams.
+        filterParams.max = params.max
+        filterParams.offset = params.offset?.toInteger() ?: 0
+
+        return[taskInstanceList: taskInstanceList,
+                        taskInstanceTotal: taskInstanceTotal,
+                        filterParams: filterParams,
+                        params: params,
+                        showDate: showDate,
+                        today: calendarMonthControls.today,
+                        previousMonth: calendarMonthControls.previousMonth,
+                        nextMonth: calendarMonthControls.nextMonth,
+                        previousYear: calendarMonthControls.previousYear,
+                        nextYear: calendarMonthControls.nextYear]
+
+    } // searchCalendar
 
     @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_TaskManager', 'ROLE_TaskUser'])
@@ -559 +577 @@
 
         // Set the targetStartDate if specified, used by searchCalendar view.
-        if(params.year && params.month && params.day)
-            taskInstance.targetStartDate = dateUtilService.makeDate(params.year, params.month, params.day)
+        if(params.year && params.month && params.day) {
+            def date = dateUtilService.makeDate(params.year, params.month, params.day)
+            taskInstance.targetStartDate = date
+            taskInstance.targetCompletionDate = date
+        }
 
         // Default leadPerson to current user, unless supplied in params.
@@ -712 +733 @@
     }
 
+    /**
+    * Get some integers for use by the month control links.
+    */
+    private getCalendarMonthControls(Date showDate) {
+        def result = [:]
+        result.today = [:]
+        result.today.date = new Date()
+        result.today.month = dateUtilService.getMonthFromDate(result.today.date)
+        result.today.year = dateUtilService.getYearFromDate(result.today.date)
+        result.nextMonth = [:]
+        result.nextMonth.date = dateUtilService.getNextMonth(showDate)
+        result.nextMonth.month = dateUtilService.getMonthFromDate(result.nextMonth.date)
+        result.nextMonth.year = dateUtilService.getYearFromDate(result.nextMonth.date)
+        result.previousMonth =  [:]
+        result.previousMonth.date = dateUtilService.getPreviousMonth(showDate)
+        result.previousMonth.month = dateUtilService.getMonthFromDate(result.previousMonth.date)
+        result.previousMonth.year = dateUtilService.getYearFromDate(result.previousMonth.date)
+        result.nextYear = [:]
+        result.nextYear.date = dateUtilService.getNextYear(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.month = dateUtilService.getMonthFromDate(result.previousYear.date)
+        result.previousYear.year = dateUtilService.getYearFromDate(result.previousYear.date)
+        return result
+    }
+
 } // end of class.