Changeset 275

Timestamp:

Mar 17, 2010, 12:35:31 PM (11 years ago)

Author:

duh

Message:

• initial version of wizard storing data; known issue: while everything is saved properly, linked elements (subjects, events, etc) are not properly stored. I think it might be caused by the transaction in which everything is being done...
• added date/year select to datepickers
• added delete option to subjects view and controller logic

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (7 diffs)
• grails-app/views/wizard/pages/_done.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_error.gsp (added)
• grails-app/views/wizard/pages/_eventDescriptions.gsp (modified) (2 diffs)
• grails-app/views/wizard/pages/_events.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (3 diffs)
• web-app/js/wizard.js (modified) (2 diffs)

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

@@ -10 +10 @@
  * The wizard controller handles the handeling of pages and data flow
  * through the study capturing wizard.
+ *
+ * TODO: refactor the 'handle*' methods to work as subflows instead
+ *               of methods outside of the flow
  *
  * @author Jeroen Wesbeek
@@ -160 +163 @@
                         }.to "subjects"
                         on("next") {
-                                println params
                                 flash.errors = [:]
 
@@ -175 +177 @@
                                 }
                         }.to "eventDescriptions"
+                        on("delete") {
+                                flash.errors = [:]
+                                def delete = params.get('do') as int;
+
+                                // remove subject
+                                if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) {
+                                        flow.subjectTemplates.each() { templateName, templateData ->
+                                                templateData.subjects.remove(delete)
+                                        }
+
+                                        flow.subjects.remove( delete )
+                                }
+                        }.to "subjects"
                         on("previous") {
                                 flash.errors = [:]
@@ -306 +321 @@
 
                                 // instantiate Event with parameters
-                                def event = new Event(params)
+                                def event = (params.eventDescription.isSamplingEvent) ? new SamplingEvent(params) : new Event(params)
 
                                 // handle event groupings
@@ -392 +407 @@
                         on("next") {
                                 flash.values = params
-                                
                                 flash.errors = [:]
 
@@ -417 +431 @@
                         on("toSubjects").to "subjects"
                         on("toEvents").to "events"
-                        on("previous") {
-                                // do nothing
-                        }.to "events"
-                        on("next") {
-                                // store everything in the database!
+                        on("previous").to "events"
+                        on("next").to "save"
+                }
+
+                // store all study data
+                save {
+                        action {
+                                println "saving..."
+                                flash.errors = [:]
+
+                                // start transaction
+                                def transaction = sessionFactory.getCurrentSession().beginTransaction()
+
+                                // persist data to the database
+                                try {
+                                        // save EventDescriptions
+                                        flow.eventDescriptions.each() {
+                                                if (!it.validate() || !it.save()) {
+                                                        this.appendErrors(it, flash.errors)
+                                                        throw new Exception('error saving eventDescription')
+                                                }
+                                                println "saved eventdescription "+it
+                                        }
+
+                                        // save events
+                                        flow.events.each() {
+                                                if (!it.validate() || !it.save()) {
+                                                        this.appendErrors(it, flash.errors)
+                                                        throw new Exception('error saving event')
+                                                }
+                                                println "saved event "+it
+
+                                                // add to study
+                                                if (it instanceof SamplingEvent) {
+                                                        flow.study.addToSamplingEvents(it)
+                                                } else {
+                                                        flow.study.addToEvents(it)
+                                                }
+                                        }
+
+                                        // save eventGroups
+                                        flow.eventGroups.each() {
+                                                if (!it.validate() || !it.save()) {
+                                                        this.appendErrors(it, flash.errors)
+                                                        throw new Exception('error saving eventGroup')
+                                                }
+                                                println "saved eventGroup "+it
+
+                                                // add to study
+                                                flow.study.addToEventGroups(it)
+                                        }
+                                        
+                                        // save subjects
+                                        flow.subjects.each() {
+                                                if (!it.validate() || !it.save()) {
+                                                        this.appendErrors(it, flash.errors)
+                                                        throw new Exception('error saving subject')
+                                                }
+                                                println "saved subject "+it
+
+                                                // add this subject to the study
+                                                flow.study.addToSubjects(it)
+                                        }
+
+                                        // save study
+                                        if (!flow.study.validate() || !flow.study.save()) {
+                                                this.appendErrors(flow.study, flash.errors)
+                                                throw new Exception('error saving study')
+                                        }
+                                        println "saved study "+flow.study+" (id: "+flow.study.id+")"
+
+                                } catch (Exception e) {
+                                        // rollback
+                                        println "rollback"
+                                        transaction.rollback()
+                                        error()
+                                }
+
+                                // commit transaction
+                                println "commit"
+                                transaction.commit()
                                 success()
-                        }.to "confirm"
+                        }
+                        on("error").to "error"
+                        on(Exception).to "error"
+                        on("success").to "done"
+                }
+
+                // error storing data
+                error {
+                        render(view: "_error")
+                        onRender {
+                                flow.page = 6
+                        }
+                        on("next").to "save"
+                        on("previous").to "events"
                 }
 
@@ -430 +533 @@
                         render(view: "_done")
                         onRender {
-                                flow.page = 6
+                                flow.page = 7
                         }
                         on("previous") {

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

@@ -16 +16 @@
 %>
 <wizard:pageContent>
-You are done!
 
         <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>persist the data to the database :) nothing is currently being saved...</li>
-                </ul>
+                <span class="todo">Finished!</span>
+                The study you have just created has been properly saved.
         </span>
+
 </wizard:pageContent>

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

@@ -45 +45 @@
                         <div class="column">protocol</div>
                         <div class="column">sampling event</div>
-                        <div class="column">protocol</div>
                 </div>
         <g:each var="eventDescription" status="i" in="${eventDescriptions}">
@@ -57 +56 @@
                         <div class="column"><wizard:protocolSelect name="eventDescription_${i}_protocol" value="${eventDescription.protocol}" /></div>
                         <div class="column"><g:checkBox name="eventDescription_${i}_isSamplingEvent" value="${eventDescription.isSamplingEvent}" /></div>
-                        <div class="column"><g:if test="${eventDescription.protocol}">${eventDescription.protocol}</g:if><g:else>-</g:else></div>
                 </div>
         </g:each>

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

@@ -79 +79 @@
         </div>
         <div class="sliderContainer">
-                <div class="slider"/>
+                <div class="slider"></div>
         </div>
 </g:if>
 
-        <span class="info">
-                <span class="todo">TODO</span>
-                <ul>
-                        <li>parameter values should still be asked and implemented</li>
-                </ul>
-        </span>
+<span class="info">
+        <span class="todo">TODO</span>
+        <ul>
+                <li>parameter values should still be asked and implemented</li>
+        </ul>
+</span>
+        
 </wizard:pageContent>

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

@@ -19 +19 @@
                 <span class="title">Add subjects to your study</span>
                 In this screen you can add subjects to your study based on a given template. Note that the 'species' select will probably
-                move to the template as an ontology reference and will not be asked anymore.
+                move to the template as an ontology reference and will not be asked anymore.<br/>
+                <i>Note that you can edit multiple subjects at once by selecting multpiple rows by either ctrl-clicking them or dragging a selection over them.</i>
         </span>
 
@@ -36 +37 @@
                         <div class="header">
                                 <div class="firstColumn">#</div>
+                                <div class="firstColumn"></div>
                                 <div class="column">name</div>
                                 <div class="column">species</div>
@@ -42 +44 @@
                 <g:each var="subjectId" in="${subjectTemplate.getValue().subjects}">
                         <div class="row">
-                                <div class="firstColumn">${subjectId}</div>
+                                <div class="firstColumn">${subjectId + 1}</div>
+                                <div class="firstColumn">
+                                        <wizard:ajaxButton name="delete" src="../images/icons/famfamfam/delete.png" alt="delete this subject" class="famfamfam" value="-" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" before="\$(\'input[name=do]\').val(${subjectId});" afterSuccess="onWizardPage()" />
+                                </div>
                                 <div class="column"><g:textField name="subject_${subjectId}_name" value="${subjects[ subjectId ].name}" size="12" maxlength="12" /></div>
                                 <div class="column">

trunk/web-app/js/wizard.js

@@ -143 +143 @@
     $('div#wizard').find("input[type=text][rel$='date']").each(function() {
         $(this).datepicker({
+            changeMonth : true,
+            changeYear  : true,
             dateFormat  : 'dd/mm/yy',
             altField    : '#' + $(this).attr('name') + 'Example',
@@ -154 +156 @@
     $('div#wizard').find("input[type=text][rel$='datetime']").each(function() {
         $(this).datepicker({
+            changeMonth     : true,
+            changeYear      : true,
             dateFormat      : 'dd/mm/yy',
             altField        : '#' + $(this).attr('name') + 'Example',