Changeset 710

Timestamp:

Nov 16, 2010, 7:56:10 AM (14 years ago)

Author:

gav

Message:

Return error message on equipment register (OH&S) report submit when endDate < startDate.

Location:

trunk/grails-app

Files:

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

trunk/grails-app/controllers/ReportController.groovy

@@ -199 +199 @@
         params.endDateString = g.formatDate(format: "EEE, dd-MMM-yyyy", date: params.endDate)
 
-        def dataModel = assetReportService.getEquipmentRegister(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 = assetReportService.getEquipmentRegister(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(action: 'equipmentRegisterOhsGsp')
 
 //         render {

trunk/grails-app/services/AssetReportService.groovy

@@ -134 +134 @@
         def result = [:]
 
+        def fail = { Map m ->
+            result.error = [ code: m.code, args: [] ]
+            return result
+        }
+
         result.section = Section.get(params.section.id.toLong())
         result.site = result.section.site
@@ -149 +154 @@
             params.endDate = dateUtilService.today
 
-        // Normalise date range.
         if(params.endDate < params.startDate)
-            params.endDate = params.startDate
+            return fail(code: "default.end.date.before.start.date")
 
         // Inner join used to return only attribTypes that are used by AssetSubItemExtendedAttributes.