Changeset 533

Timestamp:

Jun 4, 2010, 3:33:43 PM (9 years ago)

Author:

duh

Message:

• adding 'quicksave' option in the 'edit study' wizard

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (9 diffs)
• views/wizard/common/_navigation.gsp (modified) (1 diff)

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

@@ -91 +91 @@
                                 flow.remove('eventGroups')
                                 flow.remove('eventTemplates')
+
+                                // set 'quicksave' variable
+                                flow.quickSave = false
                         }.to "study"
                         on("modify").to "modify"
@@ -111 +114 @@
                                 // load study
                                 try {
+                                        // load study
                                         flow.study = Study.findByTitle(params.study)
 
@@ -183 +187 @@
                                         }
 
+                                        // set 'quicksave' variable
+                                        flow.quickSave = true
+
                                         success()
                                 } catch (Exception e) {
@@ -242 +249 @@
                                 }
                         }.to "subjects"
+                        on("quickSave") {
+                                flash.errors = [:]
+
+                                if (this.handleStudy(flow, flash, params)) {
+                                        success()
+                                } else {
+                                        error()
+                                }
+                        }.to "waitForSave"
                 }
 
@@ -299 +315 @@
                                 success()
                         }.to "subjects"
+                        on("delete") {
+                                // handle subjects
+                                this.handleSubjects(flow, flash, params)
+
+                                flash.errors = [:]
+                                def delete = params.get('do') as int;
+
+                                // remove subject
+                                if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) {
+                                        // remove subject from templates
+                                        flow.subjectTemplates.each() { templateName, templateData ->
+                                                templateData.subjects.remove( delete )
+                                        }
+
+                                        // remove subject altogether
+                                        flow.subjects.remove( delete )
+                                }
+                        }.to "subjects"
+                        on("previous") {
+                                flash.errors = [:]
+
+                                // handle form data
+                                if (!this.handleSubjects(flow, flash, params)) {
+                                        error()
+                                } else {
+                                        success()
+                                }
+                        }.to "study"
                         on("next") {
                                 flash.errors = [:]
@@ -314 +358 @@
                                 }
                         }.to "events"
-                        on("delete") {
-                                // handle subjects
-                                this.handleSubjects(flow, flash, params)
-
-                                flash.errors = [:]
-                                def delete = params.get('do') as int;
-
-                                // remove subject
-                                if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) {
-                                        // remove subject from templates
-                                        flow.subjectTemplates.each() { templateName, templateData ->
-                                                templateData.subjects.remove( delete )
-                                        }
-
-                                        // remove subject altogether
-                                        flow.subjects.remove( delete )
-                                }
-                        }.to "subjects"
-                        on("previous") {
-                                flash.errors = [:]
-
-                                // handle form data
-                                if (!this.handleSubjects(flow, flash, params)) {
+                        on("quickSave") {                               
+                                flash.errors = [:]
+
+                                // check if we have at least one subject
+                                // and check form data
+                                if (flow.subjects.size() < 1) {
+                                        // append error map
+                                        this.appendErrorMap(['subjects': 'You need at least to create one subject for your study'], flash.errors)
+                                        error()
+                                } else if (!this.handleSubjects(flow, flash, params)) {
                                         error()
                                 } else {
                                         success()
                                 }
-                        }.to "study"
+                        }.to "waitForSave"
                 }
 
@@ -497 +528 @@
                                 }
                         }.to "groups"
+                        on("quickSave") {
+                                flash.values = params
+                                flash.errors = [:]
+
+                                // handle study data
+                                if (flow.events.size() < 1) {
+                                        // append error map
+                                        this.appendErrorMap(['events': 'You need at least to create one event for your study'], flash.errors)
+                                        error()
+                                } else if (this.handleEvents(flow, flash, params)) {
+                                        success()
+                                } else {
+                                        error()
+                                }
+                        }.to "waitForSave"
                 }
 
@@ -514 +560 @@
                                 success()
                         }.to "samples"
+                        on("quickSave") {
+                                this.handleSubjectGrouping(flow, flash, params)
+                                success()
+                        }.to "waitForSave"
                 }
 
@@ -547 +597 @@
                                 success()
                         }.to "confirm"
+                        on("quickSave") {
+                                success()
+                        }.to "waitForSave"
                 }
 

trunk/grails-app/views/wizard/common/_navigation.gsp

@@ -19 +19 @@
                 [ <wizard:ajaxButton name="cancel" value="cancel" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /> ]
           </g:if>
+          <g:if test="${quickSave && page<pages.size}">
+                  [ <wizard:ajaxButton name="quickSave" value="quick save" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" class="prevnext" /> ]           
+          </g:if>
       <g:elseif test="${page>1 && page<pages.size}">
                   |