Changeset 432 for trunk/grails-app/controllers

Timestamp:

May 18, 2010, 4:42:11 PM (12 years ago)

Author:

duh

Message:

• events page now seperates 'events' from 'samplingEvents'
• grouping is now in front to outline properly
• added radio form element
• todo: fix exceptions while deleting

File:

• trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (9 diffs)

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

@@ -53 +53 @@
                                 [title: 'Subjects'],                    // subjects
                                 [title: 'Events'],                              // events and event grouping
+                                [title: 'Samples'],                             // samples
                                 [title: 'Confirmation'],                // confirmation page
                                 [title: 'Done']                                 // finish page
@@ -248 +249 @@
                                         flow.eventGroups[0]     = new EventGroup(name: 'Group 1')       // 1 group by default
                                         flow.eventTemplates     = [:]
+                                } else if (!flash.values) {
+                                        // set flash.values.templateType based on the event instance
+                                        flash.values = [:]
+                                        flash.values.templateType = (flow.event instanceof Event) ? 'event' : 'sample'
+println "aapjes --> " + flash.values
                                 }
                         }
@@ -261 +267 @@
                         on("add") {
                                 flash.values                    = params
-                                def eventTemplateName   = params.get('template')
+println params
+println params.get('eventType')
+println params.get('eventTemplate')
+println params.get('sampleTemplate')
+
+                                def eventTemplateName   = (params.get('eventType') == 'event') ? params.get('eventTemplate') : params.get('sampleTemplate')
                                 def eventTemplate               = Template.findByName(eventTemplateName)
+println "test: "+ eventTemplateName + ", " + eventTemplate
 
                                 // add this event template to the event template array
@@ -345 +357 @@
                         on("deleteEventGroup") {
                                 flash.values = params
-                                
+
                                 def delete = params.get('do') as int;
 
@@ -362 +374 @@
                         }.to "subjects"
                         on("next") {
+                                println params
                                 flash.values = params
                                 flash.errors = [:]
@@ -368 +381 @@
                                 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()                                         
@@ -376 +388 @@
                                         error()
                                 }
-                        }.to "events"
-                }
-
+                        }.to "samples"
+                }
+
+                // samples page
+                samples {
+                        render(view: "_samples")
+                        onRender {
+                                flow.page = 5
+                        }
+                        on("previous").to "events"
+                        on("next").to "samples"
+                }
+
+                // confirmation
                 confirm {
                         render(view: "_confirmation")
                         onRender {
-                                flow.page = 5
+                                flow.page = 6
                         }
                         on("toStudy").to "study"
                         on("toSubjects").to "subjects"
                         on("toEvents").to "events"
-                        on("previous").to "events"
+                        on("toSamples").to "samples"
+                        on("previous").to "samples"
                         on("next").to "save"
                 }
@@ -491 +515 @@
                         }
                         on("next").to "save"
-                        on("previous").to "events"
+                        on("previous").to "samples"
                 }
 
@@ -596 +620 @@
         def handleEvents(flow, flash, params) {
                 def errors = false
-                
-                // got an event in the flash scope?
-                if (!flow.event) flow.event = new Event()
+                def template = null
+
+                // handle the type of event
+                if (params.eventType == 'event') {
+                        flow.event = new Event();
+                        template = params.remove('eventTemplate')
+                } else if (params.eventType == 'sample') {
+                        flow.event = new SamplingEvent();
+                        template = params.remove('sampleTemplate')
+                }
+
+                // got an event in the flow scope?
+                //if (!flow.event) flow.event = new Event()
 
                 // if a template is selected, get template instance
-                def template = params.remove('template')
                 if (template instanceof String && template.size() > 0) {
                         params.template = Template.findByName(template)