Changeset 255 for trunk/grails-app/taglib

Timestamp:

Mar 10, 2010, 7:27:57 PM (14 years ago)

Author:

tabma

Message:

• rewrite of celltype detection

File:

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

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

@@ -16 +16 @@
 package dbnp.importer
 import dbnp.studycapturing.Template
+import dbnp.studycapturing.TemplateFieldType
 
 class ImporterTagLib {
@@ -22 +23 @@
                         [type:3, name:"Protocol"], [type:4, name:"Sample"]]
 
-    def standardcelltypes = [
+    /*def standardcelltypes = [
                          [type:0, name:"Numeric"], [type:1, name:"String"], [type:2, name:"Formula"],
                          [type:3, name:"Blank"], [type:4, name:"Boolean"], [type:5, name:"Error"], [type:6, name:"Date"],
                          [type:7, name:"Float"], [type:8, name:"Double"], [type:9, name:"List of items"], [type:10, name:"Ontologyterm"]
-                     ]
+                     ]*/
 
     /**
@@ -61 +62 @@
     }
 
-    def createSelect(int selected, String name, ArrayList options, String customvalue) {
+    def createSelect(int selected, String name, options, String customvalue) {
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"
 
@@ -136 +137 @@
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
         def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
-        out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
+        //out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
+        out << createSelect(selected, attrs['name'], TemplateFieldType.list(), customvalue)
     }
 }