Changeset 268

Timestamp:

Mar 15, 2010, 7:16:02 PM (14 years ago)

Author:

tabma

Message:

• identifier column added

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (8 diffs)
• views/importer/common/_properties.gsp (modified) (1 diff)

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

@@ -57 +57 @@
         session.header = header
         session.importtemplate_id = params.template_id
+        session.workbook = wb
 
         render (view:"step1", model:[header:header, datamatrix:datamatrix])
@@ -145 +146 @@
         }
         
-        for (e in session.header) {
+        /*for (e in session.header) {
             println e
-        }
+        }*/
+
+        //import workbook
+        ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 0, session.header)
+        //println session.header.dump()
+
         render ("properties saved")
     }

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

@@ -21 +21 @@
 import org.apache.poi.hssf.usermodel.HSSFDateUtil
 import dbnp.studycapturing.TemplateFieldType
+import dbnp.studycapturing.Template
 import dbnp.studycapturing.Study
 import dbnp.studycapturing.Subject
@@ -44 +45 @@
     /**
      * @param wb high level representation of the workbook
-     * @return header representation as a MappingColumn array
+     * @return header representation as a MappingColumn hashmap
      */
     def getHeader(HSSFWorkbook wb, int sheetindex){
@@ -68 +69 @@
                     case HSSFCell.CELL_TYPE_NUMERIC:                    
                             if (HSSFDateUtil.isCellDateFormatted(c)) {
-                                println("DATE")
                                 header[c.getColumnIndex()] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE)
                             }
@@ -146 +146 @@
     * by using mapping information
     *
+    * @param template_id template identifier to use fields from
     * @param wb POI horrible spreadsheet formatted workbook object
-    * @param mc array of MappingColumns
+    * @param mcmap linked hashmap (preserved order) of MappingColumns
     * @param sheetindex sheet to use when using multiple sheets
     * @param rowindex first row to start with reading the actual data (NOT the header)
@@ -153 +154 @@
     * @see dbnp.importer.MappingColumn
     */
-    def importdata(HSSFWorkbook wb, int sheetindex, int rowindex, MappingColumn[] mcarray) {
+    def importdata(template_id, HSSFWorkbook wb, int sheetindex, int rowindex, mcmap) {
         def sheet = wb.getSheetAt(sheetindex)
         def rows  = []
@@ -163 +164 @@
 
             // get the value of the cells in the row
-            for (HSSFCell c: sheet.getRow(i))           
-                mc = mcarray[c.getColumnIndex()]                
-                record.add(createColumn(c, mc))
-        }
+            for (HSSFCell cell: sheet.getRow(i)) {
+                def mc = mcmap[cell.getColumnIndex()]
+                record.add(createColumn(template_id, cell, mc))
+            }
+        }
+        println record
     }
 
@@ -172 +175 @@
     * This function creates a column based on the current cell and mapping
     *
+    * @param template_id template identifier to use fields from
     * @param cell POI cell read from Excel
     * @param mc mapping column
@@ -177 +181 @@
     * 
     */
-    def createColumn(HSSFCell cell, MappingColumn mc) {
+    def createColumn(template_id, HSSFCell cell, MappingColumn mc) {
         def df = new DataFormatter()
-
-        // check the templatefield type of the cell
+        def template = Template.get(template_id)
+
+        // check the templatefield entity of the cell
         switch(mc.entity) {
-            case Study  :   def st = new Study()
-                            st.setFieldValue(mc.name, df.formatCellValue(c))
+            case Study  :   def st = new Study(template:template)
+                            st.setFieldValue(mc.name, df.formatCellValue(cell))
                             return st
                             break
-            case Subject:   def su = new Subject()
-                            su.setFieldValue(mc.name, df.formatCellValue(c))
+            case Subject:   def su = new Subject(template:template)
+                            su.setFieldValue(mc.name, df.formatCellValue(cell))
                             return su
                             break
-            case Event  :   def ev = new Event()
-                            ev.setFieldValue(mc.name, df.formatCellValue(c))
+            case Event  :   def ev = new Event(template:template)
+                            ev.setFieldValue(mc.name, df.formatCellValue(cell))
                             return ev
                             break
-            case Protocol:  def pr = new Protocol()
-                            pr.setFieldValue(mc.name, df.formatCellValue(c))
+            case Protocol:  def pr = new Protocol(template:template)
+                            pr.setFieldValue(mc.name, df.formatCellValue(cell))
                             return pr
                             break
-            case Sample :   def sa = new Sample()
-                            sa.setFieldValue(mc.name, df.formatCellValue(c))
+            case Sample :   def sa = new Sample(template:template)
+                            sa.setFieldValue(mc.name, df.formatCellValue(cell))
                             return sa
                             break
-            case Object :   break
-            
-        }
-
+            case Object :   break           
+        }
     }
 }

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

@@ -18 +18 @@
               <tr><td colspan="2"><h4>${stdentity.name}</h4></td></tr>
               <tr>
-                  <td>Columnname:</td><td>Property:</td>
+                  <td>Identifier:</td>
+                  <td>Columnname:</td>
+                  <td>Property:</td>
               </tr>           
                 <g:each var="selentity" in="${selectedentities}">
                     <g:if test="${selentity.type.toLong()==stdentity.type}">
                         <tr>
+                            <td width="12px">
+                                <g:checkBox name="identifier"/>
+                            </td>
                             <td class="header" width="200px">
                                 <b>${header[selentity.columnindex.toInteger()].name}</b>