Changeset 709

Timestamp:

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

Author:

gav

Message:

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

Location:

trunk/grails-app

Files:

• controllers/ReportController.groovy (modified) (1 diff)
• services/TaskReportService.groovy (modified) (1 diff)

trunk/grails-app/controllers/ReportController.groovy

@@ -112 +112 @@
         params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
 
-        def dataModel = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
-
-        // Jasper plugin controller expects data to be a Collection.
-        chain(controller:'jasper', action:'index', model:[data: [dataModel]], params:params)
+        def result = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
+
+        if(!result.error) {
+            // Jasper plugin controller expects data to be a Collection.
+            chain(controller:'jasper', action:'index', model:[data: [result]], params:params)
+            return
+        }
+
+        flash.errorMessage = g.message(code: result.error.code, args: result.error.args)
+        redirect(controller: 'appCore', action: 'start', params: [showTab:'showReportsTab'])
 
     } // immediateCallouts

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 \