Changeset 203

Timestamp:

Feb 18, 2010, 8:10:35 AM (9 years ago)

Author:

tabma

Message:

• rewrote to HashMap? based columns (columns are always unique, storing in array tricky/redundancy)
• entities can be chosen in the preview
• properties page shows columns grouped per entity
• properties page allows mapping of column to property (TODO: get all fields per entity)

Location:

trunk

Files:

• grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (2 diffs)
• grails-app/domain/dbnp/importer/Column.groovy (added)
• grails-app/services/dbnp/importer/ImporterService.groovy (modified) (3 diffs)
• grails-app/taglib/dbnp/importer/ImporterTagLib.groovy (modified) (5 diffs)
• grails-app/views/importer/common/_preview.gsp (modified) (3 diffs)
• grails-app/views/importer/common/_properties.gsp (modified) (1 diff)
• grails-app/views/importer/step1.gsp (modified) (1 diff)
• grails-app/views/importer/step2.gsp (modified) (1 diff)
• grails-app/views/sandbox/index.gsp (modified) (1 diff)
• test/unit/dbnp/importer/ColumnTests.groovy (added)

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

@@ -46 +46 @@
         def datamatrix= ImporterService.getDatamatrix(wb, 0, 5)
 
+        session.header = header
+
         render (view:"step1", model:[header:header, datamatrix:datamatrix])
 
@@ -53 +55 @@
         def entities  = request.getParameterValues("entity")
 
-        render(view:"step2", model:[entities:entities])
+        render(view:"step2", model:[entities:entities, header:session.header])
     }
 }

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

@@ -19 +19 @@
 import org.apache.poi.poifs.filesystem.POIFSFileSystem
 import org.apache.poi.ss.usermodel.DataFormatter
-
+import dbnp.importer.Column
 
 class ImporterService {
@@ -43 +43 @@
         def sheet = wb.getSheetAt(sheetindex)
         def datamatrix_start = sheet.getFirstRowNum() + 1
-        def header = []        
+        //def header = []
+        def header = [:]
         def df = new DataFormatter()
+
 
         for (HSSFCell c: sheet.getRow(sheet.getFirstRowNum())) {
@@ -54 +56 @@
             switch (c.getCellType()) {
                     case HSSFCell.CELL_TYPE_STRING:                     
-                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        header[c.getColumnIndex()] = new dbnp.importer.Column(value:df.formatCellValue(c), type:datamatrix_celltype);
                         break
                     case HSSFCell.CELL_TYPE_NUMERIC:
-                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        header[c.getColumnIndex()] = new dbnp.importer.Column(value:df.formatCellValue(c), type:datamatrix_celltype);
                         break
                     case HSSFCell.CELL_TYPE_BLANK:
-                        header.add (columnindex:c.getColumnIndex(), value:"-", celltype:datamatrix_celltype);
+                        header[c.getColumnIndex()] = new dbnp.importer.Column(value:df.formatCellValue(c), type:datamatrix_celltype);
                         break
                     default:
-                        header.add (columnindex:c.getColumnIndex(), value:df.formatCellValue(c), celltype:datamatrix_celltype);
+                        header[c.getColumnIndex()] = new dbnp.importer.Column(value:df.formatCellValue(c), type:datamatrix_celltype);
                         break
             }

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 standardentities = [[type:0, name:"Study"], [type:1, name:"Subject"], [type:2, name:"Event"],
+                        [type:3, name:"Protocol"], [type: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"]]
+    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"]]
 
     /**
@@ -45 +45 @@
      */
     def properties = { attrs ->
-        def ent = []
+        def selectedentities = []
+        def header = attrs['header']
 
-        attrs['entities'].each { e ->
-            def temp = e.split(":")         
+        attrs['entities'].each { se ->
+            def temp = se.split(":")
             def entity = [type:temp[0],columnindex:temp[1]]
-            ent.add(entity)
+            selectedentities.add(entity)
         }
 
-        out << render (template:"common/properties", model:[entities:ent])
+        out << render (template:"common/properties", model:[selectedentities:selectedentities, standardentities:standardentities, header:header])
     }
 
@@ -60 +61 @@
 
         options.each { e ->
-            res += "<option value=\"${e.value}:${customvalue}\""
-            res += (e.value == selected) ? " selected" : ""
+            res += "<option value=\"${e.type}:${customvalue}\""
+            res += (e.type.toInteger() == selected) ? " selected" : ""
             res += ">${e.name}</option>"
         }
@@ -78 +79 @@
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
         def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
-        out << createSelect(selected, attrs['name'], entities, customvalue)
+        out << createSelect(selected, attrs['name'], standardentities, customvalue)
     }
 
@@ -90 +91 @@
         def selected = (attrs['selected']==null) ? -1 : attrs['selected']
         def customvalue = (attrs['customvalue']==null) ? "" : attrs['customvalue']
-        out << createSelect(selected, attrs['name'], celltypes, customvalue)
+        out << createSelect(selected, attrs['name'], standardcelltypes, customvalue)
     }
 }

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

@@ -19 +19 @@
           <g:each var="column" in="${header}">
               <td class="header">
-                  <b>${column.value}</b>
+                  <b>${column.value.value}</b>
               </td>
           </g:each>
@@ -25 +25 @@
 
         <tr>
-            <td>Datatype:</td>
+            <td>Celltype:</td>
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:celltypeSelect selected="${column.celltype}" name="celltype" customvalue="${column.columnindex.toString()}"/>
+                    <importer:celltypeSelect selected="${column.value.type.toInteger()}" name="celltype" customvalue="${column.key.toString()}"/>
                 </td>
             </g:each>
@@ -37 +37 @@
             <g:each var="column" in="${header}">
                 <td class="header">
-                    <importer:entitySelect name="entity" customvalue="${column.columnindex.toString()}"/>
+                    <importer:entitySelect name="entity" customvalue="${column.key.toString()}"/>
                 </td>
             </g:each>

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

@@ -15 +15 @@
 <g:form name="propertiesform" action="saveproperties">
     <table>
-        <tr>
-          <td>Entity:</td>
-
-          <g:each var="entity" in="${entities}">
-              <td class="header">
-                  <b>${entity}</b>
-              </td>
+          <g:each var="stdentity" in ="${standardentities}">
+              <tr><td colspan="2"><h4>${stdentity.name}</h4></td></tr>
+              <tr>
+                  <td>Columnname:</td><td>Property:</td>
+              </tr>           
+                <g:each var="selentity" in="${selectedentities}">
+                    <g:if test="${selentity.type.toLong()==stdentity.type}">
+                        <tr>
+                            <td class="header" width="200px">
+                                <b>${header[selentity.columnindex.toInteger()].value}</b>
+                            </td>
+                            <td>
+                                <g:select name="property" from="${['BMI', 'DOB', 'Gender']}" />
+                            </td>
+                    </g:if>
+                </g:each>
+              <tr>
+                  <td colspan="2">
+                      <hr />
+                  </td>
+              </tr>
           </g:each>
     </table>

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

@@ -27 +27 @@
   <importer:preview header="${header}" datamatrix="${datamatrix}"/>
   </body>
+
 </html>

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

@@ -26 +26 @@
     <h1>Step 2: import wizard entities/properties</h1>
     <p>Below you see the entities and columns, assign properties to the columns.</p>
-  <importer:properties entities="${entities}" />
+  <importer:properties entities="${entities}" header="${header}"/>
   </body>
 </html>

trunk/grails-app/views/sandbox/index.gsp

@@ -30 +30 @@
 </tr>
 </table>
+<%@
+ def a = new Column(value:"value", name:"naam")
+ println a.name
+%>
 </body>
 </html>