Changeset 709 for trunk/grails-app/services/TaskReportService.groovy

Timestamp:

Nov 15, 2010, 12:04:41 PM (14 years ago)

Author:

gav

Message:

Return error message on immediate callouts report submit when endDate < startDate.

File:

• trunk/grails-app/services/TaskReportService.groovy (modified) (1 diff)

trunk/grails-app/services/TaskReportService.groovy

@@ -169 +169 @@
         def result = [:]
 
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: [] ]
+            return result
+        }
+
         def namedParams = [:]
         namedParams.startDate = params.startDate ?: dateUtilService.today
-        namedParams.endDatePlusOne = (params.endDate ?: dateUtilService.today)+1
+        namedParams.endDate = params.endDate ?: dateUtilService.today
+
+        if(namedParams.endDate < namedParams.startDate)
+            return fail(code: "default.end.date.before.start.date")
+
+        namedParams.endDate++ // Start of next day required.
+
         namedParams.immediateCallout = TaskType.read(1)
 
         result.taskQuery = "from Task as task \
                                             where (task.trash = false \
-                                                        and task.targetStartDate < :endDatePlusOne \
+                                                        and task.targetStartDate < :endDate \
                                                         and task.targetStartDate >= :startDate \
                                                         and task.taskType = :immediateCallout \