Changeset 509 for trunk

Timestamp:

Jun 2, 2010, 4:22:42 PM (12 years ago)

Author:

duh

Message:

• wizard saving initial version
• removed main transaction as it resulted in continuous errors and exceptions...

Location:

trunk

Files:

• grails-app/conf/DataSource.groovy (modified) (1 diff)
• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (22 diffs)
• grails-app/views/wizard/pages/_confirmation.gsp (modified) (2 diffs)
• grails-app/views/wizard/pages/_samples.gsp (modified) (1 diff)
• web-app/css (modified) (1 prop)

trunk/grails-app/conf/DataSource.groovy

@@ -64 +64 @@
                         url = "jdbc:postgresql://localhost:5432/gscf"
                         dialect = org.hibernate.dialect.PostgreSQLDialect
-                        logSql = true   // enable logging while not yet final
+                        //logSql = true // enable logging while not yet final
 
                         /* Apparently Hibernate performs two queries on inserting, one before

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

@@ -62 +62 @@
                                 [title: 'Done']                                 // finish page
                         ]
+                        success()
                 }
 
@@ -72 +73 @@
                         onRender {
                                 flow.page = 1
+                                success()
                         }
                         on("next").to "start"
@@ -81 +83 @@
                         onRender {
                                 flow.page = 1
+                                success()
                         }
                         on("next").to "study"
@@ -92 +95 @@
                                 flow.page = 1
                                 flash.cancel = true
+                                success()
                         }
                         on("cancel") {
                                 flow.study = null
+
+                                success()
                         }.to "start"
                         on("next") {
@@ -105 +111 @@
                                         flash.errors
                                 )
+
+                                error()
                         }.to "modify"
                 }
@@ -115 +123 @@
                         onRender {
                                 flow.page = 2
+                                success()
                         }
                         on("refresh") {
@@ -123 +132 @@
 
                                 // remove errors as we don't want any warnings now
-                                flash.errors = [:]                              
+                                flash.errors = [:]
+
+                                success()
                         }.to "study"
                         on("switchTemplate") {
@@ -133 +144 @@
                                 // remove errors as we don't want any warnings now
                                 flash.errors = [:]
+
+                                success()
                         }.to "study"
                         on("previous") {
@@ -166 +179 @@
                                         flow.subjectTemplates = [:]
                                 }
+                                success()
                         }
                         on("refresh") {
                                 flash.values = params
+                                success()
                         }.to "subjects"
                         on("add") {
@@ -205 +220 @@
                                         flow.subjectTemplates[ subjectTemplateName ].subjects[ subjectsSize ] = increment
                                 }
+
+                                success()
                         }.to "subjects"
                         on("next") {
@@ -268 +285 @@
                                         flash.values.templateType = (flow.event instanceof Event) ? 'event' : 'sample'
                                 }
+                                success()
                         }
                         on("switchTemplate") {
@@ -330 +348 @@
                                         flow.events.remove(delete)
                                 }
+
+                                success()
                         }.to "events"
                         on("addEventGroup") {
                                 flash.values = params
                                 
+                                // handle study data
+                                this.handleEvents(flow, flash, params)
+
                                 // handle event groupings
                                 this.handleEventGrouping(flow, flash, params)
@@ -361 +384 @@
 
                                 flow.eventGroups[increment] = new EventGroup( name: groupName )
+
+                                success()
                         }.to "events"
                         on("deleteEventGroup") {
                                 flash.values = params
-
                                 def delete = params.get('do') as int;
 
@@ -375 +399 @@
                                         flow.eventGroups.remove(delete)
                                 }
+
+                                success()
                         }.to "events"
                         on("previous") {
@@ -402 +428 @@
                         onRender {
                                 flow.page = 5
+                                success()
                         }
                         on("previous") {
                                 this.handleSubjectGrouping(flow, flash, params)
+                                success()
                         }.to "events"
                         on("next") {
                                 this.handleSubjectGrouping(flow, flash, params)
+                                success()
                         }.to "samples"
                 }
@@ -416 +445 @@
                         onRender {
                                 flow.page = 6
+                                flow.bla = "samples"
+
+                                // iterate through subjects
+                                flow.subjects.each() { subject ->
+                                        println subject.value.name
+
+                                        // iterate through events
+                                        flow.events.each() { event ->
+                                                println "bla"
+                                                if (event instanceof SamplingEvent) {
+                                                        //println event.getFieldValue('name')
+                                                        println event.startTime
+                                                        println event.endTime
+                                                }
+
+                                        }
+                                }
+
+                                success()
                         }
                         on("previous") {
+                                success()
                         }.to "groups"
                         on("next") {
-                        }.to "samples"
+                                success()
+                        }.to "confirm"
                 }
 
@@ -433 +483 @@
                         on("toEvents").to "events"
                         on("toGroups").to "groups"
-                        on("previous").to "groups"
+                        on("previous").to "samples"
                         on("next").to "save"
                 }
@@ -443 +493 @@
                                 flash.errors = [:]
 
-                                // start transaction
-                                def transaction = sessionFactory.getCurrentSession().beginTransaction()
-
                                 // persist data to the database
                                 try {
-                                        // save EventDescriptions
-                                        flow.eventDescriptions.each() {
-                                                if (!it.save(flush:true)) {
-                                                        this.appendErrors(it, flash.errors)
-                                                        throw new Exception('error saving eventDescription')
-                                                }
-                                                println "saved eventdescription "+it
-                                        }
-
-                                        // TODO: eventDescriptions that are not linked to an event are currently
-                                        //               stored but end up in a black hole. We should either decide to
-                                        //               NOT store these eventDescriptions, or add "hasmany eventDescriptions"
-                                        //               to Study domain class
+                                        println ".saving wizard data..."
 
                                         // save events
-                                        flow.events.each() {
-                                                if (!it.save(flush:true)) {
-                                                        this.appendErrors(it, flash.errors)
+                                        println ".saving events"
+                                        flow.events.each() { event ->
+                                                if (!event.save(flush:true)) {
+                                                        this.appendErrors(event, flash.errors)
                                                         throw new Exception('error saving event')
                                                 }
-                                                println "saved event "+it
 
                                                 // add to study
-                                                if (it instanceof SamplingEvent) {
-                                                        flow.study.addToSamplingEvents(it)
+                                                if (event instanceof SamplingEvent) {
+                                                        flow.study.addToSamplingEvents(event)
                                                 } else {
-                                                        flow.study.addToEvents(it)
+                                                        flow.study.addToEvents(event)
                                                 }
+                                                
+                                                println ".saved event ["+event+"] of type ["+event.getClass()+"] (id: "+event.id+")"
                                         }
 
+                                        // save subjects
+                                        println ".saving subjects"
+                                        flow.subjects.each() { subjectId, subject ->
+                                                if (!subject.save(flush:true)) {
+                                                        this.appendErrors(subject.value, flash.errors)
+                                                        throw new Exception('error saving subject')
+                                                }
+
+                                                // add this subject to the study
+                                                flow.study.addToSubjects(subject)
+
+                                                println ".saved subject "+subject+" (id: "+subject.id+")"
+                                        }
+
                                         // save eventGroups
-                                        flow.eventGroups.each() {
-                                                if (!it.save(flush:true)) {
-                                                        this.appendErrors(it, flash.errors)
+                                        println ".saving eventGroups"
+                                        flow.eventGroups.each() { eventGroup ->
+                                                if (!eventGroup.save(flush:true)) {
+                                                        this.appendErrors(eventGroup, flash.errors)
                                                         throw new Exception('error saving eventGroup')
                                                 }
-                                                println "saved eventGroup "+it
 
                                                 // add to study
-                                                flow.study.addToEventGroups(it)
+                                                flow.study.addToEventGroups(eventGroup)
+
+                                                println ".saved eventGroup ["+eventGroup+"] (id: "+eventGroup.id+")"
                                         }
-                                        
-                                        // save subjects
-                                        flow.subjects.each() {
-                                                if (!it.save(flush:true)) {
-                                                        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
+                                        println ".saving study"
                                         if (!flow.study.save(flush:true)) {
                                                 this.appendErrors(flow.study, flash.errors)
                                                 throw new Exception('error saving study')
                                         }
-                                        println "saved study "+flow.study+" (id: "+flow.study.id+")"
-
-                                        // commit transaction
-                                        println "commit"
-                                        transaction.commit()
+                                        println ".saved study "+flow.study+" (id: "+flow.study.id+")"
+
                                         success()
                                 } catch (Exception e) {
@@ -520 +559 @@
                                         flash.debug = e.getStackTrace()
 
-                                        println "rollback"
-                                        transaction.rollback()
                                         error()
                                 }
@@ -653 +690 @@
                 }
 
-                // got an event in the flow scope?
-                //if (!flow.event) flow.event = new Event()
-
                 // if a template is selected, get template instance
                 if (template instanceof String && template.size() > 0) {
@@ -731 +765 @@
          */
         def handleSubjectGrouping(flow, flash, params) {
-                println params
-
                 // iterate through event groups
                 def g = 0
@@ -746 +778 @@
                                 }
                         }
-
-                        println g+" : "+eventGroup.subjects
 
                         g++

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

@@ -29 +29 @@
                 <p>
                 You are about to create a study containing ${subjects.size()} subjects,
-                ${eventDescriptions.size()} event descriptions and ${events.size()} events grouped into
-                ${eventGroups.size()} event groups.
+                ${events.size()} events grouped into ${eventGroups.size()} event groups.
                 </p>
         </div>
@@ -37 +36 @@
                 <p>
                   <ul>
-                <li>title: ${study?.title}</li>
-                <li>description: ${study?.description}</li>
-                <li>research question: ${study?.researchQuestion}</li>
-                <li>code: ${study?.code}</li>
-                <li>EC code: ${study?.ecCode}</li>
-                <g:each var="field" in="${study.template.fields}">
+                <g:each var="field" in="${study.giveFields()}">
                         <li>${field.name} - ${study.getFieldValue(field.name)}</li>
                 </g:each>

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

@@ -18 +18 @@
 
         <span class="info">
-                <span class="title">Samples bla bla</span>
-                bla bla bla samples blah di bla blah...
+                <span class="title">Samples</span>
+                blah blah blaaa....
         </span>
         
-        todo...
+
+
 </wizard:pageContent>

trunk/web-app/css

@@ -1 @@
-
+main.css

@@ -1 @@
-
+main.css

@@ -1 @@
-
+main.css