Changeset 414

Timestamp:

May 12, 2010, 12:12:33 PM (9 years ago)

Author:

duh

Message:

• moved term / ontology setter to TemplateEntity? for transparent handling of ontology fields

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (5 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

@@ -619 +619 @@
                                 // iterate through fields (= template fields and domain properties)
                                 flow.subjects[ subjectId ].giveFields().each() { subjectField ->
-                                        def value = params.get( 'subject_' + subjectId + '_' + subjectField.escapedName() )
-
-/*** THIS SHOULD PROBABLY MOVE INTO TEMPLATE ENTITY ***/
-                                        // handle ontology terms
-                                        if (value instanceof String && subjectField.type.toString() == "ONTOLOGYTERM") {
-                                                // iterate through ontologies and find term
-                                                subjectField.ontologies.each() { ontology ->
-                                                        def term = ontology.giveTermByName( value )
-
-                                                        // found a term?
-                                                        if (term) {
-                                                                value = term
-                                                        }
-                                                }
-                                        }
-/*** END ***/
-
                                         // set the field
                                         flow.subjects[ subjectId ].setFieldValue(
                                                 subjectField.name,
-                                                value
+                                                params.get( 'subject_' + subjectId + '_' + subjectField.escapedName() )
                                         )
                                 }

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

@@ -320 +320 @@
          */
         def setFieldValue(String fieldName, value) {
-
+                // get the template field
                 TemplateField field = getField(this.giveFields(),fieldName)
 
@@ -332 +332 @@
                 }
 
-                // Convenience setter for dates: handle string values for date fields
+                // Magic setter for dates: handle string values for date fields
                 if (field.type == TemplateFieldType.DATE && value && value.class == String) {
                         // a string was given, attempt to transform it into a date instance
@@ -351 +351 @@
                 }
 
+                // Magic setter for ontology terms: handle string values
+                if (field.type == TemplateFieldType.ONTOLOGYTERM && value && value.class == String) {
+                        // iterate through ontologies and find term
+                        field.ontologies.each() { ontology ->
+                                def term = ontology.giveTermByName(value)
+
+                                // found a term?
+                                if (term) {
+                                        value = term
+                                }
+                        }
+                }
+
                 // Set the field value
                 if (isDomainField(field)) {
-                        if (!value) {
+                        // got a value?
+                        if (value) {
+                                println "setting [" + ((super) ? super.class : '??') + "] domain field: [" + fieldName + "] ([" + value.toString() + "] of type [" + value.class + "])"
+
+                                // set value
+                                this[field.name] = value
+                        } else {
                                 println "removing [" + ((super) ? super.class : '??') + "] domain field: [" + fieldName + "]"
 
                                 // remove value
                                 this[field.name] = null
-                        } else {
-                                println "setting [" + ((super) ? super.class : '??') + "] domain field: [" + fieldName + "] ([" + value.toString() + "] of type [" + value.class + "])"
-
-                                // set value
-                                this[field.name] = value
                         }
                 } else {
@@ -386 +400 @@
         /**
          * Check if a given field is a domain field
-         * @param field
+         * @param TemplateField         field instance
          * @return boolean
          */
@@ -393 +407 @@
         }
 
-        boolean isDomainField(String fieldName) {
+        /**
+         * Check if a given field is a domain field
+         * @param String        field name
+         * @return boolean
+         */     boolean isDomainField(String fieldName) {
                 return this.giveDomainFields()*.name.contains(fieldName)
         }