Changeset 195

Timestamp:

Feb 12, 2010, 1:11:52 PM (14 years ago)

Author:

duh

Message:

• seperated template page from study page
• seperated study logic from flow
• added initial templates and flow logic for events, samples, protocols and assays

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (6 diffs)
• views/wizard/pages/_assays.gsp (added)
• views/wizard/pages/_done.gsp (added)
• views/wizard/pages/_events.gsp (added)
• views/wizard/pages/_protocols.gsp (added)
• views/wizard/pages/_samples.gsp (added)
• views/wizard/pages/_study.gsp (modified) (1 diff)
• views/wizard/pages/_templates.gsp (added)
• views/wizard/pages/_three.gsp (deleted)

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

@@ -47 +47 @@
                         flow.page = 0
                         flow.pages = [
+                                [title: 'Templates'],   // templates
                                 [title: 'Study'],               // study
                                 [title: 'Subjects'],    // subjects
                                 [title: 'Groups'],              // groups
-                                [title: 'Form elements demo page']
+                                [title: 'Events'],              // events
+                                [title: 'Samples'],             // samples
+                                [title: 'Protocols'],   // protocols
+                                [title: 'Assays'],              // assays
+                                [title: 'Done']                 // finish page
                         ]
 
@@ -64 +69 @@
                                 flow.page = 1
                         }
-                        on("next").to "study"
-                }
-
-                // render and handle the study page
-                study {
-                        render(view: "_study")
+                        on("next").to "templates"
+                }
+
+                // select the templates to use for this study
+                templates {
+                        render(view: "_templates")
                         onRender {
                                 flow.page = 1
                         }
                         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())
-                                }
-
-                                // if a template is selected, get template instance
-                                if (params.get('template')) {
-                                        params.template = Template.findByName(params.get('template'))
-                                }
-
-                                // create a study instance
-                                flow.study = new Study(params)
+                                // if we don't have a study, instantiate a study with dummy values
+                                if (!flow.study) {
+                                        flow.study = new Study(
+                                                title: "my study",
+                                                code: "",
+                                                ecCode: "",
+                                                researchQuestion: "",
+                                                description: "",
+                                                startDate: new Date().format("d/M/yyyy")
+                                        )
+                                }
+/*
+flow.study.getProperties().constraints.each() { key, value ->
+        println key
+        value.getProperties().each() {
+                println it
+        }
+}
+*/
+                                // assign template to study
+                                flow.study.template = Template.findByName(params.get('template'));
 
                                 // validate study
@@ -97 +110 @@
                                         error()
                                 }
+                        }.to "study"
+                }
+
+                // render and handle the study page
+                study {
+                        render(view: "_study")
+                        onRender {
+                                flow.page = 2
+                        }
+                        on("previous") {
+                                flash.errors = new LinkedHashMap()
+
+                                if (this.handleStudy(flow, flash, params)) {
+                                        success()
+                                } else {
+                                        error()
+                                }
+                        }.to "templates"
+                        on("next") {
+                                flash.errors = new LinkedHashMap()
+
+                                if (this.handleStudy(flow, flash, params)) {
+                                        success()
+                                } else {
+                                        error()
+                                }
                         }.to "subjects"
                 }
@@ -104 +143 @@
                         render(view: "_subjects")
                         onRender {
-                                flow.page = 2
+                                flow.page = 3
 
                                 if (!flow.subjects) {
@@ -155 +194 @@
                         render(view: "_groups")
                         onRender {
-                                flow.page = 3
+                                flow.page = 4
 
                                 if (!flow.groups) {
@@ -174 +213 @@
 
                 // render page three
-                demo {
-                        render(view: "_three")
-                        onRender {
-                                flow.page = 4
-                        }
-                        on("previous") {
-                                // TODO
-                        }.to "groups"
+                events {
+                        render(view: "_events")
+                        onRender {
+                                flow.page = 5
+                        }
+                        on("previous") {
+                                // TODO
+                        }.to "subjects"
+                        on("next") {
+                                // TODO
+                        }.to "samples"
+                }
+
+                // render page three
+                samples {
+                        render(view: "_samples")
+                        onRender {
+                                flow.page = 6
+                        }
+                        on("previous") {
+                                // TODO
+                        }.to "events"
+                        on("next") {
+                                // TODO
+                        }.to "protocols"
+                }
+
+                // render page three
+                protocols {
+                        render(view: "_protocols")
+                        onRender {
+                                flow.page = 7
+                        }
+                        on("previous") {
+                                // TODO
+                        }.to "samples"
+                        on("next") {
+                                // TODO
+                        }.to "assays"
+                }
+
+                // render page three
+                assays {
+                        render(view: "_assays")
+                        onRender {
+                                flow.page = 8
+                        }
+                        on("previous") {
+                                // TODO
+                        }.to "protocols"
+                        on("next") {
+                                // TODO
+                        }.to "done"
+                }
+
+                // render page three
+                done {
+                        render(view: "_done")
+                        onRender {
+                                flow.page = 9
+                        }
+                        on("previous") {
+                                // TODO
+                        }.to "assays"
+                }
+        }
+
+        /**
+         * re-usable code for handling study 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 handleStudy(flow, flash, params) {
+                // create study instance if we have none
+                if (!flow.study) flow.study = new Study();
+
+                // 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())
+                }
+
+                // if a template is selected, get template instance
+                if (params.get('template')) {
+                        params.template = Template.findByName(params.get('template'))
+                }
+
+                // update study instance with parameters
+                params.each() {key, value ->
+                        if (flow.study.hasProperty(key)) {
+                                flow.study.setProperty(key, value);
+                        }
+                }
+
+                // validate study
+                if (flow.study.validate()) {
+                        return true
+                } else {
+                        // validation failed, feedback errors
+                        flash.errors = new LinkedHashMap()
+                        this.appendErrors(flow.study, flash.errors)
+                        return false
                 }
         }

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

@@ -34 +34 @@
                 The start date of the study     
         </wizard:dateElement>
-        <wizard:templateElement name="template" description="Template" value="${study?.template}">
-                The meta data template to use for this study
-        </wizard:templateElement>
 </wizard:pageContent>