Changeset 416

Timestamp:

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

Author:

duh

Message:

• updated Events to handle constraints properly
• updated event wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (5 diffs)
• domain/dbnp/studycapturing/Event.groovy (modified) (1 diff)
• i18n/messages.properties (modified) (1 diff)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• views/wizard/pages/_events.gsp (modified) (1 diff)

trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

@@ -260 +260 @@
                         }.to "events"
                         on("add") {
-                                /*
-                                def startTime   = (params.get('startTime')) ? params.startTime = new Date().parse("d/M/yyyy HH:mm", params.get('startTime').toString()) : null
-                                def endTime             = (params.get('endTime')) ? new Date().parse("d/M/yyyy HH:mm", params.get('endTime').toString()) : null
-                                def template    = params.get('template')
-
-                                // handle template
-                                if (template instanceof String && template.size() > 0) {
-                                        template = Template.findByName(template)
-                                } else if (!template instanceof Template) {
-                                        template = null
-                                }
-
-                                // handle data
-                                if (template && startTime && endTime) {
-                                        // add an event instance
-                                        def event = new Event(
-                                                template        : template,
-                                                startTime       : startTime,
-                                                endTime         : endTime
-                                        )
-
-                                        // validate event
-                                        if (event.validate()) {
-                                                // add event to event list
-                                                flow.events[ flow.events.size() ] = event
-                                                success()
-                                        } else {
-                                                // validation failed, feedback errors
-                                                flash.errors = [:]
-                                                flash.values = params
-                                                this.appendErrors(event, flash.errors)
-                                                error()
-                                        }
-                                } else {
-                                        // validation failed, feedback errors
-                                        flash.errors    = [:]
-                                        flash.values    = params
-
-                                        if (!template)  this.appendErrorMap(['template': 'You need to select an event template'], flash.errors)
-                                        if (!startTime) this.appendErrorMap(['startTime': 'You need to define the start time of your study event'], flash.errors)
-                                        if (!endTime)   this.appendErrorMap(['endTime': 'You need to define the end time of your study event'], flash.errors)
-                                        error()
-                                }
-                                */
                                 flash.values                    = params
                                 def eventTemplateName   = params.get('template')
@@ -322 +278 @@
                                 // validate event object
                                 if (flow.event.validate()) {
-
-flow.event.template.fields.each() {
-        println "["+it.name+"] = "+flow.event.getFieldValue(it.name)    
-}
                                         // it validated! Duplicate the event object...
                                         def newEvent    = flow.event
@@ -412 +364 @@
                                 flash.values = params
                                 flash.errors = [:]
-                                /*
-
-                                // handle event groupings
-                                this.handleEventGrouping(flow, flash, params)
-
-                                // check if we have at least one subject
-                                // and check form data
+
+                                // handle study data
                                 if (flow.events.size() < 1) {
                                         // append error map
                                         flash.values = params
                                         this.appendErrorMap(['events': 'You need at least to create one event for your study'], flash.errors)
+                                        error()                                         
+                                } else if (this.handleEvents(flow, flash, params)) {
+                                        success()
+                                } else {
                                         error()
                                 }
-                                */
                         }.to "events"
                 }
@@ -645 +595 @@
          */
         def handleEvents(flow, flash, params) {
+                def errors = false
+                
                 // got an event in the flash scope?
                 if (!flow.event) flow.event = new Event()
@@ -669 +621 @@
                 flow.eventTemplates.each() { eventTemplate ->
                         // iterate through events
-                        eventTemplate.getValue().events.each() { event ->
-                                println eventTemplate
-                                println event.class
-                                //println event.template
-
+                        eventTemplate.getValue().events.each() { eventId ->
                                 // iterate through template fields
-                                /*
-                                event.giveFields().each() { eventField ->
-                                        event.setFieldValue(eventField.name, params.get( 'event_' + event + '_' + eventField.escapedName() ) )
+                                flow.events[ eventId ].giveFields().each() { eventField ->
+                                        flow.events[ eventId ].setFieldValue(eventField.name, params.get( 'event_' + eventId + '_' + eventField.escapedName() ) )
                                 }
 
                                 // validate event
-                                if (!flow.events[ event ].validate()) {
+                                if (!flow.events[ eventId ].validate()) {
                                         errors = true
                                         this.appendErrors(flow.events[ eventId ], flash.errors, 'event_' + eventId + '_')
                                 }
-                                */
                         }
                 }

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)
                 })
         }

trunk/grails-app/i18n/messages.properties

@@ -63 +63 @@
 templateEntity.typeMismatch.date=Property {0} must be of type Date and is currently of type {1}
 templateEntity.typeMismatch.term=Property {0} must be of type Term and is currently of type {1}
+
+event.endTime.greaterThanStartTime=End time should be greater than or equal to the Start Time

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -620 +620 @@
                         def from = []
                         attrs.from.each { from[ from.size() ] = it.toString() }
+
+                        // sort alphabetically
+                        from.sort()
+
+                        // set attributes
                         attrs.from = from
                         attrs.value = (attrs.value) ? attrs.value.toString() : ''

trunk/grails-app/views/wizard/pages/_events.gsp

@@ -29 +29 @@
 <g:if test="${events}">
         <g:each var="eventTemplate" in="${eventTemplates}">
+                <g:set var="showHeader" value="${true}" />
                 <h1>${eventTemplate.getValue().name} template</h1>
         <div class="table">
-                <div class="header">
-                        <div class="firstColumn">#</div>
-                        <div class="firstColumn"></div>
-                        <wizard:templateColumnHeaders template="${eventTemplate.getValue().template}" class="column"/>
-                        <g:if test="${eventGroups}"><g:each var="eventGroup" status="g" in="${eventGroups}">
-                        <div class="column">
-                                <g:textField name="eventGroup_${g}_name" value="${eventGroup.name}" />
-                                <wizard:ajaxButton name="deleteEventGroup" src="../images/icons/famfamfam/delete.png" alt="delete this eventgroup" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${g});" afterSuccess="onWizardPage()" />
+                <g:each var="eventId" in="${eventTemplate.getValue().events}">
+                        <g:if test="${showHeader}">
+                        <g:set var="showHeader" value="${false}" />
+                        <div class="header">
+                                <div class="firstColumn">#</div>
+                                <div class="firstColumn"></div>
+                                <wizard:templateColumnHeaders entity="${events[ eventId ]}" class="column"/>
+                                <g:if test="${eventGroups}"><g:each var="eventGroup" status="g" in="${eventGroups}">
+                                <div class="column">
+                                        <g:textField name="eventGroup_${g}_name" value="${eventGroup.name}" />
+                                        <wizard:ajaxButton name="deleteEventGroup" src="../images/icons/famfamfam/delete.png" alt="delete this eventgroup" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${g});" afterSuccess="onWizardPage()" />
+                                </div>
+                                </g:each></g:if>
+                                <div class="column">
+                                        <wizard:ajaxButton name="addEventGroup" src="../images/icons/famfamfam/add.png" alt="add a new eventgroup" class="famfamfam" value="+" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
+                                </div>
                         </div>
-                        </g:each></g:if>
-                        <div class="column">
-                                <wizard:ajaxButton name="addEventGroup" src="../images/icons/famfamfam/add.png" alt="add a new eventgroup" class="famfamfam" value="+" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
-                        </div>
-                </div>
-                <g:each var="eventId" in="${eventTemplate.getValue().events}">
+                        </g:if>
                         <div class="row">
                                 <div class="firstColumn">${eventId + 1}</div>