Changeset 144 for trunk/grails-app/controllers

Timestamp:

Oct 3, 2009, 4:05:02 PM (15 years ago)

Author:

gav

Message:

Work on TaskSearchService?.

File:

• trunk/grails-app/controllers/TaskDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -19 +19 @@
 
     def search = {
+//         println params
         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
 
+        // Search urls:
         if(!params.filter)
         {
-//             if(params.searchMyTodays) { def taskInstanceList = taskSearchService.getMyTodays(params) }
-//             else { def taskInstanceList = taskSearchService.getTodays(params) }
-            
-            def taskInstanceList = taskSearchService.getTodays(params)
-
-            if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks" }
-            else { params.message = "No tasks found for today" }
+            def taskInstanceList = []
+            def personInstance = Person.get(authenticateService.userDomain().id)
+
+            if(params.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.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 today." }
+            }
+            else if(params.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 today." }
+            }
+            else {
+                //Default:
+                taskInstanceList = taskSearchService.getTodays(params)
+                if(taskInstanceList.totalCount > 0) { params.message = "Today's tasks." }
+                else { params.message = "No tasks found for today." }
+            }
+
             return[ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount]
         }