Changeset 181

Timestamp:

Feb 9, 2010, 4:13:42 PM (14 years ago)

Author:

duh

Message:

• seperated wizard subject handling logic out of the webflow to make it re-usable for different flow actions

File:

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

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

@@ -125 +125 @@
                         }.to "subjects"
                         on("next") {
-                                def errors = false
                                 flash.errors = new LinkedHashMap()
 
-                                // got one or more subjects?
-                                if (flow.subjects.size() < 1) {
-                                        errors = true;
-                                } else {
-                                        // handle form data
-                                        def id = 0;
-                                        flow.subjects.each() {
-                                                // store subject properties
-                                                it.name = params.get('subject_' + id + '_name')
-                                                it.species = Term.findByName(params.get('subject_' + id + '_species'))
-
-                                                // clear lists
-                                                def stringList = new LinkedHashMap();
-                                                def intList = new LinkedHashMap();
-
-                                                // get all template fields
-                                                flow.study.template.subjectFields.each() {
-                                                        // get value
-                                                        def value = params.get('subject_' + id + '_' + it.name);
-                                                        if (value) {
-                                                                // add to template parameters
-                                                                switch (it.type) {
-                                                                        case 'STRINGLIST':
-                                                                                stringList[it.name] = value
-                                                                                break;
-                                                                        case 'INTEGER':
-                                                                                intList[ it.name ] = value
-                                                                                break;
-                                                                        default:
-                                                                                // unsupported type?
-                                                                                println "ERROR: unsupported type: "+it.type
-                                                                                break;
-                                                                }
-                                                        }
-                                                }
-
-                                                // set field data
-                                                it.templateStringFields         = stringList
-                                                it.templateIntegerFields        = intList
-
-                                                // validate subject
-                                                if (!it.validate()) {
-                                                        errors = true
-                                                        //println id + ' :: ' + it.errors.getAllErrors()
-                                                        this.appendErrors(it, flash.errors)
-                                                }
-
-                                                id++;
-                                        }
-                                }
-
-                                // got errors?
-                                if (errors) {
-                                        println flash.errors
+                                // handle form data
+                                if (!this.handleSubjects(flow, flash, params)) {
                                         error()
                                 } else {
@@ -188 +135 @@
                         }.to "groups"
                         on("previous") {
-                                // TODO
+                                flash.errors = new LinkedHashMap()
+
+                                // handle form data
+                                if (!this.handleSubjects(flow, flash, params)) {
+                                        error()
+                                } else {
+                                        success()
+                                }
                         }.to "study"
                 }
@@ -204 +158 @@
                                 def increment = flow.groups.size()
                                 flow.groups[increment] = new SubjectGroup(params)
-
-                                println flow.groups
                         }.to "groups"
                         on("next") {
@@ -224 +176 @@
                                 // TODO
                         }.to "groups"
+                }
+        }
+
+        /**
+         * re-usable code for handling subject form data in a web flow
+         * @param Map   LocalAttributeMap (the flow scope)
+         * @param Map   localAttributeMap (the flash scope)
+         * @param Map   GrailsParameterMap (the flow parameters = form data)
+         * @returns boolean
+         */
+        def handleSubjects(flow, flash, params) {
+                println flow.getClass()
+                println flash.getClass()
+                println params.getClass()
+                
+                if (flow.subjects.size() < 1) {
+                        return false
+                } else {
+                        def errors = false;
+                        def id = 0;
+                        flow.subjects.each() {
+                                // store subject properties
+                                it.name = params.get('subject_' + id + '_name')
+                                it.species = Term.findByName(params.get('subject_' + id + '_species'))
+
+                                // clear lists
+                                def stringList = new LinkedHashMap();
+                                def intList = new LinkedHashMap();
+
+                                // get all template fields
+                                flow.study.template.subjectFields.each() {
+                                        // get value
+                                        def value = params.get('subject_' + id + '_' + it.name);
+
+                                        if (value) {
+                                                // add to template parameters
+                                                switch (it.type) {
+                                                        case 'STRINGLIST':
+                                                                stringList[it.name] = value
+                                                                break;
+                                                        case 'INTEGER':
+                                                                intList[it.name] = value
+                                                                break;
+                                                        default:
+                                                                // unsupported type?
+                                                                println "ERROR: unsupported type: " + it.type
+                                                                break;
+                                                }
+                                        }
+                                }
+
+                                // set field data
+                                it.templateStringFields = stringList
+                                it.templateIntegerFields = intList
+
+                                // validate subject
+                                if (!it.validate()) {
+                                        errors = true
+                                        println id + ' :: ' + it.errors.getAllErrors()
+                                        this.appendErrors(it, flash.errors)
+                                }
+
+                                id++;
+                        }
+
+                        return !errors
                 }
         }