Changeset 392 for trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy

Timestamp:

May 4, 2010, 5:03:21 PM (11 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/domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (3 diffs)

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

@@ -14 +14 @@
 abstract class TemplateEntity implements Serializable {
         Template template
-        static List systemFields
         Map templateStringFields = [:]
         Map templateTextFields = [:]
@@ -253 +252 @@
 
         /**
-         * Find a template field by its name and return its value for this entity
-         * @param fieldName The name of the template field
+         * Find a domain or template field by its name and return its value for this entity
+         * @param fieldName The name of the domain or template field
          * @return the value of the field (class depends on the field type)
          * @throws NoSuchFieldException If the field is not found or the field type is not supported
          */
         def getFieldValue(String fieldName) {
-                TemplateFieldType fieldType = template.getFieldType(fieldName)
-                if (!fieldType) throw new NoSuchFieldException("Field name ${fieldName} not recognized")
-                getStore(fieldType)[fieldName]
+                if (this.properties.containsKey(fieldName)) {
+                        return this[fieldName]
+                }
+                else {
+                        TemplateFieldType fieldType = template.getFieldType(fieldName)
+                        if (!fieldType) throw new NoSuchFieldException("Field name ${fieldName} not recognized")
+                        return getStore(fieldType)[fieldName]
+                }
         }
 
@@ -375 +379 @@
 
         /**
+        * Return all fields defined in the underlying template and the built-in
+        * domain fields of this entity
+        */
+        def List<TemplateField> giveFields() {
+                return this.giveDomainFields() + this.giveTemplateFields();
+        }
+
+        /**
         * Return all templated fields defined in the underlying template of this entity
         */
-        def List<TemplateField> giveFields() {
+        def List<TemplateField> giveTemplateFields() {
                 return this.template.fields;
         }
 
-        def List<TemplateField> giveSystemFields() {
-                return systemFields;
-        }
-        
-
         /**
          * Return all relevant 'built-in' domain fields of the super class
-         * @return key-value pairs describing the built-in fields, with the names as keys and type (as TemplateFieldType) as values
+         * @return List with DomainTemplateFields
+         * @see TemplateField
          */
-        abstract Map giveDomainFields()
+        abstract List<TemplateField> giveDomainFields()
+
         /*def giveDomainFields() {
                 def fieldSet = [:];