Changeset 169

Timestamp:

Feb 3, 2010, 3:50:14 PM (14 years ago)

Author:

tabma

Message:

• created taglibrary for importer and first implementation detection of (cell) datatypes

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/importer (added)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (added)
• grails-app/views/importer/common (added)
• grails-app/views/importer/common/_preview.gsp (added)
• grails-app/views/importer/step1.gsp (moved) (moved from trunk/grails-app/views/importer/preview.gsp) (3 diffs, 1 prop)
• test/unit/dbnp/importer (added)
• test/unit/dbnp/importer/ImporterServiceTests.groovy (added)
• test/unit/importer (added)
• test/unit/importer/ImporterTagLibTests.groovy (added)
• web-app/css/importer.css (added)

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

@@ -20 +20 @@
 
 package dbnp.importer
+import org.apache.poi.hssf.usermodel.HSSFCell
+import org.apache.poi.ss.usermodel.DataFormatter
 
 class ImporterController {
@@ -38 +40 @@
         def wb = ImporterService.getWorkbook(new FileInputStream(tempfile))
         
-        def header = ImporterService.getHeader(wb)
-        render (view:"preview", model:[header:header])
+        def header = ImporterService.getHeader(wb, 0)
+        def datamatrix= ImporterService.getDatamatrix(wb, 0, 5)
+
+        render (view:"step1", model:[header:header, datamatrix:datamatrix])
+
     }
 }

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

@@ -25 +25 @@
     boolean transactional = true
 
-    def hello() { println "hello "}
-
     /**
     * @param is input stream representing the (workbook) resource
@@ -41 +39 @@
      * @return header representation as a string array
      */
-    def getHeader(HSSFWorkbook wb){
-        def sheet = wb.getSheetAt(0)
-        def row = 0
-        def header = []
-        def cellvalue
+    def getHeader(HSSFWorkbook wb, int sheetindex){
+
+        def sheet = wb.getSheetAt(sheetindex)
+        def datamatrix_start = sheet.getFirstRowNum() + 1
+        def header = []        
         def df = new DataFormatter()
 
-        for (HSSFCell c: sheet.getRow(row)) {
-            switch (c.getCellType()) {
-                    case HSSFCell.CELL_TYPE_STRING: header.add (df.formatCellValue(c)); break
-                    case HSSFCell.CELL_TYPE_NUMERIC: header.add (df.formatCellValue(c)); break
-                    case HSSFCell.CELL_TYPE_BLANK: header.add(""); break
-                    default: header.add("")
-            }       
+        for (HSSFCell c: sheet.getRow(sheet.getFirstRowNum())) {
+            def datamatrix_celltype = sheet.getRow(datamatrix_start).getCell(c.getColumnIndex()).getCellType()
+
+            // Check for every celltype, currently redundant code, but possibly this will be 
+            // a piece of custom code for every cell type like specific formatting
+            
+            switch (c.getCellType()) {
+                    case HSSFCell.CELL_TYPE_STRING:                     
+                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        break
+                    case HSSFCell.CELL_TYPE_NUMERIC:
+                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        break
+                    case HSSFCell.CELL_TYPE_BLANK:
+                        header.add (columnindex:c.getColumnIndex(), value:"-", celltype:datamatrix_celltype);
+                        break
+                    default:
+                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        break
+            }
         }
         return header
+    }
+
+    /**
+     * This method is meant to return a matrix of the rows and columns
+     * used in the preview
+     *
+     * @param wb workbook object
+     * @param sheetindex sheet index used
+     * @param rows amount of rows returned
+     * @return two dimensional array (matrix) of HSSFCell objects
+     */
+
+    HSSFCell[][] getDatamatrix(HSSFWorkbook wb, int sheetindex, int count) {
+        def sheet = wb.getSheetAt(sheetindex)
+        def rows  = []
+        def df = new DataFormatter()
+
+        (count <= sheet.getLastRowNum()) ?
+        ((1+sheet.getFirstRowNum())..count).each { rowindex ->
+
+            def row = []
+            for (HSSFCell c: sheet.getRow(rowindex))
+                row.add(c)
+                //row.add(df.formatCellValue(c))
+            rows.add(row)
+        } : 0
+
+        return rows
     }
 

trunk/grails-app/views/importer/step1.gsp

@@ -1 @@
-<!--
-  To change this template, choose Tools | Templates
-  and open the template in the editor.
--->
+<%
+        /**
+         * First step in the importer, showing a preview of the uploaded data
+         *
+         * @author Tjeerd Abma
+         * @since 20100129
+         * @package importer
+         *
+         * Revision information:
+         * $Rev$
+         * $Author$
+         * $Date$
+         */
+%>
 
 <%@ page contentType="text/html;charset=UTF-8" %>
@@ -9 +19 @@
   <head>
     <meta name="layout" content="main"/>
+    <link rel="stylesheet" href="${resource(dir: 'css', file: 'importer.css')}"/>
     <title>Import wizard preview</title>
   </head>
@@ -14 +25 @@
     <h1>Import wizard preview</h1>
     <p>Below you see a preview of your imported file, please correct the automatically detected types.</p>
-    <table>
-      <tr>
-        <g:each var="column" in="${header}">
-          <td>${column} 
-            <select name="celltype">
-              <option>String</option>
-              <option>Numeric</option>
-              <option>Date</option>
-              <option>Unknown</option>
-            </td>
-        </g:each>
-      </tr>
-  </table>
+  <importer:preview header="${header}" datamatrix="${datamatrix}"/>
   </body>
 </html>