Changeset 819

Timestamp:

Aug 17, 2010, 3:37:15 PM (11 years ago)

Author:

duh

Message:

• removed test code from wizard

Location:

trunk

Files:

• . (modified) (1 prop)
• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (7 diffs)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (4 diffs)

trunk

@@ -8 +8 @@
 [:]
 .settings
+.skip-studies

@@ -8 +8 @@
 [:]
 .settings
+.skip-studies

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

@@ -318 +318 @@
                                 if (!flow.event || (flow.event instanceof Event && type == "sample") || (flow.event instanceof SamplingEvent && type == "event")) {
                                         // create new instance
-                                        flow.event = (type == "event") ? new Event(template: template, parent: flow.study) : new SamplingEvent(template: template, parent: flow.study)
+                                        flow.event = (type == "event") ? new Event(template: template) : new SamplingEvent(template: template)
                                 } else {
                                         flow.event.template = template
@@ -351 +351 @@
                                 flash.errors = [:]
 
+                                // add event to study
+                                if (flow.event instanceof SamplingEvent) {
+                                        flow.study.addToSamplingEvents( flow.event )
+                                } else {
+                                        flow.study.addToEvents( flow.event )
+                                }
+
                                 // validate event
                                 if (flow.event.validate()) {
-                                        // validates properly
-                                        if (flow.event instanceof SamplingEvent) {
-                                                flow.study.addToSamplingEvents( flow.event )
-                                        } else {
-                                                flow.study.addToEvents( flow.event )
-                                        }
-
                                         // remove event from the flowscope
                                         flow.remove('event')
@@ -366 +366 @@
                                 } else {
                                         // event does not validate
+                                        // remove from study
+                                        if (flow.event instanceof SamplingEvent) {
+                                                flow.study.removeFromSamplingEvents( flow.event )
+                                        } else {
+                                                flow.study.removeFromEvents( flow.event )
+                                        }
+
+                                        // append errors
                                         this.appendErrors(flow.event, flash.errors)
                                         error()
@@ -406 +414 @@
                                 flow.study.addToEventGroups(
                                         new EventGroup(
-                                                name    : groupName,
-                                                parent  : flow.study
+                                                name    : groupName
                                         )
                                 )
@@ -527 +534 @@
                                                                 flow.study.addToSamples(
                                                                         new Sample(
-                                                                                parent: flow.study,
                                                                                 parentSubject: subject,
                                                                                 parentEvent: samplingEvent,
@@ -631 +637 @@
                                         // save study
                                         println ".saving study"
-                                        if (!flow.study.save()) {
+                                        if (!flow.study.save(flush:true)) {
                                                 this.appendErrors(flow.study, flash.errors)
                                                 throw new Exception('error saving study')
@@ -945 +951 @@
                                         name            : subjectName,
                                         species         : species,
-                                        template        : template,
-                                        parent          : flow.study
+                                        template        : template
                                 )
+
+                                // add it to the study
+                                flow.study.addToSubjects( subject )
 
                                 // validate subject
                                 if (subject.validate()) {
-                                        // add it to the study
-                                        flow.study.addToSubjects( subject )
                                         println ".added subject "+subject
                                 } else {
                                         // whoops?
+                                        flow.study.removeFromSubjects( subject )
+
+                                        // append errors
                                         this.appendErrors(subject, flash.errors)
                                         errors = true

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -249 +249 @@
                 // This should remove the event group itself too, because of the cascading belongsTo relation
                 this.removeFromSamplingEvents(samplingEvent)
+
                 // But apparently it needs an explicit delete() too
                 // (Which can be verified by outcommenting this line, then SampleTests.testDeleteViaParentSamplingEvent fails
@@ -262 +263 @@
          */
         String deleteEventGroup(EventGroup eventGroup) {
-                // TODO THIS DOESNT WORK!!!!
-                println "-"
-                println "-"
-                println "-"
-                println "-"
-                println "-"
-                println "REMOVING AN EVENTGROUP DOES NOT DELETE SAMPLES"
-                println "-"
-                println "-"
-                println "-"
-                println "-"
-                println "-"
-
-
-
                 String msg = "EventGroup ${eventGroup} was deleted"
 
@@ -318 +304 @@
                                         msg += ", sample '${it.name}' was deleted"
                                         this.removeFromSamples( it )
+
                                         // Also here, contrary to documentation, an extra delete() is needed
+                                        // otherwise date is not properly deleted!
                                         it.delete()
                                 }
@@ -344 +332 @@
                 println ".remove eventGroup '${eventGroup.name}' from study '${this.title}'"
                 this.removeFromEventGroups(eventGroup)
+
                 // Also here, contrary to documentation, an extra delete() is needed
+                // otherwise cascaded deletes are not properly performed
                 eventGroup.delete()
 

@@ -8 +8 @@
 [:]
 .settings
+.skip-studies