Changeset 1309

Timestamp:

21-12-10 16:42:03 (6 years ago)

Author:

work@…

Message:

• adding feature #208, clickable breadcrumbs / tabs as subtask of #183

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/StudyWizardController.groovy (modified) (11 diffs)
• views/studyWizard/common/_tabs.gsp (modified) (1 diff)

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

@@ -271 +271 @@
                                 studyPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                        on("toPageTwo") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageThree") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "events"
+                        on("toPageFour") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageFive") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
+                                studyPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
                 }
 
@@ -330 +348 @@
                         on("quickSave") {
                                 // handle form data
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
+                        on("toPageOne") {
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageThree") {
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "events"
+                        on("toPageFour") {
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageFive") {
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                subjectPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
                                 subjectPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
@@ -538 +574 @@
                                 eventPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                        on("toPageOne") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageFour") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageFive") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
                 }
 
@@ -580 +634 @@
                         on("next").to "groups"
                         on("previous").to "events"
+                        on("toPageOne") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageFour") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageFive") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
+                                eventPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
                 }
 
@@ -604 +676 @@
                                 groupPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                        on("toPageOne") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageFour") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageFive") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
+                                groupPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
                 }
 
@@ -617 +707 @@
                         on("next").to "samples"
                         on("previous").to "groups"
+                        on("toPageOne").to "study"
+                        on("toPageTwo").to "subjects"
+                        on("toPageThree").to "events"
+                        on("toPageFive").to "assays"
+                        on("toPageSix").to "confirm"
+                        on("toPageSeven").to "waitForSave"
                 }
 
@@ -681 +777 @@
                         on("quickSave") {
                                 // handle form data
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
+                        on("toPageOne") {
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageThree") {
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "events"
+                        on("toPageFive") {
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "assays"
+                        on("toPageSix") {
+                                samplePage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
                                 samplePage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
@@ -792 +906 @@
                                 assayPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
+                        on("toPageOne") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageThree") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "events"
+                        on("toPageFour") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageSix") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
+                                assayPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
                 }
 
@@ -838 +970 @@
                         on("quickSave") {
                                 // handle form data
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "waitForSave"
+                        on("toPageOne") {
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "study"
+                        on("toPageTwo") {
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "subjects"
+                        on("toPageThree") {
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "events"
+                        on("toPageFour") {
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "samples"
+                        on("toPageSix") {
+                                assayGroupPage(flow, flash, params) ? success() : error()
+                        }.to "confirm"
+                        on("toPageSeven") {
                                 assayGroupPage(flow, flash, params) ? success() : error()
                         }.to "waitForSave"
@@ -881 +1031 @@
                         on("next").to "waitForSave"
                         on("quickSave").to "waitForSave"
+                        on("toPageOne").to "study"
+                        on("toPageTwo").to "subjects"
+                        on("toPageThree").to "events"
+                        on("toPageFour").to "samples"
+                        on("toPageFive").to "assays"
+                        on("toPageSeven").to "waitForSave"
                 }
 
@@ -944 +1100 @@
                         on("next").to "waitForSave"
                         on("previous").to "samples"
-                }
+                        on("toPageOne").to "study"
+                        on("toPageTwo").to "subjects"
+                        on("toPageThree").to "events"
+                        on("toPageFour").to "samples"
+                        on("toPageFive").to "assays"
+                        on("toPageSix").to "confirm"
+                        on("toPageSeven").to "waitForSave"              }
 
                 // render finish page

trunk/grails-app/views/studyWizard/common/_tabs.gsp

@@ -13 +13 @@
  * $Author:  duh $
  * $Date:  2010-12-08 15:12:54 +0100 (Wed, 08 Dec 2010) $
- *
- * clickable="true"
  */
 %>
-<af:tabs pages="${pages}" page="${page}" />
+<af:tabs pages="${pages}" page="${page}" clickable="${study && study.getFieldValue('title')}" />