Changeset 138 for trunk/grails-app/controllers

Timestamp:

Jan 26, 2010, 4:46:01 PM (12 years ago)

Author:

duh

Message:

• added development version of wizard subjects page and logic
• modified some domain classes (again, who reverted them?) to implement Serializable

File:

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

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

@@ -2 +2 @@
 
 import dbnp.studycapturing.*
+import dbnp.data.*
 import grails.converters.*
 
@@ -49 +50 @@
                         flow.pages = [
                                 [title: 'Study'],               // study
-                                [title: 'Twoooo'],
-                                [title: 'Trois']
+                                [title: 'Subjects'],    // subjects
+                                [title: 'Form elements demo page']
                         ]
 
@@ -75 +76 @@
                         }
                         on("next") {
+                                // create date instance from date string?
+                                // @see WizardTagLibrary::dateElement{...}
+                                if (params.get('startDate')) {
+                                        params.startDate = new Date().parse("d/M/yyyy", params.get('startDate').toString())
+                                }
+
                                 // create a study instance
                                 flow.study = new Study(params)
@@ -80 +87 @@
                                 // validate study
                                 if (flow.study.validate()) {
+                                        println "ok"
                                         success()
                                 } else {
@@ -87 +95 @@
                                         error()
                                 }
-                        }.to "pageTwo"
+                        }.to "subjects"
                 }
 
                 // render page two
-                pageTwo {
-                        render(view: "_two")
+                subjects {
+                        render(view: "_subjects")
                         onRender {
-                                println "render page two"
                                 flow.page = 2
+
+                                if (!flow.subjects) {
+                                        flow.subjects = new LinkedHashMap()
+                                }
                         }
+                        on ("add") {
+                                def speciesTerm = Term.findByName(params.addSpecies)
+                                
+                                // add x subject of species y
+                                (params.addNumber as int).times {
+                                        def increment = flow.subjects.size()
+                                        flow.subjects[ increment ] = new Subject(
+                                                name: 'Subject ' + (increment+1),
+                                                species: speciesTerm
+                                        )
+                                }
+                        }.to "subjects"
                         on("next") {
-                                println "next page!"
+                                // got one or more subjects?
+                                if (flow.subjects.size() < 1) {
+                                        error()
+                                }
                         }.to "pageThree"
                         on("previous") {
-                                println "previous page!"
+                                // handle data?
+                                // go to study page
                         }.to "study"
                 }
@@ -114 +141 @@
                         on("previous") {
                                 println "previous page!"
-                        }.to "pageTwo"
+                        }.to "subjects"
                 }
         }