Changeset 664

Timestamp:

19-07-10 17:50:22 (4 years ago)

Author:

duh

Message:

- fixed event page issue
- moved 'addTo*' method calls to their respective actions in the webflow and added 'removeTo*' method calls to make sure deleted items get removed as expected
- still cannot save due to compass / searchable exceptions...

Files:

• trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (13 diffs)

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

@@ -318 +318 @@
                                                 flow.subjects[increment] = subject
 
+                                                // add the subject to the study
+                                                flow.study.addToSubjects( subject )
+
                                                 // and remember the subject id with the template
                                                 def subjectsSize = (flow.subjectTemplates[subjectTemplateName].subjects.size()) ? (flow.subjectTemplates[subjectTemplateName].subjects.keySet().max() + 1) : 0
@@ -341 +344 @@
                                 // remove subject
                                 if (flow.subjects[ delete ] && flow.subjects[ delete ] instanceof Subject) {
+                                        // from study as well
+                                        flow.study.removeFromSubjects( flow.subjects[ delete ] )
+
                                         // remove subject from templates
                                         flow.subjectTemplates.each() { templateName, templateData ->
@@ -396 +402 @@
                                         flow.eventGroups        = [ new EventGroup(name: 'Group 1') ]
                                         flow.eventTemplates     = [:]
+
+                                        // add initial eventGroup to study
+                                        flow.study.addToEventGroups( flow.eventGroups[ 0 ] )
                                 } else if (!flash.values) {
                                         // set flash.values.templateType based on the event instance
@@ -467 +476 @@
                                         flow.events[ increment ] = newEvent
 
+                                        // ...add it to the study...
+                                        if (newEvent instanceof SamplingEvent) {
+                                                flow.study.addToSamplingEvents( newEvent )
+                                        } else {
+                                                flow.study.addToEvents( newEvent )
+                                        }
+
                                         // ...and 'reset' the event object in the flow scope
                                         flow.event = new Event(template: newEvent.template)
@@ -491 +507 @@
                                 // remove event
                                 if (flow.events[ delete ] && flow.events[ delete ] instanceof Event) {
+                                        // remove it from the study
+                                        flow.study.removeFromEvents( flow.events[ delete ] )
+
+                                        // remove it from the map
                                         flow.events.remove(delete)
                                         flow.eventTemplates.each() { eventTemplate ->
@@ -539 +559 @@
                                 }
 
-                                flow.eventGroups[increment] = new EventGroup( name: groupName )
+                                // remember eventGroup
+                                flow.eventGroups[ increment ] = new EventGroup( name: groupName )
+
+                                // and add the group to the study
+                                flow.study.addToEventGroups( flow.eventGroups[ increment ] )
 
                                 success()
@@ -552 +576 @@
                                 // remove the group with this specific id
                                 if (flow.eventGroups[delete] && flow.eventGroups[delete] instanceof EventGroup) {
+                                        // remove the eventGroup from the study
+                                        flow.study.removeFromEventGroups( flow.eventGroups[ delete ] )
+
                                         // remove this eventGroup
                                         flow.eventGroups.remove(delete)
@@ -646 +673 @@
                                                                 eventGroup.subjects.each() { subject ->
                                                                         def sampleName = (this.ucwords(subject.name) + '_' + eventName + '_' + new RelTime(event.startTime).toString()).replaceAll("([ ]{1,})", "")
-
-                                                                        flow.samples[flow.samples.size()] = [
+                                                                        def incrementor = flow.samples.size()
+
+                                                                        flow.samples[ incrementor ] = [
                                                                                 sample: new Sample(
                                                                                         parentSubject: subject,
@@ -658 +686 @@
                                                                                 subject: subject
                                                                         ]
+
+                                                                        // and add this sample to the study
+                                                                        flow.study.addToSamples( flow.samples[ incrementor ].sample )
                                                                 }
                                                         }
@@ -780 +811 @@
 
                                         // add events to study
+                                        /*
                                         println ".add events to study"
                                         flow.events.each() { event ->
@@ -786 +818 @@
                                                         // linked to this study
                                                         if (!flow.study.samplingEvents.find { e -> (e == event) }) {
-                                                                flow.study.addToSamplingEvents(event)
+                                                                flow.study.addToSamplingEvents( event.value )
                                                         }
                                                 } else {
                                                         // only add it if it does not yet exist
                                                         if (!flow.study.events.find { e -> (e == event) }) {
-                                                                flow.study.addToEvents(event)
+                                                                flow.study.addToEvents( event.value )
                                                         }
                                                 }
@@ -813 +845 @@
                                                 }
                                         }
+                                        */
 
                                         // save study
@@ -1227 +1260 @@
                         flow.events.each() {
                                 if (params.get('event_' + e + '_group_' + g) == 'on') {
-                                        eventGroup.addToEvents(it)
+                                        eventGroup.addToEvents(it.value)
                                 }
                                 e++