Changeset 1640

Timestamp:

Mar 17, 2011, 3:16:24 PM (9 years ago)

Author:

work@…

Message:

• added simple study support (study page)

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (6 diffs)
• views/studyWizard/pages/_done.gsp (modified) (1 diff)

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

@@ -50 +50 @@
                                         ]
                                         break
+                                case 'simpleedit':
+                                        jump = [
+                                            action      : 'simpleedit',
+                                                id              : params.get('id')
+                                        ]
+                                        break
                                 default:
                                         break
@@ -86 +92 @@
                         // define flow variables
                         flow.page = 0
-                        flow.pages = [
-                                //[title: 'Templates'],                 // templates
-                                [title: 'Start'],                               // load or create a study
-                                [title: 'Subjects'],                    // subjects
-                                [title: 'Events'],                              // events and event grouping
-                                //[title: 'Event Groups'],              // groups
-                                [title: 'Samples'],                             // samples
-                                [title: 'Assays'],                              // assays
-                                //[title: 'Assay Groups'],              // assays
-                                [title: 'Confirmation'],                // confirmation page
-                                [title: 'Done']                                 // finish page
-                        ]
+
+                        if (session.jump && session.jump?.action == 'simpleedit') {
+                                flow.pages = [
+                                    [title: 'Start'],
+                                        [title: 'Done']
+                                ]
+                        } else {
+                                flow.pages = [
+                                        //[title: 'Templates'],                 // templates
+                                        [title: 'Start'],                               // load or create a study
+                                        [title: 'Subjects'],                    // subjects
+                                        [title: 'Events'],                              // events and event grouping
+                                        //[title: 'Event Groups'],              // groups
+                                        [title: 'Samples'],                             // samples
+                                        [title: 'Assays'],                              // assays
+                                        //[title: 'Assay Groups'],              // assays
+                                        [title: 'Confirmation'],                // confirmation page
+                                        [title: 'Done']                                 // finish page
+                                ]
+                        }
                         flow.jump = session.jump
 
@@ -132 +146 @@
                                 if (pluginManager.getGrailsPlugin('grom')) "entering handleJump".grom()
 
-                                if (flow.jump && flow.jump.action == 'edit') {
+                                if (flow.jump && flow.jump.action =~ 'edit') {
                                         if (flow.jump.id) {
                                                 // load study
@@ -266 +280 @@
                         on("next") {
                                 studyPage(flow, flash, params) ? success() : error()
-                        }.to "subjects"
+                        }.to "studyNext"
                         on("quickSave") {
                                 studyPage(flow, flash, params) ? success() : error()
@@ -272 +286 @@
                         on("toPageTwo") {
                                 studyPage(flow, flash, params) ? success() : error()
-                        }.to "subjects"
+                        }.to "studyNext"
                         on("toPageThree") {
                                 studyPage(flow, flash, params) ? success() : error()
@@ -288 +302 @@
                                 studyPage(flow, flash, params) ? success() : error()
                         }.to "save"
+                }
+
+                // handle the second tab click on the study page
+                studyNext {
+                        action {
+                                if (session.jump?.action == 'simpleedit') {
+                                        toSave()
+                                } else {
+                                        toPageTwo()
+                                }
+                        }
+                        on("toSave").to "save"
+                        on("toPageTwo").to "subjects"
                 }
 

trunk/grails-app/views/studyWizard/pages/_done.gsp

@@ -27 +27 @@
 
                 You can now <g:link controller="study" action="show" id="${study.id}">view the study</g:link>,
-                <g:link controller="studyWizard" params="[jump:'edit']" id="${study.id}">edit the study</g:link>
+                <g:link controller="studyWizard" params="[jump:((session.jump?.action == 'simpleedit') ? 'simpleedit' : 'edit')]" id="${study.id}">edit the study</g:link>
                 <g:if test="${quickSave}"> again</g:if> or
                 <g:link controller="studyWizard" params="[jump:'create']">create a new study</g:link>.