Changeset 305 for trunk/grails-app/taglib

Timestamp:

Mar 23, 2010, 1:57:18 PM (13 years ago)

Author:

tabma

Message:

• templatefieldtypes chosen in the preview page are used as a filter for the properties page (so only matches between the columns/properties can be made if they are of the equal templatefieldtype)
• columns in the preview which are not imported and/or entities which are not used are not shown anymore in the properties-assignment step in the wizard

File:

• trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -19 +19 @@
 import org.apache.poi.hssf.usermodel.HSSFCell
 import org.apache.poi.ss.usermodel.DataFormatter
+import dbnp.studycapturing.Study
+import dbnp.studycapturing.Subject
+import dbnp.studycapturing.Event
+import dbnp.studycapturing.Protocol
+import dbnp.studycapturing.Sample
 
 class ImporterTagLib {
@@ -72 +77 @@
      * 
      * @param importtemplate_id template identifier where fields are retrieved from
-     * @param columnindex column in the header we're talking about
+     * @param MappingColumn object containing all required information
      * @return chooser object
      * */
     def propertyChooser = { attrs ->
-        // TODO: this should be changed to retrieving fields per entity
-        def t = Template.get(session.importtemplate_id)
-        def columnindex = attrs['columnindex']
+        // TODO: this should be changed to retrieving fields per entity instead of from one template
+        //       and session variables should not be used inside the service, migrate to controller
 
-        switch (attrs['entitytype']) {
-            case 0  : createPropertySelect(attrs['name'], t.fields, columnindex)
-                      break
-            case 1  : break
-            case 2  : break
-            case 3  : break
-            default : out << createPropertySelect(attrs['name'], t.fields, columnindex)
-                     break
-        }
+        def t = Template.get(session.importtemplate_id) 
+        def mc = attrs['mappingcolumn']
+        
+        out << createPropertySelect(attrs['name'], t.fields.findAll { it.type == mc.templatefieldtype }, mc.index)
     }
 
     /**
      * @param name name of the HTML select object
-     * @param options list of options to be used
+     * @param options list of options (fields) to be used
      * @param columnIndex column identifier (corresponding to position in header of the Excel sheet)
      * @return HTML select object
      */
-    def createPropertySelect(String name, options, String columnIndex)
-    {
+    def createPropertySelect(String name, options, Integer columnIndex)
+    {   
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"
 
-        options.each { f ->
+        options.each { f ->         
             res += "<option value=\"${columnIndex}:${f.id}\""
             //res += (e.type.toInteger() == selected) ? " selected" : ""