Changeset 453 for trunk/grails-app/domain

Timestamp:

May 20, 2010, 5:02:22 PM (13 years ago)

Author:

roberth

Message:

Improved study list, study detail view and study comparison. Also improved performance issues

Location:

trunk/grails-app/domain/dbnp/studycapturing

Files:

• Event.groovy (modified) (2 diffs)
• Study.groovy (modified) (2 diffs)
• TemplateEntity.groovy (modified) (3 diffs)

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

@@ -43 +43 @@
          * @return List
          */
-        List<TemplateField> giveDomainFields() {
+        List<TemplateField> giveDomainFields() { return Event.domainFields }
+        static final List<TemplateField> domainFields = 
                 [
                         new TemplateField(
@@ -52 +53 @@
                                 type: TemplateFieldType.DATE)
                 ]
-        }
 
         /**

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

@@ -21 +21 @@
          * @return List
          */
-        List<TemplateField> giveDomainFields() {
+        List<TemplateField> giveDomainFields() { return Study.domainFields }
+
+        static final List<TemplateField> domainFields =
                 [
                         new TemplateField(
@@ -30 +32 @@
                                 type: TemplateFieldType.DATE)
                 ]
-        }
 
         static hasMany = [

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

@@ -282 +282 @@
          */
         def getFieldValue(String fieldName) {
-                TemplateField field = getField(this.giveFields(),fieldName)
-                if (isDomainField(field)) {
-                        return this[field.name]
+
+                if (isDomainField(fieldName)) {
+                    return this[fieldName]
                 }
                 else {
-                        return getStore(field.type)[fieldName]
-                }
+                    TemplateField field = getField(this.giveTemplateFields(),fieldName)
+                    return getStore(field.type)[fieldName]
+                }
+
         }
 
@@ -404 +406 @@
          */
         boolean isDomainField(TemplateField field) {
-                return this.giveDomainFields()*.name.contains(field.name)
+            return isDomainField( field.name )
         }
 
@@ -411 +413 @@
          * @param String        field name
          * @return boolean
-         */     boolean isDomainField(String fieldName) {
-                return this.giveDomainFields()*.name.contains(fieldName)
-        }
-
+         */
+        boolean isDomainField(String fieldName) {
+            return this.giveDomainFields()*.name.contains(fieldName)
+        }
+        
         /**
          * Return all fields defined in the underlying template and the built-in