Changeset 485 for trunk

Timestamp:

May 27, 2010, 1:13:50 PM (11 years ago)

Author:

tabma

Message:

• refactored (now using configuration file where entities to be used are configured)

Location:

trunk/grails-app

Files:

• conf/Config.groovy (modified) (2 diffs)
• controllers/dbnp/importer/ImporterController.groovy (modified) (6 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (3 diffs)
• views/importer/common/_properties.gsp (modified) (2 diffs)
• views/importer/index_advanced.gsp (modified) (1 diff)
• views/importer/index_simple.gsp (modified) (1 diff)
• views/importer/step2.gsp (moved) (moved from trunk/grails-app/views/importer/step2_advanced.gsp)
• views/importer/step2_simple.gsp (modified) (1 diff)
• views/importer/step3.gsp (moved) (moved from trunk/grails-app/views/importer/step3_advanced.gsp)
• views/importer/step3_simple.gsp (deleted)
• views/importer/step4.gsp (moved) (moved from trunk/grails-app/views/importer/step4_advanced.gsp)
• views/importer/step4_simple.gsp (deleted)

trunk/grails-app/conf/Config.groovy

@@ -7 +7 @@
  * Revision information:
  * $Rev$
- * $Author:$
+ * $Author$
  * $Date$
  */
@@ -143 +143 @@
                 // @see ImporterController
                 importableEntities: [
-                    study       : [name: 'Study', entity: 'dbnp.studycapturing.Study'],
-                        subject : [name: 'Subject', entity: 'dbnp.studycapturing.Subject'],
-                        sample  : [name: 'Sample', entity: 'dbnp.studycapturing.Sample']
+                        none    : [name: 'None', entity:'', type:-1],
+                        event   : [name: 'Event', entity:'dbnp.studycapturing.Event', type:2],
+                        protocol: [name: 'Protocol', entity:'dbnp.studycapturing.Protocol', type:3],
+                        sample  : [name: 'Sample', entity: 'dbnp.studycapturing.Sample', type:4],
+                        study   : [name: 'Study', entity: 'dbnp.studycapturing.Study', type:0],
+                        subject : [name: 'Subject', entity: 'dbnp.studycapturing.Subject', type:1]
+
                 ]
         ]

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

@@ -30 +30 @@
 import dbnp.studycapturing.TemplateField
 import grails.converters.JSON
+import org.apache.poi.hssf.usermodel.HSSFWorkbook
 
 class ImporterController {
@@ -53 +54 @@
     * @param importfile uploaded file to import
     */
-    def upload = {
-        def downloadedfile = request.getFile('importfile');
+    def upload_advanced = {
+        def wb = handleUpload('importfile')
+        
+        session.importer_header = ImporterService.getHeader(wb, 0)
+        session.importer_template_id = params.template_id
+        session.importer_workbook = wb
+
+        render (view:"step1_advanced", model:[header:session.importer_header, datamatrix:ImporterService.getDatamatrix(wb, 0, 5)])
+    }
+
+    /**
+    * This method will move the uploaded file to a temporary path and send the header
+    * and the rows to the postview
+    *
+    * @param importfile uploaded file to import
+    * @param entity string representation of the entity chosen
+    */
+    def upload_simple = {
+        def wb = handleUpload('importfile')
+        def entity = grailsApplication.config.gscf.domain.importableEntities.get(params.entity).entity
+        def entityClass = Class.forName(entity, true, this.getClass().getClassLoader()) 
+
+        session.importer_header = ImporterService.getHeader(wb, 0, entityClass)
+        session.importer_template_id = params.template_id
+        session.importer_workbook = wb
+
+        //import workbook
+        //session.importer_importeddata = ImporterService.importdata(session.importer_template_id, session.importer_workbook, 0, 1, session.importer_header)
+
+        //println "DAS" + session.importer_header
+
+        //render(view:"step2_simple", model:[datamatrix:session.importer_importeddata])
+        def templates = Template.get(session.importer_template_id)
+        
+        render(view:"step2", model:[entities:entities, header:session.importer_header, templates:templates])
+    }
+
+    /**
+     * This method handles a file being uploaded and storing it in a temporary directory
+     * and returning a workbook
+     *
+     * @param formfilename name used for the file field in the form
+     * @return workbook object reference
+     */
+    private HSSFWorkbook handleUpload(formfilename) {
+
+        def downloadedfile = request.getFile(formfilename);
         def tempfile = new File(System.getProperty('java.io.tmpdir') + File.separatorChar + System.currentTimeMillis() + ".nmcdsp")
         downloadedfile.transferTo(tempfile)
-        
-        def wb = ImporterService.getWorkbook(new FileInputStream(tempfile))
-        
-        def header = ImporterService.getHeader(wb, 0)
-        def datamatrix= ImporterService.getDatamatrix(wb, 0, 5)
-
-        session.importer_header = header
-        session.importer_template_id = params.template_id
-        session.importer_workbook = wb
-
-        render (view:"step1", model:[header:header, datamatrix:datamatrix])
+
+        return ImporterService.getWorkbook(new FileInputStream(tempfile))
     }
 
@@ -74 +111 @@
     * All information of the columns is stored in a session as MappingColumn object
     *
-    * @param entity list of entities and columns it has been assigned to (columnindex:entitytype format)
+    * @param entities list of entities and columns it has been assigned to (columnindex.entitytype)
     * @param templatefieldtype list of celltypes and columns it has been assigned to (columnindex:templatefieldtype format)
     * @return properties page
@@ -83 +120 @@
         def tft = null  
         def identifiercolumnindex = (params.identifier!=null) ? params.identifier.toInteger() : -1
+        def selectedentities = []
+
+        // loop all entities and see which column has been assigned which entitytype
+        // and build an array containing the selected entities
+        params.entity.index.each { columnindex, entityname ->
+            def _entity = [name:entityname,columnindex:columnindex.toInteger()]
+            selectedentities.add(_entity)
+        }
 
         params.templatefieldtype.index.each { columnindex, _templatefieldtype ->
@@ -108 +153 @@
         }
 
-        params.entity.index.each { columnindex, entitytype ->
+        params.entity.index.each { columnindex, entityname ->
             Class clazz
 
-            switch (entitytype.toInteger()) {
-                case 0: clazz = Study
-                        break
-                case 1: clazz = Subject
-                        break
-                case 2: clazz = Event
-                        break
-                case 3: clazz = Protocol
-                        break
-                case 4: clazz = Sample
+            switch (entityname) {
+                case "Study"    : clazz = Study
+                        break
+                case "Subject"  : clazz = Subject
+                        break
+                case "Event"    : clazz = Event
+                        break
+                case "Protocol" : clazz = Protocol
+                        break
+                case "Sample"   : clazz = Sample
                         break
                 default: clazz = Object
@@ -136 +181 @@
         def templates = Template.get(session.importer_template_id)
 
-        render(view:"step2", model:[entities:params.entity, header:session.importer_header, templates:templates])
+        render(view:"step2", model:[entities:selectedentities, header:session.importer_header, templates:templates])
     }
 

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

@@ -46 +46 @@
     /**
      * @param wb high level representation of the workbook
+     * @param sheetindex sheet to use within the workbook
      * @return header representation as a MappingColumn hashmap
      */
-    def getHeader(HSSFWorkbook wb, int sheetindex){
+    def getHeader(HSSFWorkbook wb, int sheetindex, theEntity=0){
 
         def sheet = wb.getSheetAt(sheetindex)
@@ -55 +56 @@
         def header = [:]
         def df = new DataFormatter()
-
+        def property = new dbnp.studycapturing.TemplateField()
 
         for (HSSFCell c: sheet.getRow(datamatrix_start)) {
@@ -67 +68 @@
             switch (datamatrix_celltype) {
                     case HSSFCell.CELL_TYPE_STRING:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index, entity:theEntity, property:property);
                             break
                     case HSSFCell.CELL_TYPE_NUMERIC:                    
                             if (HSSFDateUtil.isCellDateFormatted(c)) {
-                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE, index:index)
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.DATE, index:index, entity:theEntity, property:property)
                             }
                             else
-                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER,index:index);
+                                header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.INTEGER,index:index, entity:theEntity, property:property);
                             break
                     case HSSFCell.CELL_TYPE_BLANK:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING, index:index, entity:theEntity, property:property);
                             break
                     default:
-                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING,index:index);
+                            header[index] = new dbnp.importer.MappingColumn(name:df.formatCellValue(headercell), templatefieldtype:TemplateFieldType.STRING,index:index, entity:theEntity, property:property);
                             break
             }
@@ -160 +161 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
+
         
         // walk through all rows        
         (rowindex..sheet.getLastRowNum()).each { i ->
-            table.add(createRecord(template_id, sheet.getRow(i), mcmap))            
+            table.add(createRecord(template_id, sheet.getRow(i), mcmap))
         }
 
@@ -263 +265 @@
         def sample = new Sample(name:"New sample", template:template)
 
-        for (HSSFCell cell: excelrow) {
+        for (HSSFCell cell: excelrow) {     
             def mc = mcmap[cell.getColumnIndex()]
-            def value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)         
+            def value = formatValue(df.formatCellValue(cell), mc.templatefieldtype)
 
             switch(mc.entity) {

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

@@ -22 +22 @@
 class ImporterTagLib {
     static namespace = 'importer'
-    def standardentities = [[type:-1, name:"Don't import"], [type:0, name:"Study"], [type:1, name:"Subject"], [type:2, name:"Event"],
-                        [type:3, name:"Protocol"], [type:4, name:"Sample"]]
 
     /**
@@ -53 +51 @@
 
     /**
-     * @param entities array
+     * @param entities array containing selected entities
      */
     def properties = { attrs ->
-        def selectedentities = []
         def header = attrs['header']
+        def entities = attrs['entities']
 
-        attrs['entities'].index.each { columnindex, entitytype ->
-            def entity = [type:entitytype,columnindex:columnindex.toInteger()]
-            selectedentities.add(entity)
-        }
-
-        out << render (template:"common/properties", model:[selectedentities:selectedentities, standardentities:standardentities, header:header])
+        out << render ( template:"common/properties",
+                        model:[selectedentities:entities,
+                        standardentities:grailsApplication.config.gscf.domain.importableEntities,
+                        header:header])
     }
 
@@ -124 +120 @@
         def res = "<select style=\"font-size:10px\" name=\"${name}.index.${custval}\">"
 
-        standardentities.each { e ->
-            res += "<option value=\"${e.type}\""
-            res += (e.type == sel) ? " selected" : ""
-            res += ">${e.name}</option>"
+        grailsApplication.config.gscf.domain.importableEntities.each { e ->
+            res += "<option value=\"${e.value.name}\""
+            res += (e.value.type == sel) ? " selected" : ""
+            res += ">${e.value.name}</option>"
         }
 

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

@@ -17 +17 @@
     <table>
           <g:each var="stdentity" in ="${standardentities}">
-              <% if (selectedentities.any { it.type.toInteger() ==stdentity.type.toInteger()} && stdentity.type.toInteger()!=-1) { %>
-              <tr><td colspan="2"><h4>${stdentity.name}</h4></td></tr>
+              <% if (selectedentities.any { it.name == stdentity.value.name } && stdentity.value.name!="") { %>
+              <tr><td colspan="2"><h4>${stdentity.value.name}</h4></td></tr>
               <tr>                
                   <td>Columnname:</td>
@@ -24 +24 @@
               </tr>           
                 <g:each var="selentity" in="${selectedentities}">
-                    <g:if test="${selentity.type.toLong()==stdentity.type}">
+                    <g:if test="${selentity.name==stdentity.value.name}">
                         <tr>                        
                             <td class="header" width="200px">

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

@@ -14 +14 @@
     <h1>Importer wizard (advanced)</h1>
     <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.</p>
-        <g:form controller="importer" method="post" action="upload" enctype="multipart/form-data">
+        <g:form controller="importer" method="post" action="upload_advanced" enctype="multipart/form-data">
         <table border="0">
         <tr>

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

@@ -57 +57 @@
     <h1>Importer wizard (simple)</h1>
     <p>You can import your Excel data to the server by choosing a file from your local harddisk in the form below.</p>
-        <g:form controller="importer" method="post" action="upload" enctype="multipart/form-data">
+        <g:form controller="importer" method="post" action="upload_simple" enctype="multipart/form-data">
         <table border="0">
         <tr>

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

@@ -21 +21 @@
     <meta name="layout" content="main"/>
     <link rel="stylesheet" href="${resource(dir: 'css', file: 'importer.css')}"/>
-    <title>Step 2: import wizard entities/properties</title>
+    <title>Step 2: import wizard properties/columns</title>
   </head>
   <body>
-    <h1>Step 2: import wizard entities/properties</h1>    
-    <p>First select the study you want to add the data to. The next step is to assign properties to the columns. Below you see the entities and columns, please make your
-    selections.</p>
+    <h1>Step 2: import wizard properties/columns</h1>
+    <p>The next step is to assign properties to the columns. Below you see the columns, please assign every column to
+    a property.</p>
   <importer:properties entities="${entities}" header="${header}" templates="${templates}"/>
   </body>