Changeset 384

Timestamp:

Apr 27, 2010, 9:13:47 AM (13 years ago)

Author:

keesvb

Message:

FINALLY found a possible way to integrate the domain fields as TemplateFields?, see Event. Also added required attribute for template fields.

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (2 diffs)
• domain/dbnp/studycapturing/Event.groovy (modified) (5 diffs)
• domain/dbnp/studycapturing/Template.groovy (modified) (3 diffs)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (3 diffs)
• domain/dbnp/studycapturing/TemplateField.groovy (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -416 +416 @@
                         // 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)
@@ -504 +515 @@
 
                         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.setFieldValue( 'Diet','10% fat (palm oil)' )
+
+                        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()}

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

@@ -14 +14 @@
  */
 class Event extends TemplateEntity implements Serializable {
-        Date startTime
-        Date endTime
 
         static constraints = {
-                startTime(nullable:false)
+                startTime(nullable: true)
+                endTime(nullable: true)
                 endTime(validator: {val, obj ->
            if (val && val.before(obj.startTime)) {
@@ -24 +23 @@
            }
         })
+        }
+        
+        Date getStartTime() {
+                getFieldValue('Start time')
+        }
+
+        def setStartTime(Date value) {
+                if (value != null) {
+                        setFieldValue('Start time',value)
+                }
+                return this
+        }
+
+        Date getEndTime() {
+                getFieldValue('End time')
+        }
+
+        def setEndTime(Date value) {
+                if (value != null) {
+                        setFieldValue('End time',value)
+                }
+                return this
         }
 
@@ -33 +54 @@
         // thus, do this manually as follows
 
-        def getDuration(date1, date2) {
+        static def getDuration(date1, date2) {
                 def timeMillis = (date2.getTime() - date1.getTime()).abs()
                 def days = (timeMillis / (1000 * 60 * 60 * 24)).toInteger()
@@ -52 +73 @@
         // is output
 
-        def getPrettyDuration(duration) {
+        static def getPrettyDuration(duration) {
                 def handleNumerus = {number, string ->
                         return number.toString() + (number == 1 ? string : string + 's')
@@ -70 +91 @@
 
         // convenience method. gives formatted string output for a duration
-        def getPrettyDuration(date1, date2) {
+        static def getPrettyDuration(date1, date2) {
                 return getPrettyDuration(getDuration(date1, date2))
         }

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

@@ -23 +23 @@
                 // see http://jira.codehaus.org/browse/GRAILS-6020
                 //      name(unique:['entity'])
+        }
+
+        // As the entity is not known at the time the constructor is called,
+        // we add the system fields for a new template object at the time the entity is set
+        void setEntity(Class value) {
+                this.entity = value
+                if (value != null) {
+                        if (fields == null) {
+                                if (entity.systemFields) {
+                                        println "adding default template fields for " + entity.systemFields
+                                        entity.systemFields.each {
+                                                this.addToFields(it)
+                                        }
+                                }
+                        }
+                        println "" + value + "this template has now fields " + fields
+                }
+
         }
 
@@ -58 +76 @@
 
         /**
+         * get all required fields
+         * @param       Class   fieldType
+         * @return      Set<TemplateField>
+         */
+        def getRequiredFields() {
+                def result = fields.findAll {
+                        it.required == true
+                }
+                return result;
+        }
+
+        /**
          * overloading the findAllByEntity method to make it function as expected
          * @param       Class           entity (for example: dbnp.studycapturing.Subject)
@@ -64 +94 @@
         public static findAllByEntity(java.lang.Class entity) {
                 def results = []
-                // 'this' should not work in static context, however it does so I'll keep
-                // this in for now :)
-                this.findAll().each() {
+                // 'this' should not work in static context, so taking Template instead of this
+                Template.findAll().each() {
                         if (entity.equals(it.entity)) {
                                 results[ results.size() ] = it

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

@@ -14 +14 @@
 abstract class TemplateEntity implements Serializable {
         Template template
+        static List systemFields
         Map templateStringFields = [:]
         Map templateTextFields = [:]
@@ -31 +32 @@
                 templateDoubleFields: double,
                 templateDateFields: Date,
-                templateTermFields: Term
+                templateTermFields: Term,
+                systemFields: TemplateField
         ]
 
@@ -353 +355 @@
         }
 
+        def List<TemplateField> giveSystemFields() {
+                return systemFields;
+        }
+        
+
         /**
          * Return all relevant 'built-in' domain fields of the super class

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

@@ -17 +17 @@
         String comment // help string for the user interface
         List listEntries
+        boolean required
 
     static hasMany = [listEntries :
@@ -27 +28 @@
                 unit(nullable: true, blank: true)
                 comment(nullable:true, blank: true)
+                required(default: false)
         }