Changeset 1556

Timestamp:

Feb 24, 2011, 1:38:17 PM (9 years ago)

Author:

t.w.abma@…

Message:

• wizard error showing up too early removed, now only showing after clicking next on the "check imported data" step (this was already in there)
• importer wizard preview now shows entity being imported again
• uploaded file is deleted from the server when the importer wizard has completed

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (5 diffs)
• views/importer/common/_properties_horizontal.gsp (modified) (1 diff)

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

@@ -260 +260 @@
                                 // Grom a development message
                                 if (pluginManager.getGrailsPlugin('grom')) ".persisting instances to the database...".grom()
-
-                                if (saveEntities(flow, params)) {
-                                        //if (ImporterService.saveDatamatrix(flow.importer_study, flow.importer_importeddata)) {
-                                        //log.error ".import wizard succesfully persisted all entities"
-                                        //def session = sessionFactory.getCurrentSession()
-                                        //session.clear()
+                
+                // Always delete the uploaded file in the save step to be sure it doesn't reside there anymore
+                fileService.delete(flow.importer_importedfile)
+
+                                // Save all entities
+                if (saveEntities(flow, params)) {                                                                             
                                         success()
                                 } else {
@@ -334 +334 @@
          * @returns boolean true if correctly validated, otherwise false
          */
-        boolean fileImportPage(flow, flash, params) {
+        boolean fileImportPage(flow, flash, params) {        
                 def importedfile = fileService.get(params['importfile'])
-                //fileService.delete(YourFile)
+        flow.importer_importedfile = params['importfile']               
 
         if (importedfile.exists()) {
@@ -371 +371 @@
                         flow.importer_headerrow = params.headerrow.toInteger()
             flow.importer_entityclass = entityClass
-
+            flow.importer_entity = GdtService.cachedEntities.find{ it.entity==entityName }
+         
                         // Get the header from the Excel file using the arguments given in the first step of the wizard
                         flow.importer_header = ImporterService.getHeader(session.importer_workbook,
@@ -528 +529 @@
 
         // loop through all entities to validate them and add them to wizardErrors flash when invalid
-        table.each { record ->
+        /*table.each { record ->
             record.each { entity ->
                 if (!entity.validate()) {
@@ -534 +535 @@
                 }
             }
-        }
+        }*/
 
         flow.importer_failedcells = failedcells

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

@@ -16 +16 @@
 
 
-<!-- saveproperties action was defined in the form -->  
-  ${mappingname}
-
+<!-- saveproperties action was defined in the form -->    
     <table>
-              <tr><td colspan="3"><h4>defaultentity</h4></td></tr>
+              <tr><td colspan="3"><h4>${importer_entity.name}</h4></td></tr>
                 <tr>
             <td class="header" width="55px">