Changeset 1150

Timestamp:

16-11-10 18:48:08 (3 years ago)

Author:

work@…

Message:

- resolves issue #180

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (16 diffs)
• views/common/_topnav.gsp (modified) (1 diff)

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

@@ -85 +85 @@
                                 //[title: 'Templates'],                 // templates
                                 [title: 'Start'],                               // load or create a study
-                                [title: 'Study'],                               // study
                                 [title: 'Subjects'],                    // subjects
                                 [title: 'Events'],                              // events and event grouping
@@ -121 +120 @@
                 handleJump {
                         action {
-                                if (flow.jump && flow.jump.action == 'edit' && flow.jump.id) {
-                                        // load study
-                                        if (this.loadStudy(flow, flash, [studyid:flow.jump.id],authenticationService.getLoggedInUser())) {
-                                                toStudyPage()
+                                if (flow.jump && flow.jump.action == 'edit') {
+                                        if (flow.jump.id) {
+                                                // load study
+                                                if (this.loadStudy(flow, flash, [studyid:flow.jump.id],authenticationService.getLoggedInUser())) {
+                                                        toStudyPage()
+                                                } else {
+                                                        toStartPage()
+                                                }
                                         } else {
-                                                toStartPage()
+                                                toModifyPage()
                                         }
                                 } else if (flow.jump && flow.jump.action == 'create') {
@@ -136 +139 @@
                         on("toStartPage").to "start"
                         on("toStudyPage").to "study"
+                        on("toModifyPage").to "modify"
                 }
 
@@ -192 +196 @@
                         render(view: "_study")
                         onRender {
-                                flow.page = 2
+                                flow.page = 1
                                 success()
                         }
@@ -236 +240 @@
                         render(view: "_subjects")
                         onRender {
-                                flow.page = 3
+                                flow.page = 2
 
                                 if (!flash.values || !flash.values.addNumber) flash.values = [addNumber:1]
@@ -294 +298 @@
                         render(view: "_events")
                         onRender {
-                                flow.page = 4
+                                flow.page = 3
 
                                 // add initial eventGroup to study
@@ -492 +496 @@
                         render(view: "_unassigned_samplingEvent_warning")
                         onRender {
-                                flow.page = 4
+                                flow.page = 3
                                 success()
                         }
@@ -503 +507 @@
                         render(view: "_groups")
                         onRender {
-                                flow.page = 4
+                                flow.page = 3
                                 success()
                         }
@@ -524 +528 @@
                         render(view: "_samples_previous_warning")
                         onRender {
-                                flow.page = 5
+                                flow.page = 4
 
                                 // TEMPORARY FIX TO REMOVE ALL SAMPLES AND REGENERATE THEM
@@ -547 +551 @@
                         render(view: "_samples")
                         onRender {
-                                flow.page = 5
+                                flow.page = 4
                                 success()
                         }
@@ -610 +614 @@
                         render(view: "_assays")
                         onRender {
-                                flow.page = 6
+                                flow.page = 5
                         }
                         on("refresh") {
@@ -724 +728 @@
                         render(view: "_assay_groups")
                         onRender {
-                                flow.page = 6
+                                flow.page = 5
                         }
                         on("previous") {
@@ -766 +770 @@
                         render(view: "_confirmation")
                         onRender {
-                                flow.page = 7
+                                flow.page = 6
                         }
                         on("toStudy").to "study"
@@ -783 +787 @@
                         render(view: "_wait")
                         onRender {
-                                flow.page = 8
+                                flow.page = 7
                         }
                         on("next").to "save"
@@ -828 +832 @@
                         render(view: "_error")
                         onRender {
-                                flow.page = 7
+                                flow.page = 6
                         }
                         on("next").to "waitForSave"
@@ -838 +842 @@
                         render(view: "_done")
                         onRender {
-                                flow.page = 8
+                                flow.page = 7
                         }
                         onEnd {

trunk/grails-app/views/common/_topnav.gsp

@@ -5 +5 @@
       <a href="#">Studies</a>
       <ul class="subnav">
-        <li><g:link controller="study" action="list">View studies</g:link></li>
-                <li><g:link controller="wizard" action="index">Create/edit study</g:link></li>
+            <sec:ifLoggedIn>
+                <li><g:link controller="study" action="myStudies">My studies</g:link></li>
+                <li><g:link controller="study" action="list">All studies</g:link></li>
+            </sec:ifLoggedIn>
+                <sec:ifNotLoggedIn>
+                <li><g:link controller="study" action="list">View studies</g:link></li>
+                </sec:ifNotLoggedIn>
+                <li><g:link controller="wizard" action="index" params="[jump:'create']">Create a new study</g:link></li>
+                <li><g:link controller="wizard" action="index" params="[jump:'edit']">Edit a study</g:link></li>
                 <li><g:link controller="importer" action="index">Import study data</g:link></li>
         <li><g:link controller="simpleQuery" action="index">Search study data</g:link></li>
         <li><g:link controller="exporter" action="index">Export as SimpleTox</g:link></li>
-                <sec:ifLoggedIn>
-                         <li><g:link controller="study" action="myStudies">My studies</g:link></li>
-                </sec:ifLoggedIn>
       </ul>
      </li>