Changeset 153

Timestamp:

Jan 29, 2010, 7:38:15 PM (13 years ago)

Author:

jahn

Message:

Currently Sample extends Event. The Sample class might better be merged into the Event class.

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• controllers/dbnp/studycapturing/EventController.groovy (modified) (1 diff)

trunk/grails-app/conf/BootStrap.groovy

@@ -189 +189 @@
 
                                 secondStudy.addToSubjects(currentSubject)
-                                .addToEvents(new Event(
+                                .addToEvents(new SamplingEvent(
                                         subject: currentSubject,
                                         startTime: Date.parse('yyyy-MM-dd','2008-01-07'),

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

@@ -200 +200 @@
     }
 
-    def showMySample = {
-          render( view:"showMySample" )
+
+    def showSample = {
+          def event = Event.get(params.id)
+          if( event instanceof SamplingEvent ) { render( view:"showSample", model:[samples:event.samples] )    }
+          else                                 { render( view:"showNewSample" ) }
     }