Index: trunk/grails-app/controllers/TaskDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 140)
+++ trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 143)
@@ -5,4 +5,5 @@
     def authenticateService
     def dateUtilService
+    def taskSearchService
     def filterService
 
@@ -13,27 +14,31 @@
 
     def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
         [ taskInstanceList: Task.list( params ), taskInstanceTotal: Task.count() ]
     }
-    
+
     def search = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        
-        if(!params._action_search)
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
+
+        if(!params.filter)
         {
-            // Default:
-            def taskInstanceActivesList = Task.findAllByIsActive(true, params)
-            def taskInstanceActivesTotal = Task.countByIsActive(true)
-            return [taskInstanceList: taskInstanceActivesList, taskInstanceTotal: taskInstanceActivesTotal]
-        }
-        render( view:'search', 
-            model:[ taskInstanceList: filterService.filter( params, Task ), 
-            taskInstanceTotal: filterService.count( params, Task ), 
-            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params), 
-            params:params ] )
-    }
-    
+//             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" }
+            return[ taskInstanceList: taskInstanceList, taskInstanceTotal: taskInstanceList.totalCount]
+        }
+        // filterPane:
+        return[ taskInstanceList: filterService.filter( params, Task ),
+            taskInstanceTotal: filterService.count( params, Task ),
+            filterParams: com.zeddware.grails.plugins.filterpane.FilterUtils.extractFilterParams(params),
+            params:params ]
+    }
+
     def advancedSearch = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100 )
 
         if(!params._action_advancedSearch)
@@ -51,53 +56,43 @@
     }
     
-    def searchTodays = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-            
-        def taskInstanceList = Task.createCriteria().list() {
-                eq("targetStartDate", dateUtilService.getToday())
-                eq("isActive", true)
-        }
-            
-        def taskInstanceTotal = Task.createCriteria().count() {
-                eq("targetStartDate", dateUtilService.getToday())
-                eq("isActive", true)
-        }
-        
-        if(taskInstanceTotal > 0)
-        {
-            flash.message = "Today's tasks"
-        }
-        else { flash.message = "No tasks found for today" }
-        
-        render( view:'search', 
-            model:[ taskInstanceList: taskInstanceList, 
-            taskInstanceTotal: taskInstanceTotal])
-    }
-    
-    def searchMyTodays = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-            
-        def taskInstanceList = Task.createCriteria().list() {
-                eq("leadPerson", Person.get(authenticateService.userDomain().id))
-                ge("targetStartDate", dateUtilService.getToday())
-                eq("isActive", true)
-        }
-            
-        def taskInstanceTotal = Task.createCriteria().count() {
-                eq("leadPerson", Person.get(authenticateService.userDomain().id))
-                ge("targetStartDate", dateUtilService.getToday())
-                eq("isActive", true)
-        }
-        
-        if(taskInstanceTotal > 0)
-        {
-            flash.message = "Today's tasks"
-        }
-        else { flash.message = "No tasks found for today" }
-        
-        render( view:'search', 
-            model:[ taskInstanceList: taskInstanceList, 
-            taskInstanceTotal: taskInstanceTotal])
-    }
+//     def searchTodays = {
+//         def taskInstanceList = taskSearchService.getTodays(params)
+//         
+//         if(taskInstanceList.totalCount > 0)
+//         {
+//             flash.message = "Today's tasks"
+//         }
+//         else { flash.message = "No tasks found for today" }
+//         
+//         render( view:'search', 
+//             model:[ taskInstanceList: taskInstanceList, 
+//             taskInstanceTotal: taskInstanceList.totalCount])
+//     }
+    
+//     def searchMyTodays = {
+//         params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+//             
+//         def taskInstanceList = Task.createCriteria().list() {
+//                 eq("leadPerson", Person.get(authenticateService.userDomain().id))
+//                 ge("targetStartDate", dateUtilService.getToday())
+//                 eq("isActive", true)
+//         }
+//             
+//         def taskInstanceTotal = Task.createCriteria().count() {
+//                 eq("leadPerson", Person.get(authenticateService.userDomain().id))
+//                 ge("targetStartDate", dateUtilService.getToday())
+//                 eq("isActive", true)
+//         }
+//         
+//         if(taskInstanceTotal > 0)
+//         {
+//             flash.message = "Today's tasks"
+//         }
+//         else { flash.message = "No tasks found for today" }
+//         
+//         render( view:'search', 
+//             model:[ taskInstanceList: taskInstanceList, 
+//             taskInstanceTotal: taskInstanceTotal])
+//     }
     
     def searchInTheLastWeek = {
@@ -284,10 +279,10 @@
         else {
             def criteria = taskInstance.createCriteria()
-            def results = criteria {
+            def result = criteria {
                 and {
                     notEqual('id', taskInstance.id)
                     }
             }
-            return [ taskInstance : taskInstance, possibleParentList: results ]
+            return [ taskInstance : taskInstance, possibleParentList: result ]
         }
     }