Changeset 392 for trunk/grails-app/conf

Timestamp:

May 4, 2010, 5:03:21 PM (13 years ago)

Author:

keesvb

Message:

switched back from the fancy 'integrate domain fields as system fields directly into the Template object at the time of creation' method to the plain 'implement getFieldValue, setFieldValue and giveFields to work for both domain and template fields'. NB: this might affect Events, since until now startTime and endTime were moved directly into template! Switch any Event.template.fields to Event.giveFields()

File:

• trunk/grails-app/conf/BootStrap.groovy (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -415 +415 @@
 
                         // Event templates
-                        println ".adding event templates..."
-
-                        def startDateField = new TemplateField(
-                                name: 'Start time', type: TemplateFieldType.DATE
-                        ).with { if (!validate()) { errors.each { println it} } else save()}
-
-                        def endDateField = new TemplateField(
-                                name: 'End time', type: TemplateFieldType.DATE
-                        ).with { if (!validate()) { errors.each { println it} } else save()}
-
-                        Event.systemFields = [startDateField,endDateField]
-
                         def dietTreatmentTemplate = new Template(
                                 name: 'Diet treatment', entity: dbnp.studycapturing.Event)
@@ -515 +503 @@
 
                         def evLF = new Event(
+                                startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
+                                endTime: Date.parse('yyyy-MM-dd','2008-01-14'),
                                 template: dietTreatmentTemplate
                         )
                         .with { if (!validate()) { errors.each { println it} } else save()}
-
-                        evLF.setStartTime(Date.parse('yyyy-MM-dd','2008-01-07'))
-                        evLF.setEndTime(Date.parse('yyyy-MM-dd','2008-01-14'))
-
                         evLF.setFieldValue( 'Diet','10% fat (palm oil)' )
                         evLF.save(flush:true)
 
-                        println "Saved diet treatment"
-                        // TODO: find out why Diet is not set and Compound is
-
                         def evHF = new Event(
+                                startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
+                                endTime: Date.parse('yyyy-MM-dd','2008-01-14'),
                                 template: dietTreatmentTemplate
                         )
-                        .setStartTime( Date.parse('yyyy-MM-dd','2008-01-07'))
-                        .setEndTime( Date.parse('yyyy-MM-dd','2008-01-14'))
                         .setFieldValue( 'Diet','45% fat (palm oil)' )
                         .with { if (!validate()) { errors.each { println it} } else save()}
 
                         def evBV = new Event(
+                                startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
+                                endTime: Date.parse('yyyy-MM-dd','2008-01-14'),
                                 template: boostTreatmentTemplate
                         )
-                        .setStartTime( Date.parse('yyyy-MM-dd','2008-01-07'))
-                        .setEndTime( Date.parse('yyyy-MM-dd','2008-01-14'))
                         .setFieldValue( 'Compound','Vehicle' )
                         .with { if (!validate()) { errors.each { println it} } else save()}
 
                         def evBL = new Event(
+                                startTime: Date.parse('yyyy-MM-dd','2008-01-07'),
+                                endTime: Date.parse('yyyy-MM-dd','2008-01-14'),
                                 template: boostTreatmentTemplate
                         )
-                        .setStartTime( Date.parse('yyyy-MM-dd','2008-01-07'))
-                        .setEndTime( Date.parse('yyyy-MM-dd','2008-01-14'))
                         .setFieldValue( 'Compound','Leptin' )
                         .with { if (!validate()) { errors.each { println it} } else save()}