Changeset 823

Timestamp:

Aug 17, 2010, 4:34:30 PM (13 years ago)

Author:

duh

Message:

• added assay and assayGroups pages to the wizard (not yet functional)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (5 diffs)
• views/wizard/pages/_assay_groups.gsp (added)
• views/wizard/pages/_assays.gsp (added)
• views/wizard/pages/_subjects.gsp (modified) (1 diff)

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

@@ -80 +80 @@
                                 [title: 'Subjects'],                    // subjects
                                 [title: 'Events'],                              // events and event grouping
-                                [title: 'Groups'],                              // groups
+                                //[title: 'Event Groups'],              // groups
                                 [title: 'Samples'],                             // samples
+                                [title: 'Assays'],                              // assays
+                                //[title: 'Assay Groups'],              // assays
                                 [title: 'Confirmation'],                // confirmation page
                                 [title: 'Done']                                 // finish page
@@ -457 +459 @@
                         render(view: "_groups")
                         onRender {
-                                flow.page = 5
+                                flow.page = 4
                                 success()
                         }
@@ -478 +480 @@
                         render(view: "_samples_previous_warning")
                         onRender {
-                                flow.page = 6
+                                flow.page = 5
 
                                 // TEMPORARY FIX TO REMOVE ALL SAMPLES AND REGENERATE THEM
@@ -501 +503 @@
                         render(view: "_samples")
                         onRender {
-                                flow.page = 6
+                                flow.page = 5
 
                                 // got samples?
@@ -597 +599 @@
                                 // handle form data
                                 samplePage(flow, flash, params) ? success() : error()
-                        }.to "confirm"
+                        }.to "assays"
                         on("quickSave") {
                                 // handle form data
                                 samplePage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                }
+
+                assays {
+                        render(view: "_assays")
+                        onRender {
+                                flow.page = 6
+                        }
+                        on("previous") {
+                        }.to "samples"
+                        on("next") {
+                        }.to "assayGroups"
+                }
+
+                assayGroups {
+                        render(view: "_assay_groups")
+                        onRender {
+                                flow.page = 6
+                        }
+                        on("previous") {
+                        }.to "assays"
+                        on("next") {
+                        }.to "confirm"
                 }
 

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

@@ -25 +25 @@
         </span>
 
-        <wizard:textFieldElement name="addNumber" description="Number of subjects to add" error="addNumber" value="${values.addNumber}" size="4" maxlength="4">
+        <wizard:textFieldElement name="addNumber" description="Number of subjects to add" error="addNumber" value="${values?.addNumber}" size="4" maxlength="4">
                 The number of subjects to add to your study
         </wizard:textFieldElement>
-        <wizard:termElement name="species" description="of species" value="${values.species}" ontologies="1132" addDummy="true">
+        <wizard:termElement name="species" description="of species" value="${values?.species}" ontologies="1132" addDummy="true">
                 The species of the subjects you would like to add to your study
         </wizard:termElement>
-        <wizard:templateElement name="template" description="with template" value="${values.template}" error="template" entity="${dbnp.studycapturing.Subject}" ontologies="1132" addDummy="true">
+        <wizard:templateElement name="template" description="with template" value="${values?.template}" error="template" entity="${dbnp.studycapturing.Subject}" ontologies="1132" addDummy="true">
                 The template to use for these subjects
         </wizard:templateElement>