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

Timestamp:

Apr 27, 2010, 3:53:06 PM (9 years ago)

Author:

roberth

Message:

Updated the template entities to be able to return domain fields, template fields and both.
Rolled back the change of Kees in the Event object, so the startTime and endTime fields returned.
Also updated the studies list with a new layout.

File:

• trunk/grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (1 diff)

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

@@ -349 +349 @@
 
         /**
+        * 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 DomainTemplateField
          */
-        abstract Map giveDomainFields()
+        abstract List<DomainTemplateField> giveDomainFields()
+
         /*def giveDomainFields() {
                 def fieldSet = [:];