Changeset 296 for trunk/grails-app/controllers

Timestamp:

Mar 22, 2010, 1:44:00 PM (12 years ago)

Author:

duh

Message:

• refactored template field handeling in the wizard
• added escapedName() method to TemplateField? which returns the field name in lowercase format, and all non-alphanumeric characters escaped to underscores (hence: jeroen_s_very_cool_field)
• (re)moved some template 'note' boxes

File:

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

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

@@ -461 +461 @@
                                         }
 
+                                        // TODO: eventDescriptions that are not linked to an event are currently
+                                        //               stored but end up in a black hole. We should either decide to
+                                        //               NOT store these eventDescriptions, or add "hasmany eventDescriptions"
+                                        //               to Study domain class
+
                                         // save events
                                         flow.events.each() {
@@ -579 +584 @@
 
                 // update study instance with parameters
-                params.each() {key, value ->
+                params.each() { key, value ->
                         if (flow.study.hasProperty(key)) {
                                 flow.study.setProperty(key, value);
+                        }
+                }
+
+                // walk through template fields
+                params.template.fields.each() { field ->
+                        def value = params.get(field.escapedName())
+
+                        if (value) {
+                                flow.study.setFieldValue(field.name, value)
                         }
                 }
@@ -698 +712 @@
                                 // iterate through template fields
                                 templateFields.each() { subjectField ->
-                                        def value = params.get('subject_' + subjectId + '_' + subjectField.name)
+                                        def value = params.get('subject_' + subjectId + '_' + subjectField.escapedName())
 
                                         if (value) {