Changeset 251

Timestamp:

Mar 9, 2010, 3:53:46 PM (11 years ago)

Author:

tabma

Message:

• TemplateStudyField? and MappingColumn? changed fieldnames
• session header is now a map with MappingColumn? objects containing all selected settings

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (6 diffs)
• grails-app/domain/dbnp/importer/MappingColumn.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/studycapturing/TemplateStudyField.groovy (copied) (copied from trunk/grails-app/domain/dbnp/studycapturing/TemplateStudyField.groovy) (1 prop)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• test/unit/dbnp/studycapturing/TemplateStudyFieldTests.groovy (added)

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

@@ -23 +23 @@
 import org.apache.poi.ss.usermodel.DataFormatter
 import dbnp.studycapturing.Template
+import dbnp.studycapturing.Study
+import dbnp.studycapturing.Subject
+import dbnp.studycapturing.Event
+import dbnp.studycapturing.Protocol
+import dbnp.studycapturing.Sample
+import dbnp.studycapturing.TemplateFieldType
 
 class ImporterController {
@@ -53 +59 @@
 
         render (view:"step1", model:[header:header, datamatrix:datamatrix])
-
     }
 
     /**
     * User has assigned all entities and celltypes 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)
     * @return properties page
+    *
+    * @see celltype: http://poi.apache.org/apidocs/org/apache/poi/ss/usermodel/Cell.html
     */
     def savepreview = { 
@@ -69 +77 @@
         celltypes.each { c ->
             def temp = c.split(":")
+            def celltype = temp[1].toInteger()
+            def templatefieldtype = TemplateFieldType.STRING
             
-            session.header[temp[0].toInteger()].celltype =  temp[1].toInteger()
+            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
+                default: break
+            }
         }
 
@@ -76 +98 @@
             def temp = e.split(":")
             Class clazz
-            switch (temp[1]) {
+
+            switch (temp[1].toInteger()) {
                 case 0: clazz = Study
                         break
@@ -87 +110 @@
                 case 4: clazz = Sample
                         break
-                default: clazz = String
+                default: clazz = Object
             }
+
+            session.header[temp[0].toInteger()].index = temp[0].toInteger()
             session.header[temp[0].toInteger()].entity = clazz
         }
@@ -106 +131 @@
     def saveproperties = {
 
-        /*def columnproperties  = request.getParameterValues("columnproperty")
+        def columnproperties  = request.getParameterValues("columnproperty")
         columnproperties.each { cp ->
                 def temp = cp.split(":")
-                session.header[temp[0]]
-        }*/
+                session.header[temp[0].toInteger()].property = temp[1].toInteger()
+        }
+        
         for (e in session.header) {
             println e

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

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

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

@@ -22 +22 @@
                         [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"]]
+    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"]
+                     ]
 
     /**