Changeset 661

Timestamp:

19-07-10 16:10:09 (6 years ago)

Author:

tabma

Message:

• fixed property assignment by using lookup from new entity object method getFieldType

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (1 diff)

trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

@@ -212 +212 @@
 
         // Find actual Template object from the chosen template name
-        def template = Template.get(session.imported_template_id)
+        def template = Template.get(session.importer_template_id)
 
         params.columnproperty.index.each { columnindex, property ->
@@ -224 +224 @@
                 session.importer_header[columnindex.toInteger()].property = property
                 // Look up the template field type of the target TemplateField and store it also in the map
-                session.importer_header[columnindex.toInteger()].templatefieldtype = entityObj.giveFields()[property].type
+                session.importer_header[columnindex.toInteger()].templatefieldtype = entityObj.getFieldType(property)
 
                 //if it's an identifier set the mapping column true or false

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

@@ -658 +658 @@
                 }
         }
+
+                    /**
+         * Look up the type of a certain template subject field
+         * @param String fieldName The name of the template field
+         * @return String       The type (static member of TemplateFieldType) of the field, or null of the field does not exist
+         */
+        def TemplateFieldType getFieldType(String fieldName) {
+                def field = this.giveFields().find {
+                        it.name == fieldName
+                }
+                field?.type
+        }
 }