Changeset 733

Timestamp:

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

Author:

gav

Message:

Auto swap date range in all reports, part 2.

Location:

trunk/grails-app

Files:

• controllers/ReportController.groovy (modified) (1 diff)
• services/AssetReportService.groovy (modified) (2 diffs)

trunk/grails-app/controllers/ReportController.groovy

@@ -191 +191 @@
     def equipmentRegisterOhs = {
 
+        params.calculateRegulatoryTaskCompletion = true
+        def result = assetReportService.getEquipmentRegister(params, RCU.getLocale(request))
+
         params.reportTitle = "Equipment Register OH&S"
         params.logoUrl = grailsApplication.mainContext.getResource('images/logo.png').getURL()
         params.currentUser = authService.currentUser
-
-        params.calculateRegulatoryTaskCompletion = true
-        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 = assetReportService.getEquipmentRegister(params, RCU.getLocale(request))
+        params.startDateString = result.startDateString
+        params.endDateString = result.endDateString
 
         if(!result.error) {

trunk/grails-app/services/AssetReportService.groovy

@@ -142 +142 @@
         result.site = result.section.site
 
-        // Start date.
-        if(params.startDate)
-            params.startDate = dateUtilService.makeDate(params.startDate_year, params.startDate_month, params.startDate_day)
-        else
-            params.startDate = dateUtilService.oneWeekAgo
-
-        // End date.
-        if(params.endDate)
-            params.endDate = dateUtilService.makeDate(params.endDate_year, params.endDate_month, params.endDate_day)
-        else
-            params.endDate = dateUtilService.today
-
+        result.startDate = params.startDate ?: dateUtilService.oneWeekAgo
+        result.endDate = params.endDate ?: dateUtilService.today
         // Auto swap date range.
-        if(params.startDate > params.endDate) {
-            def tempStartDate = params.startDate
-            params.startDate = params.endDate
-            params.endDate = tempStartDate
-        }
+        if(result.startDate > result.endDate) {
+            def tempStartDate = result.startDate
+            result.startDate = result.endDate
+            result.endDate = tempStartDate
+        }
+
+        result.startDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: result.startDate)
+        result.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: result.endDate)
 
         // Inner join used to return only attribTypes that are used by AssetSubItemExtendedAttributes.
@@ -234 +227 @@
 
             // Subquery namedParams.
-            namedParams.startDate = params.startDate
-            namedParams.endDate = params.endDate+1
+            namedParams.startDate = result.startDate
+            namedParams.endDate = result.endDate+1
 
             select 'new map(asset.name as assetName',