Changeset 256

Timestamp:

Mar 11, 2010, 11:48:16 AM (13 years ago)

Author:

tabma

Message:

• Template enums now used instead of POI Celltypes

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)
• domain/dbnp/importer/MappingColumn.groovy (modified) (2 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (4 diffs)
• views/importer/common/_preview.gsp (modified) (1 diff)

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

@@ -62 +62 @@
 
     /**
-    * User has assigned all entities and celltypes to the columns and continues to the next step (assigning properties to columns)
+    * User has assigned all entities and templatefieldtypes to the columns and continues to the next step (assigning properties to columns)
     * All information of the columns is stored in a session as MappingColumn object
     *
     * @param entity list of entities and columns it has been assigned to (columnindex:entitytype format)
-    * @param celltype list of celltypes and columns it has been assigned to (columnindex:celltype format)
+    * @param templatefieldtype list of celltypes and columns it has been assigned to (columnindex:templatefieldtype format)
     * @return properties page
     *
     * @see celltype: http://poi.apache.org/apidocs/org/apache/poi/ss/usermodel/Cell.html
     */
-    def savepreview = { 
+    def savepreview = {
+        def tft = null
         def entities  = request.getParameterValues("entity")
-        def celltypes = request.getParameterValues("celltype")
+        def templatefieldtypes = request.getParameterValues("templatefieldtype")
 
-        celltypes.each { c ->
-            def temp = c.split(":")
-            def celltype = temp[1].toInteger()
-            def templatefieldtype = TemplateFieldType.STRING
+        templatefieldtypes.each { t ->
+            def temp = t.split(":")
+            def templatefieldtype = temp[1]         
             
-            session.header[temp[0].toInteger()].celltype = celltype
-
-            switch (celltype) {
-                case 0 : templatefieldtype = TemplateFieldType.INTEGER
-                         break
-                case 1 : templatefieldtype = TemplateFieldType.STRING
-                         break
-                case 2 :  // formula cell type, cannot handle this
-                         break
-                case 3 : templatefieldtype = TemplateFieldType.STRING
-                         break
-                case 4 : templatefieldtype = TemplateFieldType.STRING
-                         break
+            switch (templatefieldtype) {
+                case "STRING"       : tft = TemplateFieldType.STRING
+                                      break
+                case "TEXT"         : tft = TemplateFieldType.TEXT
+                                      break
+                case "INTEGER"      : tft = TemplateFieldType.INTEGER
+                                      break
+                case "FLOAT"        : tft = TemplateFieldType.FLOAT
+                                      break
+                case "DOUBLE"       : tft = TemplateFieldType.DOUBLE
+                                      break
+                case "STRINGLIST"   : tft = TemplateFieldType.STRINGLIST
+                                      break
+                case "ONTOLOGYTERM" : tft = TemplateFieldType.ONTOLOGYTERM
+                                      break
+                case "DATE"         : tft = TemplateFieldType.DATE
+                                      break
                 default: break
             }
+            session.header[temp[0].toInteger()].templatefieldtype = tft
         }
 
         entities.each { e ->
             def temp = e.split(":")
-            Class clazz
+            Class clazz     
 
             switch (temp[1].toInteger()) {
@@ -113 +118 @@
                         break
                 default: clazz = Object
+                        break
             }
 
@@ -132 +138 @@
     */
     def saveproperties = {
+        def columnproperties  = request.getParameterValues("columnproperty")
 
-        def columnproperties  = request.getParameterValues("columnproperty")
         columnproperties.each { cp ->
                 def temp = cp.split(":")

trunk/grails-app/domain/dbnp/importer/MappingColumn.groovy

@@ -15 +15 @@
         dbnp.studycapturing.TemplateFieldType templatefieldtype
         Class entity
-        String property
-        Integer celltype
+        String property 
         Integer index
         String value
@@ -25 +24 @@
 
     String toString() {
-        return "Name:" + name + "/TemplateFieldType:" + templatefieldtype + "/Entity:" + entity + "/Property:" + property + "/Celltype:" + celltype + "/Index:" + index + "/Value:" + value
+        return "Name:" + name + "/TemplateFieldType:" + templatefieldtype + "/Entity:" + entity + "/Property:" + property + "/Index:" + index + "/Value:" + value
     }
 }

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

@@ -22 +22 @@
     def standardentities = [[type:-1, name:"Don't import"], [type:0, name:"Study"], [type:1, name:"Subject"], [type:2, name:"Event"],
                         [type:3, name:"Protocol"], [type:4, name:"Sample"]]
-
-    /*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"]
-                     ]*/
 
     /**
@@ -62 +56 @@
     }
 
-    def createSelect(int selected, String name, options, String customvalue) {
+    def createSelect(selected, String name, options, String customvalue) {
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"
 
         options.each { e ->
-            res += "<option value=\"${customvalue}:${e.type}\""
-            res += (e.type.toInteger() == selected) ? " selected" : ""
-            res += ">${e.name}</option>"
+            res += "<option value=\"${customvalue}:${e}\""
+            res += (e == selected) ? " selected" : ""
+            res += ">${e}</option>"
         }
 
@@ -118 +112 @@
     }    
 
-    /**
-     * @param selected selected entity
-     * @param name name of the HTML select object
-     **/
-    def entitySelect = { attrs ->       
-        def selected = (attrs['selected']==null) ? -1 : attrs['selected']
-        def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
-        out << createSelect(selected, attrs['name'], standardentities, customvalue)
+     def entitySelect = { attrs ->
+        def sel = (attrs['selected']==null) ? -1 : attrs['selected']
+        def custval = (attrs['customvalue']==null) ? "" : attrs['customvalue']
+        def name = (attrs['name']==null) ? -1 : attrs['name']
+
+        def res = "<select style=\"font-size:10px\" name=\"${name}\">"
+
+        standardentities.each { e ->
+            res += "<option value=\"${custval}:${e.type}\""
+            res += (e.type == sel) ? " selected" : ""
+            res += ">${e.name}</option>"
+        }
+
+        res += "</select>"
+        out << res
     }
 
@@ -134 +135 @@
     * @return HTML select object
     */
-    def celltypeSelect = { attrs ->
+    def templatefieldtypeSelect = { attrs ->
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
         def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
+        def name = (attrs['name']==null) ? "" : attrs['name']
         //out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
-        out << createSelect(selected, attrs['name'], TemplateFieldType.list(), customvalue)
+
+        def res = "<select style=\"font-size:10px\" name=\"${name}\">"
+
+        TemplateFieldType.list().each { e ->
+            res += "<option value=\"${customvalue}:${e}\""
+            res += (e == selected) ? " selected" : ""
+            res += ">${e}</option>"
+        }
+
+        res += "</select>"
+
+        out << res
     }
 }

trunk/grails-app/views/importer/common/_preview.gsp

@@ -28 +28 @@
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:celltypeSelect selected="${column.value.templatefieldtype}" name="celltype" customvalue="${column.key.toString()}"/>
+                    <importer:templatefieldtypeSelect selected="${column.value.templatefieldtype}" name="templatefieldtype" customvalue="${column.key.toString()}"/>
                 </td>
             </g:each>