Changeset 416 for trunk/grails-app/domain/dbnp

Timestamp:

May 12, 2010, 3:38:46 PM (9 years ago)

Author:

duh

Message:

• updated Events to handle constraints properly
• updated event wizard

File:

• trunk/grails-app/domain/dbnp/studycapturing/Event.groovy (modified) (1 diff)

trunk/grails-app/domain/dbnp/studycapturing/Event.groovy

@@ -17 +17 @@
         Date endTime
 
+        /**
+         * Constraints
+         */
         static constraints = {
-                endTime(validator: {val, obj ->
-                        if (val && val.before(obj.startTime)) {
-                                return 'endTimeshouldbegreater'
+                endTime(validator: { fields, obj, errors ->
+                        def error = false
+
+                        // endTime must be >= the startTime
+                        if ( fields && fields.compareTo(obj.startTime) < 0 ) {
+                                error = true
+                                errors.rejectValue(
+                                        'endTime',
+                                        'event.endTime.greaterThanStartTime',
+                                        ['endTime', fields] as Object[],
+                                        'End time should be greater than or equal to the Start Time'
+                                )
                         }
+
+                        return (!error)
                 })
         }