Changeset 529 for trunk/grails-app/services/TaskSearchService.groovy

Timestamp:

May 10, 2010, 8:30:25 AM (14 years ago)

Author:

gav

Message:

Tweak CreateDataService to prevent issues during testing.
Repair getBudgetTasks() search.
Complete testGetBudgetTasks() test.

File:

• trunk/grails-app/services/TaskSearchService.groovy (modified) (2 diffs)

trunk/grails-app/services/TaskSearchService.groovy

@@ -251 +251 @@
     * @param endDate The end date to get tasks for, defaults to the start of tomorrow and is exclusive (less than).
     */
-    def getBudgetTasks(params, budgetStatus=null, startDate=null, endDate=null) {
+    def getBudgetTasks(params, taskBudgetStatus=null, startDate=null, endDate=null) {
         def paginateParams = [:]
         paginateParams.max = Math.min(params?.max?.toInteger() ?: 10, paramsMax)
@@ -261 +261 @@
 
         def namedParams = [:]
-        namedParams.budgetStatus = budgetStatus ?: TaskBudgetStatus.read(2) // Planned.
+        namedParams.taskBudgetStatus = taskBudgetStatus ?: TaskBudgetStatus.read(2) // Planned.
         namedParams.startDate = startDate ?: dateUtilService.today
-        namedParams.endDate = endDate ?: dateUtilService.oneWeekAgo
+        namedParams.endDate = endDate ?: dateUtilService.tomorrow
 
         def baseQuery = "from Task as task \
                                         where (task.trash = false \
-                                                    and task.budgetStatus = :budgetStatus \
+                                                    and task.taskBudgetStatus = :taskBudgetStatus \
                                                     and task.targetStartDate < :endDate \
                                                     and task.targetCompletionDate >= :startDate \