Changeset 732 for trunk/grails-app

Timestamp:

Nov 30, 2010, 10:24:52 AM (14 years ago)

Author:

gav

Message:

Auto swap date range in all reports.

Location:

trunk/grails-app

Files:

• controllers/ReportController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/AssetReportService.groovy (modified) (1 diff)
• services/TaskReportService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/ReportController.groovy

@@ -85 +85 @@
     def reactiveRatio = {
 
+        def result = taskReportService.getReactiveRatio(params, RCU.getLocale(request))
+
         params.reportTitle = "Reactive Ratio Report"
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-        params.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.startDate)
-        params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
-
-        def result = taskReportService.getReactiveRatio(params, RCU.getLocale(request))
+        params.startDateString = result.startDateString
+        params.endDateString = result.endDateString
 
         if(!result.error) {
@@ -106 +106 @@
     def immediateCallouts = {
 
+        def result = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
+
         params.reportTitle = "Immediate Callouts"
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-        params.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.startDate)
-        params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
-
-        def result = taskReportService.getImmediateCallouts(params, RCU.getLocale(request))
+        params.startDateString = result.startDateString
+        params.endDateString = result.endDateString
 
         if(!result.error) {

trunk/grails-app/i18n/messages.properties

@@ -312 +312 @@
 default.file.no.header=The supplied file does not have the correct header lines, please see the template file.
 default.not.development.environment.failure=Could not complete operation, dev environment not detected.
-default.end.date.before.start.date=The end date must be equal to or greater than \
-    the start date.
 
 default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]

trunk/grails-app/services/AssetReportService.groovy

@@ -154 +154 @@
             params.endDate = dateUtilService.today
 
-        if(params.endDate < params.startDate)
-            return fail(code: "default.end.date.before.start.date")
+        // Auto swap date range.
+        if(params.startDate > params.endDate) {
+            def tempStartDate = params.startDate
+            params.startDate = params.endDate
+            params.endDate = tempStartDate
+        }
 
         // Inner join used to return only attribTypes that are used by AssetSubItemExtendedAttributes.

trunk/grails-app/services/TaskReportService.groovy

@@ -33 +33 @@
         namedParams.endDate = params.endDate ?: dateUtilService.today
 
-        if(namedParams.endDate < namedParams.startDate)
-            return fail(code: "default.end.date.before.start.date")
+        // Auto swap date range.
+        if(namedParams.startDate > namedParams.endDate) {
+            def tempStartDate = namedParams.startDate
+            namedParams.startDate = namedParams.endDate
+            namedParams.endDate = tempStartDate
+        }
+
+        result.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: namedParams.startDate)
+        result.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: namedParams.endDate)
 
         namedParams.endDate++ // Start of next day required.
@@ -178 +185 @@
         namedParams.endDate = params.endDate ?: dateUtilService.today
 
-        if(namedParams.endDate < namedParams.startDate)
-            return fail(code: "default.end.date.before.start.date")
+        // Auto swap date range.
+        if(namedParams.startDate > namedParams.endDate) {
+            def tempStartDate = namedParams.startDate
+            namedParams.startDate = namedParams.endDate
+            namedParams.endDate = tempStartDate
+        }
+
+        result.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: namedParams.startDate)
+        result.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: namedParams.endDate)
 
         namedParams.endDate++ // Start of next day required.