Changeset 578

Timestamp:

Jun 17, 2010, 2:57:04 PM (13 years ago)

Author:

duh

Message:

• added logic to immediately edit or create a study (and hence skip the main wizard page)
• the final wizard page now allows you to immediately edit the study, create a new study or show the study
• the show study page's edit button now immediately makes you edit the study in the wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (6 diffs)
• views/study/show.gsp (modified) (1 diff)
• views/wizard/pages/_done.gsp (modified) (1 diff)

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

@@ -28 +28 @@
          */
         def index = {
+                def jump = [:]
+
+                // allow quickjumps to:
+                //      edit a study    : /wizard?jump=edit&id=1
+                //      create a study  : /wizard?jump=create
+                if (params.get('jump')) {
+                        switch (params.get('jump')) {
+                                case 'create':
+                                        jump = [
+                                            action: 'create'
+                                        ]
+                                        break
+                                case 'edit':
+                                        jump = [
+                                            action      : 'edit',
+                                                id              : params.get('id')
+                                        ]
+                                        break
+                                default:
+                                        break
+                        }
+                }
+
+                // store in session
+                session.jump = jump
+
                 /**
                  * Do you believe it in your head?
@@ -59 +85 @@
                                 [title: 'Done']                                 // finish page
                         ]
+                        flow.jump = session.jump
                         success()
                 }
@@ -72 +99 @@
                                 success()
                         }
-                        on("next").to "start"
+                        on("next").to "handleJump"
+                }
+
+                // handle the jump parameter
+                //
+                // I came to get down [2x]
+                // So get out your seats and jump around
+                // Jump around [3x]
+                // Jump up Jump up and get down
+                // Jump [18x]
+                handleJump {
+                        action {
+                                if (flow.jump && flow.jump.action == 'edit' && flow.jump.id) {
+                                        // load study
+                                        if (this.loadStudy(flow, flash, [studyid:flow.jump.id])) {
+                                                toStudyPage()
+                                        } else {
+                                                toStartPage()
+                                        }
+                                } else if (flow.jump && flow.jump.action == 'create') {
+                                        toStudyPage()
+                                } else {
+                                        toStartPage()
+                                }
+                        }
+                        on("toStartPage").to "start"
+                        on("toStudyPage").to "study"
                 }
 
@@ -91 +144 @@
                                 flow.remove('eventGroups')
                                 flow.remove('eventTemplates')
+                                println flow
 
                                 // set 'quicksave' variable
@@ -123 +177 @@
                         on("next") {
                                 // load study
-                                try {
-                                        // load study
-                                        flow.study = Study.findByTitle(params.study)
-
-                                        // recreate subjects
-                                        flow.subjects = [:]
-                                        flow.subjectTemplates = [:]
-                                        flow.study.subjects.each() { subject ->
-                                                def subjectIncrement = flow.subjects.size()
-                                                flow.subjects[ subjectIncrement ] = subject
-
-                                                // add subject template?
-                                                if (!flow.subjectTemplates[ subject.template.name ]) {
-                                                        flow.subjectTemplates[ subject.template.name ] = [
-                                                                name: subject.template.name,
-                                                                template: subject.template,
-                                                                subjects: [:]
-                                                        ]
-                                                }
-
-                                                // reference subject in template
-                                                flow.subjectTemplates[ subject.template.name ].subjects[ flow.subjectTemplates[ subject.template.name ].subjects.size() ] = subjectIncrement
-                                        }
-
-                                        // recreate events
-                                        flow.events = []
-                                        flow.eventGroups = []
-                                        flow.eventTemplates     = [:]
-                                        flow.study.events.each() { event ->
-                                                def eventIncrement = flow.events.size()
-                                                flow.events[ eventIncrement ] = event
-
-                                                // add event template?
-                                                if (!flow.eventTemplates[ event.template.name ]) {
-                                                        flow.eventTemplates[ event.template.name ] = [
-                                                                name: event.template.name,
-                                                                template: event.template,
-                                                                events: new ArrayList()
-                                                        ]
-                                                }
-
-                                                // reference event in template
-                                                flow.eventTemplates[ event.template.name ].events[ flow.eventTemplates[ event.template.name ].events.size() ] = eventIncrement
-
-                                                // set dummy event
-                                                flow.event = event
-                                        }
-
-                                        // recreate sample events
-                                        flow.study.samplingEvents.each() { event ->
-                                                def eventIncrement = flow.events.size()
-                                                flow.events[ eventIncrement ] = event
-
-                                                // add event template?
-                                                if (!flow.eventTemplates[ event.template.name ]) {
-                                                        flow.eventTemplates[ event.template.name ] = [
-                                                                name: event.template.name,
-                                                                template: event.template,
-                                                                events: new ArrayList()
-                                                        ]
-                                                }
-
-                                                // reference event in template
-                                                flow.eventTemplates[ event.template.name ].events[ flow.eventTemplates[ event.template.name ].events.size() ] = eventIncrement
-
-                                                // set dummy event
-                                                flow.event = event
-                                        }
-
-                                        // recreate eventGroups
-                                        flow.study.eventGroups.each() { eventGroup ->
-                                                flow.eventGroups[ flow.eventGroups.size() ] = eventGroup
-                                        }
-
-                                        // set 'quicksave' variable
-                                        flow.quickSave = true
-
+                                if (this.loadStudy(flow, flash, params)) {
                                         success()
-                                } catch (Exception e) {
-                                        // rollback
-                                        this.appendErrorMap(['exception': e.toString() + ', see log for stacktrace' ], flash.errors)
-
+                                } else {
                                         error()
                                 }
@@ -784 +759 @@
                                 flow.page = 8
                         }
+                        onEnd {
+                                // clean flow scope
+                                flow.clear()
+                        }
+                }
+        }
+
+        /**
+         * load a study
+         * @param Map LocalAttributeMap (the flow scope)
+         * @param Map localAttributeMap (the flash scope)
+         * @param Map GrailsParameterMap (the flow parameters = form data)
+         * @returns boolean
+         */
+        def loadStudy(flow, flash, params) {
+                // load study
+                try {
+                        // load study
+                        flow.study = (params.studyid) ? Study.findById( params.studyid ) : Study.findByTitle( params.study )
+
+                        // recreate subjects
+                        flow.subjects = [:]
+                        flow.subjectTemplates = [:]
+                        flow.study.subjects.each() { subject ->
+                                def subjectIncrement = flow.subjects.size()
+                                flow.subjects[subjectIncrement] = subject
+
+                                // add subject template?
+                                if (!flow.subjectTemplates[subject.template.name]) {
+                                        flow.subjectTemplates[subject.template.name] = [
+                                                name: subject.template.name,
+                                                template: subject.template,
+                                                subjects: [:]
+                                        ]
+                                }
+
+                                // reference subject in template
+                                flow.subjectTemplates[subject.template.name].subjects[flow.subjectTemplates[subject.template.name].subjects.size()] = subjectIncrement
+                        }
+
+                        // recreate events
+                        flow.events = []
+                        flow.eventGroups = []
+                        flow.eventTemplates = [:]
+                        flow.study.events.each() { event ->
+                                def eventIncrement = flow.events.size()
+                                flow.events[eventIncrement] = event
+
+                                // add event template?
+                                if (!flow.eventTemplates[event.template.name]) {
+                                        flow.eventTemplates[event.template.name] = [
+                                                name: event.template.name,
+                                                template: event.template,
+                                                events: new ArrayList()
+                                        ]
+                                }
+
+                                // reference event in template
+                                flow.eventTemplates[event.template.name].events[flow.eventTemplates[event.template.name].events.size()] = eventIncrement
+
+                                // set dummy event
+                                flow.event = event
+                        }
+
+                        // recreate sample events
+                        flow.study.samplingEvents.each() { event ->
+                                def eventIncrement = flow.events.size()
+                                flow.events[eventIncrement] = event
+
+                                // add event template?
+                                if (!flow.eventTemplates[event.template.name]) {
+                                        flow.eventTemplates[event.template.name] = [
+                                                name: event.template.name,
+                                                template: event.template,
+                                                events: new ArrayList()
+                                        ]
+                                }
+
+                                // reference event in template
+                                flow.eventTemplates[event.template.name].events[flow.eventTemplates[event.template.name].events.size()] = eventIncrement
+
+                                // set dummy event
+                                flow.event = event
+                        }
+
+                        // recreate eventGroups
+                        flow.study.eventGroups.each() { eventGroup ->
+                                flow.eventGroups[flow.eventGroups.size()] = eventGroup
+                        }
+
+                        // set 'quicksave' variable
+                        flow.quickSave = true
+
+                        return true
+                } catch (Exception e) {
+                        // rollback
+                        this.appendErrorMap(['exception': e.toString() + ', see log for stacktrace'], flash.errors)
+
+                        return false
                 }
         }

trunk/grails-app/views/study/show.gsp

@@ -841 +841 @@
           <g:set var="studyInstance" value="${studyList[0]}" />
           <g:hiddenField name="id" value="${studyInstance?.id}" />
-          <span class="button"><g:actionSubmit class="edit" action="edit" value="${message(code: 'default.button.edit.label', default: 'Edit')}" /></span>
+          <span class="button"><g:link class="edit" controller="wizard" params="[jump:'edit']" id="${studyInstance?.id}">${message(code: 'default.button.edit.label', default: 'Edit')}</g:link></span>
           <span class="button"><g:actionSubmit class="delete" action="delete" value="${message(code: 'default.button.delete.label', default: 'Delete')}" onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');" /></span>
         </g:if>

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

@@ -18 +18 @@
 
         <span class="info">
-                <span class="todo">Finished!</span>
-                The study you have just created has been properly saved.
+                <span class="todo">Done!</span>
+                <g:if test="${quickSave}">
+                        Your modifications you have made to this study have been saved.
+                </g:if>
+                <g:else>
+                        The study you just created has been saved.
+                </g:else>
+
+                You can now <g:link controller="study" action="show" id="${study.id}">view the study</g:link>,
+                <g:link controller="wizard" params="[jump:'edit']" id="${study.id}">edit the study</g:link>
+                <g:if test="${quickSave}"> again</g:if> or
+                <g:link controller="wizard" params="[jump:'create']">create a new study</g:link>.
+
         </span>