Changeset 710 for trunk/grails-app/services

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.

File:

• trunk/grails-app/services/AssetReportService.groovy (modified) (2 diffs)

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.