Changeset 513

Show
Ignore:
Timestamp:
03-06-10 08:12:06 (4 years ago)
Author:
keesvb
Message:

version 0.2.3, deleted sampleTemplates field in Template as it will not be used for now

Location:
trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • trunk/application.properties

    r496 r513  
    99app.name=gscf 
    1010app.servlet.version=2.4 
    11 app.version=0.2.2 
     11app.version=0.2.3 
    1212plugins.crypto=2.0 
    1313plugins.db-util=0.4 
  • trunk/grails-app/conf/BootStrap.groovy

    r497 r513  
    198198                                .addToFields(new TemplateField(name: 'Lab id',type: TemplateFieldType.STRING,comment:'In which lab was the study performed; indicate the roomnumber.')) 
    199199                                .addToFields(new TemplateField(name: 'Institute',type: TemplateFieldType.STRING,comment:'In which institute was the study performed; indicate the full address information (to be replaced by persons-affiliations?)')) 
     200                                //commented out because of bug #84:.addToFields(new TemplateField(name: 'Study protocol',type: TemplateFieldType.FILE,comment:'Optionally attach a file in which the protocol in the study is described')) 
    200201                        .with { if (!validate()) { errors.each { println it} } else save()} 
    201202 
     
    368369                                name: 'Liver extraction', 
    369370                                description: 'Liver sampling for transcriptomics arrays', 
    370                                 entity: dbnp.studycapturing.SamplingEvent, 
    371                                 sampleTemplates: [humanSampleTemplate]) 
     371                                entity: dbnp.studycapturing.SamplingEvent) 
    372372                        .addToFields(samplingProtocolField) 
    373373                        .addToFields(new TemplateField( 
     
    380380                                name: 'Blood extraction', 
    381381                                description: 'Blood extraction targeted at lipid assays', 
    382                                 entity: dbnp.studycapturing.SamplingEvent, 
    383                                  sampleTemplates: [humanBloodSampleTemplate]) 
     382                                entity: dbnp.studycapturing.SamplingEvent) 
    384383                        .addToFields(samplingProtocolField) 
    385384                        .addToFields(new TemplateField( 
     
    650649                                              material: bloodTerm, 
    651650                                              parentSubject: currentSubject, 
    652                                               parentEvent: bloodSamplingEvent, 
    653                           template: humanBloodSampleTemplate); 
     651                                              parentEvent: bloodSamplingEvent); 
    654652 
    655653                                        humanStudy.addToSubjects(currentSubject).addToSamples(currentSample).with { if (!validate()) { errors.each { println it} } else save()} 
  • trunk/grails-app/domain/dbnp/studycapturing/Template.groovy

    r496 r513  
    1717        //nimble.User owner 
    1818        List fields 
    19         static hasMany = [fields: TemplateField, 
    20         sampleTemplates: Template] // only applicable when entity=SamplingEvent, 
    21         // for storing which Sample (template)s result from a SamplingEvent (template) 
     19        static hasMany = [fields: TemplateField] 
    2220 
    2321        static constraints = {