Changeset 283

Timestamp:

Mar 18, 2010, 10:17:02 AM (13 years ago)

Author:

tabma

Message:

• final step in the wizard, implemented method in the ImporterService? to persist the entities into the database

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (4 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• views/importer/common/_postview.gsp (added)
• views/importer/step3.gsp (added)
• views/importer/step4.gsp (added)

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

@@ -146 +146 @@
                 session.header[temp[0].toInteger()].property = TemplateField.get(temp[1].toInteger())
         }
-        
-        /*for (e in session.header) {
-            println e
-        }*/
 
         //import workbook
-        ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 1, session.header)
-        //println session.header.dump()
+        session.importeddata = ImporterService.importdata(session.importtemplate_id, session.workbook, 0, 1, session.header)    
 
-        render ("properties saved")
+        render(view:"step3", model:[datamatrix:session.importeddata])
+    }
+
+    def savepostview = {
+        ImporterService.savedata(session.importeddata)
+        render(view:"step4")
     }
 }

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

@@ -151 +151 @@
     * @param sheetindex sheet to use when using multiple sheets
     * @param rowindex first row to start with reading the actual data (NOT the header)
+    * @return two dimensional array containing records (with entities)
     * 
     * @see dbnp.importer.MappingColumn
@@ -163 +164 @@
         }
 
-        table.each {
+        /*table.each {
             it.each { entity ->
                 entity.giveFields().each { field ->
@@ -170 +171 @@
                 println
             }
-        }
-    }
+        }*/
+
+        return table    
+    }
+    
+    /**
+     * @param datamatrix two dimensional array containing entities with values read from Excel file
+     */    
+    def savedata(datamatrix) {
+        datamatrix.each { record ->
+            record.each { entity ->
+                switch (entity.getClass()) {
+                    case Study   :  print "Persisting Study `" + entity.title + "`: "
+                                    entity.save()
+                                    println "OK"
+                                    break
+                    case Subject :  print "Persisting Subject `" + entity.name + "`: "
+                                    entity.save()
+                                    println "OK"
+                                    break
+                    case Event   :  print "Persisting Event `" + entity.eventdescription + "`: "
+                                    entity.save()
+                                    println "OK"
+                                    break
+                    case Protocol:  print "Persisting Protocol `" + entity.name + "`: "
+                                    entity.save()
+                                    println "OK"
+                                    break
+                    case Sample  :  print "Persisting Sample `" + entity.name +"`: "
+                                    entity.save()
+                                    println "OK"
+                                    break
+                    default      :  println "Skipping persistance of `" + entity.getclass() +"`"
+                                    break
+                }
+            }
+        }
+    }
+
     /**
      * This method created a record (array) containing entities with values
+     *
+     * @param template_id template identifier
+     * @param excelrow POI based Excel row containing the cells
+     * @param mcmap map containing MappingColumn objects
      */
     def createRecord(template_id, HSSFRow excelrow, mcmap) {
@@ -181 +223 @@
 
         def study = new Study(title:"New study", template:template)
-        def subject = new Subject(title:"New subject", template:template)
-        def event = new Event(title:"New event", template:template)
-        def protocol = new Protocol(title:"New protocol", template:template)
-        def sample = new Sample(title:"New sample", template:template)
-
-        /*record.add(study)
-        record.add(subject)
-        record.add(event)
-        record.add(protocol)
-        record.add(sample)*/
+        def subject = new Subject(name:"New subject", template:template)
+        def event = new Event(eventdescription:"New event", template:template)
+        def protocol = new Protocol(name:"New protocol", template:template)
+        def sample = new Sample(name:"New sample", template:template)
 
         for (HSSFCell cell: excelrow) {

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

@@ -34 +34 @@
 
         out << render (template:"common/preview", model:[header:header, datamatrix:datamatrix])
+    }
+
+    /**
+     * @param datamatrix two dimensional array containing entities with read values
+     * @return postview of the imported data
+     */
+    def postview = { attrs ->
+        def datamatrix = attrs['datamatrix']
+
+        out << render (template:"common/postview", model:[datamatrix:datamatrix])
     }