Changeset 805

Timestamp:

Aug 12, 2010, 5:50:54 PM (12 years ago)

Author:

duh

Message:

• fixed study show page
• worked on eventgroup deletion, note that this DOES NOT WORK at this moment, all samples remain in the database! This should be FIXED!

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/Study.groovy (modified) (2 diffs)
• views/study/show.gsp (modified) (1 diff)

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

@@ -425 +425 @@
                                 def eventGroupToRemove = flow.study.eventGroups.find { it.getIdentifier() == (params.get('do') as int) }
                                 if (eventGroupToRemove) {
-                                        flow.study.deleteEventGroup( eventGroupToRemove )
+                                        println flow.study.deleteEventGroup( eventGroupToRemove )
                                 }
                         }.to "events"

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

@@ -242 +242 @@
                 return msg
         }
+        
         /**
          * Delete an eventGroup from the study, including all its relations
@@ -248 +249 @@
          */
         String deleteEventGroup(EventGroup eventGroup) {
+                // TODO THIS DOESNT WORK!!!!
+                println "-"
+                println "-"
+                println "-"
+                println "-"
+                println "-"
+                println "REMOVING AND ENENTGROUP DOES NOT DELETE SAMPLES"
+                println "-"
+                println "-"
+                println "-"
+                println "-"
+                println "-"
+
+
+
                 String msg = "EventGroup ${eventGroup} was deleted"
+
+                // remove all samples that originate from this eventGroup
+                if (eventGroup.samplingEvents.size()) {
+                        // find all samples related to this eventGroup
+                        // - subject comparison is relatively straightforward and
+                        //   behaves as expected
+                        // - event comparison behaves strange, so now we compare
+                        //              1. database id's or,
+                        //              2. object identifiers or,
+                        //              3. objects itself
+                        //   this seems now to work as expected
+                        this.samples.findAll { sample ->
+                                (
+                                        (eventGroup.subjects.findAll {
+                                                it.equals(sample.parentSubject)
+                                        })
+                                        &&
+                                        (eventGroup.samplingEvents.findAll {
+                                                (
+                                                        (it.id && sample.parentEvent.id && it.id==sample.parentEvent.id)
+                                                        ||
+                                                        (it.getIdentifier() == sample.parentEvent.getIdentifier())
+                                                        ||
+                                                        it.equals(sample.parentEvent)
+                                                )
+                                        })
+                                )
+                        }.each() {
+                                // remove sample from study
+                                println ".removing sample "+it
+                                this.removeFromSamples( it )
+                        }
+                }
+
+                // remove all samplingEvents from this eventGroup
+                eventGroup.samplingEvents.findAll{}.each() { eventGroup.removeFromSamplingEvents(it) }
+
+                // remove all subject from this eventGroup
+                eventGroup.subjects.findAll{}.each() { eventGroup.removeFromSubjects(it) }
 
                 // remove the eventGroup from the study

trunk/grails-app/views/study/show.gsp

@@ -464 +464 @@
                       </g:if>
                       <td>${event.getStartTimeString()}</td>
-                      <td>${event.getDurationString()}</td>
+                      <td>${((event.getClass() == 'Event') ? event.getDurationString() : '')}</td>
                       <td>${event.template.name}</td>
                       <td>