Changeset 144 for trunk

Timestamp:

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

Author:

gav

Message:

Work on TaskSearchService?.

Location:

trunk/grails-app

Files:

• controllers/TaskDetailedController.groovy (modified) (1 diff)
• services/TaskSearchService.groovy (modified) (1 diff)
• views/appCore/start.gsp (modified) (2 diffs)

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]
         }

trunk/grails-app/services/TaskSearchService.groovy

@@ -41 +41 @@
             }
     }
+
+    def getInTheLastWeek(params) {
+        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.offset = params?.offset?.toInteger() ?: 0
+        params.sort = params?.sort ?: "id"
+        params.order = params?.order ?: "desc"
+
+        def taskInstanceList = Task.createCriteria().list(
+            max: params.max,
+            offset: params.offset,
+            sort: params.sort, 
+            order: params.order) {
+                ge("targetStartDate", dateUtilService.getToday()-7)
+                lt("targetStartDate", dateUtilService.getTomorrow())
+                eq("isActive", true)
+            }
+    }
+
+    def getMyInTheLastWeek(params) {
+        params.max = Math.min(params?.max?.toInteger() ?: 10, 100)
+        params.offset = params?.offset?.toInteger() ?: 0
+        params.sort = params?.sort ?: "id"
+        params.order = params?.order ?: "desc"
+
+        def taskInstanceList = Task.createCriteria().list(
+            max: params.max,
+            offset: params.offset,
+            sort: params.sort, 
+            order: params.order) {
+                eq("leadPerson", Person.get(authenticateService.userDomain().id))
+                ge("targetStartDate", dateUtilService.getToday()-7)
+                lt("targetStartDate", dateUtilService.getTomorrow())
+                eq("isActive", true)
+            }
+    }
 }

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

@@ -47 +47 @@
                                             <g:link controller="taskDetailed" 
                                                             action="search"
-                                                            params="[searchMyTodays]">
+                                                            params="[searchMyTodays:'true']">
                                                             Today's
                                             </g:link>
                                             <br />
                                             <g:link controller="taskDetailed" 
-                                                            action="searchMyInTheLastWeek">
+                                                            action="search"
+                                                            params="[searchMyInTheLastWeek:'true']">
                                                             In the last week
                                             </g:link>
@@ -69 +70 @@
                                             <br />
                                             <g:link controller="taskDetailed" 
-                                                            action="searchInTheLastWeek">
+                                                            action="search"
+                                                            params="[searchInTheLastWeek:'true']">
                                                             In the last week
                                             </g:link>