Changeset 259

Timestamp:

Mar 12, 2010, 11:51:33 AM (13 years ago)

Author:

tabma

Message:

• Entity record creator implemented (using MappingColumn?)

Location:

trunk/grails-app

Files:

• domain/dbnp/importer/Column.groovy (deleted)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (3 diffs)

trunk/grails-app/services/dbnp/importer/ImporterService.groovy

@@ -20 +20 @@
 import org.apache.poi.ss.usermodel.DataFormatter
 import org.apache.poi.hssf.usermodel.HSSFDateUtil
-import dbnp.importer.Column
 import dbnp.studycapturing.TemplateFieldType
+import dbnp.studycapturing.Study
+import dbnp.studycapturing.Subject
+import dbnp.studycapturing.Event
+import dbnp.studycapturing.Protocol
+import dbnp.studycapturing.Sample
+
 
 class ImporterService {
@@ -39 +44 @@
     /**
      * @param wb high level representation of the workbook
-     * @return header representation as a string array
+     * @return header representation as a MappingColumn array
      */
     def getHeader(HSSFWorkbook wb, int sheetindex){
@@ -94 +99 @@
         def rows  = []
         def df = new DataFormatter()
-
+        def datamatrix_start = 1
+
+        // walk through all rows
         (count <= sheet.getLastRowNum()) ?
-        ((1+sheet.getFirstRowNum())..count).each { rowindex ->
-
+        ((datamatrix_start+sheet.getFirstRowNum())..count).each { rowindex ->
             def row = []
+
+            // walk through every cell
             for (HSSFCell c: sheet.getRow(rowindex))
                 row.add(c)
@@ -138 +146 @@
     * by using mapping information
     *
-    *
     * @param wb POI horrible spreadsheet formatted workbook object
     * @param mc array of MappingColumns
@@ -146 +153 @@
     * @see dbnp.importer.MappingColumn
     */
-    def importdata(HSSFWorkbook wb, int sheetindex, int rowindex, MappingColumn[] mc) {
+    def importdata(HSSFWorkbook wb, int sheetindex, int rowindex, MappingColumn[] mcarray) {
         def sheet = wb.getSheetAt(sheetindex)
         def rows  = []
-
-        (count <= sheet.getLastRowNum()) ?
-        (rowindex..count).each { i ->
-
-            def row = []
-            for (HSSFCell c: sheet.getRow(i))
-                //row.add(c)
-                //row.add(df.formatCellValue(c))
-                switch(mc[c.getColumnIndex()].celltype) {
-                    case 0  : break
-                    default : break
-                }
-
-                rows.add(row)
-        } : 0
+        def df = new DataFormatter()
+
+        // walk through all rows        
+        rowindex..sheet.getLastRowNum().each { i ->
+            def record = [:]
+
+            // get the value of the cells in the row
+            for (HSSFCell c: sheet.getRow(i))           
+                mc = mcarray[c.getColumnIndex()]                
+                record.add(createColumn(c, mc))
+        }
+    }
+
+    /**
+    * This function creates a column based on the current cell and mapping
+    *
+    * @param cell POI cell read from Excel
+    * @param mc mapping column
+    * @return entity object
+    * 
+    */
+    def createColumn(HSSFCell cell, MappingColumn mc) {
+        def df = new DataFormatter()
+
+        // check the templatefield type of the cell
+        switch(mc.entity) {
+            case Study  :   def st = new Study()
+                            st.setFieldValue(mc.name, df.formatCellValue(c))
+                            return st
+                            break
+            case Subject:   def su = new Subject()
+                            su.setFieldValue(mc.name, df.formatCellValue(c))
+                            return su
+                            break
+            case Event  :   def ev = new Event()
+                            ev.setFieldValue(mc.name, df.formatCellValue(c))
+                            return ev
+                            break
+            case Protocol:  def pr = new Protocol()
+                            pr.setFieldValue(mc.name, df.formatCellValue(c))
+                            return pr
+                            break
+            case Sample :   def sa = new Sample()
+                            sa.setFieldValue(mc.name, df.formatCellValue(c))
+                            return sa
+                            break
+            case Object :   break
+            
+        }
+
     }
 }

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

@@ -56 +56 @@
     }
 
-    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}\""
-            res += (e == selected) ? " selected" : ""
-            res += ">${e}</option>"
-        }
-
-        res += "</select>"
-        return res
-    }
-
     /**
      * Possibly this will later on return an AJAX-like autocompletion chooser for the fields?
@@ -110 +97 @@
         res += "</select>"
         return res
-    }    
+    }
+
+    /**
+    * @param selected selected TemplateFieldType
+    * @param custval custom value to be combined in the option(s) of the selector
+    * @param name name of the HTML select object
+    * @return HTML select object
+    *
+    * @see dbnp.studycapturing.TemplateFieldType
+    */
 
      def entitySelect = { attrs ->
@@ -130 +126 @@
 
     /**
-    * @param selected selected celltype
+    * @param selected selected TemplateFieldType
+    * @param customvalue custom value to be combined in the option(s) of the selector
     * @param name name of the HTML select object
-    * @see org.apache.poi.ss.usermodel.Cell for the possible cell types
     * @return HTML select object
+    * 
+    * @see dbnp.studycapturing.TemplateFieldType
     */
     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)
+        def name = (attrs['name']==null) ? "" : attrs['name']   
 
         def res = "<select style=\"font-size:10px\" name=\"${name}\">"