Changeset 513 for trunk

Timestamp:

Jun 3, 2010, 8:12:06 AM (13 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:

• application.properties (modified) (1 diff)
• grails-app/conf/BootStrap.groovy (modified) (4 diffs)
• grails-app/domain/dbnp/studycapturing/Template.groovy (modified) (1 diff)

trunk/application.properties

@@ -9 +9 @@
 app.name=gscf
 app.servlet.version=2.4
-app.version=0.2.2
+app.version=0.2.3
 plugins.crypto=2.0
 plugins.db-util=0.4

trunk/grails-app/conf/BootStrap.groovy

@@ -198 +198 @@
                                 .addToFields(new TemplateField(name: 'Lab id',type: TemplateFieldType.STRING,comment:'In which lab was the study performed; indicate the roomnumber.'))
                                 .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?)'))
+                                //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'))
                         .with { if (!validate()) { errors.each { println it} } else save()}
 
@@ -368 +369 @@
                                 name: 'Liver extraction',
                                 description: 'Liver sampling for transcriptomics arrays',
-                                entity: dbnp.studycapturing.SamplingEvent,
-                                sampleTemplates: [humanSampleTemplate])
+                                entity: dbnp.studycapturing.SamplingEvent)
                         .addToFields(samplingProtocolField)
                         .addToFields(new TemplateField(
@@ -380 +380 @@
                                 name: 'Blood extraction',
                                 description: 'Blood extraction targeted at lipid assays',
-                                entity: dbnp.studycapturing.SamplingEvent,
-                                 sampleTemplates: [humanBloodSampleTemplate])
+                                entity: dbnp.studycapturing.SamplingEvent)
                         .addToFields(samplingProtocolField)
                         .addToFields(new TemplateField(
@@ -650 +649 @@
                                               material: bloodTerm,
                                               parentSubject: currentSubject,
-                                              parentEvent: bloodSamplingEvent,
-                          template: humanBloodSampleTemplate);
+                                              parentEvent: bloodSamplingEvent);
 
                                         humanStudy.addToSubjects(currentSubject).addToSamples(currentSample).with { if (!validate()) { errors.each { println it} } else save()}

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

@@ -17 +17 @@
         //nimble.User owner
         List fields
-        static hasMany = [fields: TemplateField,
-        sampleTemplates: Template] // only applicable when entity=SamplingEvent,
-        // for storing which Sample (template)s result from a SamplingEvent (template)
+        static hasMany = [fields: TemplateField]
 
         static constraints = {