Changeset 732 for trunk/grails-app/services

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/services

Files:

• AssetReportService.groovy (modified) (1 diff)
• TaskReportService.groovy (modified) (2 diffs)

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.