Changeset 153


Ignore:
Timestamp:
Jan 29, 2010, 7:38:15 PM (9 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/conf/BootStrap.groovy

    r149 r153  
    189189
    190190                                secondStudy.addToSubjects(currentSubject)
    191                                 .addToEvents(new Event(
     191                                .addToEvents(new SamplingEvent(
    192192                                        subject: currentSubject,
    193193                                        startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
  • trunk/grails-app/controllers/dbnp/studycapturing/EventController.groovy

    r150 r153  
    200200    }
    201201
    202     def showMySample = {
    203           render( view:"showMySample" )
     202
     203    def showSample = {
     204          def event = Event.get(params.id)
     205          if( event instanceof SamplingEvent ) { render( view:"showSample", model:[samples:event.samples] )    }
     206          else                                 { render( view:"showNewSample" ) }
    204207    }
    205208
Note: See TracChangeset for help on using the changeset viewer.