Changeset 173

Timestamp:

Feb 8, 2010, 8:23:33 AM (13 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) (3 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (2 diffs)
• grails-app/views/importer/common/_preview.gsp (modified) (2 diffs)
• test/unit/dbnp/importer/ImporterControllerTests.groovy (added)
• web-app/css/importer.css (modified) (1 diff)

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

@@ -26 +26 @@
     def ImporterService
 
+    /**
+     * Default page
+     **/
     def index = { }
 
@@ -31 +34 @@
     * This method will move the uploaded file to a temporary path and send the header
     * and the first n rows to the preview
+    * @param importfile uploaded file to import
     */
     def upload = {
@@ -46 +50 @@
 
     }
+
+    def accept = {
+        
+    }
 }

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

@@ -18 +18 @@
 class ImporterTagLib {
     static namespace = 'importer'
+    def entities = [[value:0, name:"Study"], [value:1, name:"Subject"], [value:2, name:"Event"],
+                        [value:3, name:"Protocol"], [value:4, name:"Sample"]]
+
+    def celltypes = [[value:0, name:"Numeric"], [value:1, name:"String"], [value:2, name:"Formula"],
+                         [value:3, name:"Blank"], [value:4, name:"Boolean"], [value:5, name:"Error"]]
 
     /**
@@ -32 +37 @@
     }
 
+    def createSelect(int selected, String name, ArrayList options) {
+        def res = "<select style=\"font-size:10px\" name=\"${name}\">"
+
+        options.each { e ->
+            res += "<option value=\"${e.value}\""
+            res += (e.value == selected) ? " selected" : ""
+            res += ">${e.name}</option>"
+        }
+
+        res += "</select>"
+        return res
+    }
+
+    /**
+     * @param selected selected entity
+     * @param name name of the HTML select object
+     **/
+    def entitySelect = { attrs ->       
+        def selected = (attrs['selected']==null) ? -1 : attrs['selected']
+        out << createSelect(selected, attrs['name'], entities)
+    }
+
     /**
     * @param selected selected celltype
     * @param name name of the HTML select object
-    * @param celltypes built-in cell types, based on the cell type
-    * @see org.apache.poi.ss.usermodel.Cell
+    * @see org.apache.poi.ss.usermodel.Cell for the possible cell types
     * @return HTML select object
     */
-    def celltypeselector = { attrs ->
-        def selected = attrs['selected']
-        def name = attrs['name']
-        def celltypes = [[celltype:0, name:"Numeric"], [celltype:1, name:"String"], [celltype:2, name:"Formula"],
-                         [celltype:3, name:"Blank"], [celltype:4, name:"Boolean"], [celltype:5, name:"Error"]]
-
-        def res = "<select name=\"${name}\">"
-
-        celltypes.each { c ->
-            res += "<option value=\"${c.celltype}\""
-            res += (c.celltype == selected) ? " selected" : ""
-            res += ">${c.name}</option>"
-        }
-
-        res += "</select>"
-
-        out << res
+    def celltypeSelect = { attrs ->
+        def selected = (attrs['selected']==null) ? -1 : attrs['selected']
+        out << createSelect(selected, attrs['name'], celltypes)
     }
-
 }

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

@@ -15 +15 @@
 <g:form name="previewform" action="accept">
     <table>
-      <tr>
-        <g:each var="column" in="${header}">        
-          <td>${column.value}<br />
-              <importer:celltypeselector selected="${column.celltype}" name="celltype[${column.columnindex}]"/>
-            </td>
-        </g:each>
-      </tr>
+        <tr>
+          <td>Columnname:</td>
+          <g:each var="column" in="${header}">
+              <td class="header">
+                  <b>${column.value}</b>
+              </td>
+          </g:each>
+        </tr>
+
+        <tr>
+            <td>Datatype:</td>
+            <g:each var="column" in="${header}">
+                <td class="header">
+                    <importer:celltypeSelect selected="${column.celltype}" name="celltype[${column.columnindex}]"/>
+                </td>
+            </g:each>
+        </tr>
+        
+        <tr>
+            <td>Entity:</td>
+            <g:each var="column" in="${header}">
+                <td class="header">
+                    <importer:entitySelect name="entity[${column.columnindex}]"/>
+                </td>
+            </g:each>
+        </tr>
+
         <g:each var="row" in="${datamatrix}">
             <tr>
+                <td>Value</td>
                 <g:each var="column" in="${row}">
-                    <td>
+                    <td class="datamatrix">
                         <g:if test="${column.toString()==''}">.</g:if>
                         <g:else>${column.toString()}</g:else>
@@ -32 +53 @@
             </tr>
         </g:each>
-      <tr>
-          <td align="right" colspan="${datamatrix.length}"><input type="submit" value="Accept"></td>
-      </tr>
+        <tr>
+            <td align="right" colspan="${datamatrix.length}"><input type="submit" value="Accept"></td>
+        </tr>
   </table>
   </g:form>

trunk/web-app/css/importer.css

@@ +1 @@
+.header
+{
+    border-collapse:collapse;
+    border-width: 1px;
+    border-color: red;
+    background-color: #DDDDDD;
+}
+
+.datamatrix
+{
+    background-color: #CCDDCC;
+}
+