Changeset 260 for trunk

Timestamp:

Jan 12, 2010, 1:09:03 PM (15 years ago)

Author:

gav

Message:

Improve bulk data creation batch times and use dynamic allocation of next available id.
Sort admin view controller classes by name.

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (4 diffs)
• services/TaskSearchService.groovy (modified) (6 diffs)
• views/appCore/appAdmin.gsp (modified) (1 diff)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -22 +22 @@
     }
 
+    def setTaskSearchParamsMax = {
+        if(params.newMax.isInteger())
+            def i = params.newMax.toInteger()
+            if(params.newMax.toInteger() > 0)
+        session.taskSearchParamsMax = params.newMax
+        params.max = params.newMax
+        forward(action: 'search', params: params)
+    }
+
     def search = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
+
+        if(session.taskSearchParamsMax)
+            params.max = session.taskSearchParamsMax
+
+        // TaskSearchService protects itself but filterPane does not.
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  99999 )
+
+        def taskInstanceList = []
+        def taskInstanceTotal
+        def filterParams = [:]
+        def personInstance = personService.currentUser
 
         // Quick Search:
         if(!FilterUtils.isFilterApplied(params)) {
-            def taskInstanceList = []
-            def personInstance = personService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -52 +69 @@
                 params.quickSearch = "searchTodays"
             }
-            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 ]
-    }
+
+            taskInstanceTotal = taskInstanceList.totalCount
+            filterParams.quickSearch = params.quickSearch
+        }
+        else {
+            // filterPane:
+            taskInstanceList = filterService.filter( params, Task )
+            taskInstanceTotal = filterService.count( params, Task )
+            filterParams = com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params)
+        }
+
+        // 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.quickSearch} tasks."
+            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", "taskStatus"]
+            Map labels = ["id": "ID", "targetStartDate": "Target Start Date", "description": "Description",
+                                    "leadPerson": "Lead Person", "taskPriority": "Task Priority", "taskStatus": "Task Status"]
+            Map formatters = [ targetStartDate: dateFmt]
+            Map parameters = [title: title, separator: ","]
+
+            exportService.export(params.format, response.outputStream, taskInstanceList, fields, labels, formatters, parameters)
+        }
+
+        // Add some basic params to filterParams.
+        filterParams.max = params.max
+        filterParams.offset = params.offset?.toInteger() ?: 0
+        filterParams.sort = params.sort ?: "id"
+        filterParams.order = params.order ?: "desc"
+
+        return[ taskInstanceList: taskInstanceList,
+                taskInstanceTotal: taskInstanceTotal,
+                filterParams: filterParams ]
+
+    } // end search()
 
     def searchCalendar = {
@@ -128 +183 @@
             // 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}")
@@ -133 +192 @@
                 Map labels = ["id": "ID", "targetStartDate": "Target Start Date", "description": "Description",
                                         "leadPerson": "Lead Person", "taskStatus": "Task Status", "taskType": "Task Type"]
-                Map formatters = [:]
+                Map formatters = [ targetStartDate: dateFmt]
                 String title = "${params.quickSearch} tasks in the last week."
-                Map parameters = [title: title]
+                Map parameters = [title: title, separator: ","]
 
                 exportService.export(params.format, response.outputStream, taskInstanceList, fields, labels, formatters, parameters) 

trunk/grails-app/services/TaskSearchService.groovy

@@ -6 +6 @@
     def authenticateService
 
+    def paramsMax = 99999
+
     def getTodays(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"
@@ -24 +26 @@
 
     def getMyTodays(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"
@@ -42 +44 @@
 
     def getInTheLastWeek(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"
@@ -59 +61 @@
 
     def getMyInTheLastWeek(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"
@@ -77 +79 @@
 
     def getBudgetPlanned(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"
@@ -95 +97 @@
 
     def getBudgetUnplanned(params) {
-        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
         params.offset = params?.offset?.toInteger() ?: 0
         params.sort = params?.sort ?: "id"

trunk/grails-app/views/appCore/appAdmin.gsp

@@ -79 +79 @@
             <div class="dialog">
                 <ul>
-                <g:each var="c" in="${grailsApplication.controllerClasses}">
+                <g:each var="c" in="${grailsApplication.controllerClasses.sort { p1, p2 -> p1.fullName.compareToIgnoreCase(p2.fullName) } }">
                         <li class="controller"><g:link controller="${c.logicalPropertyName}">${c.fullName}</g:link></li>
                 </g:each>