Changeset 1207

Timestamp:

Nov 26, 2010, 1:02:51 PM (11 years ago)

Author:

t.w.abma@…

Message:

• added an initial simple overview in last step of import wizard showing entities which failed to be persisted

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• views/importer/step4.gsp (modified) (1 diff)

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

@@ -344 +344 @@
                     model:[error:"Data is already imported or you are calling the url directly without following the previous import steps."])
         } else {
-            session.validatedSuccesfully = ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
-            render(view:"step4", model:[validatedSuccesfully:session.validatedSuccesfully, totalrows:session.importer_importeddata.size, referer: session.import_referer])
+            def (validatedSuccesfully, updatedEntities, failedtopersist) = ImporterService.saveDatamatrix(session.importer_study, session.importer_importeddata)
+            session.validatedSuccesfully = validatedSuccesfully
+            render(view:"step4", model:[validatedSuccesfully:session.validatedSuccesfully, failedtopersist:failedtopersist, updatedentities:updatedEntities, totalrows:session.importer_importeddata.size, referer: session.import_referer])
             session.import_wizard_init = false
+
+            println "failed:"
+            failedtopersist.each {
+                println it
+            }
         }
     }

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

@@ -281 +281 @@
     def saveDatamatrix(Study study, datamatrix) {
         def validatedSuccesfully = 0
-        def entitystored = null        
-        study.refresh()        
-        
+        def entitystored = null
+        def failedtopersist = []
+        def updatedentities = []
+        study.refresh()
+        
         // go through the data matrix, read every record and validate the entity and try to persist it
         datamatrix.each { record ->
@@ -290 +292 @@
                         case Study       :  print "Persisting Study `" + entity + "`: "
                                                 entity.owner = AuthenticationService.getLoggedInUser()
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Subject     :  print "Persisting Subject `" + entity + "`: "
@@ -300 +303 @@
                                                 // this entity is new, so add it to the study
                                                 if (entitystored==null) study.addToSubjects(entity)
-                                                else // existing entity, so update it
+                                                else { // existing entity, so update it
                                                     updateEntity(entitystored, entity)
-
-                                                if (persistEntity(study)) validatedSuccesfully++
+                                                    updatedentities.add(entity)
+                                                }
+
+                                                if (persistEntity(study)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Event       :  print "Persisting Event `" + entity + "`: "
                                                 entity.parent = study
                                                 study.addToEvents(entity)
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         case Sample      :  print "Persisting Sample `" + entity +"`: "                                                
@@ -316 +323 @@
                                                 if (entity.validate()) {
                                                     study.addToSamples(entity)
-                                                    if (persistEntity(study)) validatedSuccesfully++
-                                                }
+                                                    if (persistEntity(study)) validatedSuccesfully++;                                                       
+                                                } else failedtopersist.add(entity)
                                                 
                                                 break
@@ -323 +330 @@
                                                 entity.parent = study
                                                 study.addToSamplingEvents(entity)
-                                                if (persistEntity(entity)) validatedSuccesfully++
+                                                if (persistEntity(entity)) validatedSuccesfully++;
+                                                    else failedtopersist.add(entity)
                                                 break
                         default          :  println "Skipping persisting of `" + entity.getclass() +"`"
+                                                failedtopersist.add(entity)
                                                 break
                         } // end switch
             } // end record
         } // end datamatrix
-        return validatedSuccesfully
+        return [validatedSuccesfully, updatedentities, failedtopersist]
     }
 

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

@@ -25 +25 @@
     <h1>Step 5: import wizard finished</h1>
     <p>${validatedSuccesfully} of ${totalrows} rows were imported succesfully.</p>
+
+
+
+    <g:if test="${failedtopersist}">
+      <p>The following entities could not be persisted:</p>
+      <table>     
+      <g:each var="entity" in="${failedtopersist}">
+        <tr>
+        <g:each var="field" in="${entity.giveFields()}">
+          <td>
+            <g:if test="${entity.getFieldValue(field.name)!=null}">
+              <b>${field.name}</b> ${entity.getFieldValue(field.name)}
+            </g:if>
+           <g:else><b>${field.name}</b> &#215;
+            </g:else>
+          </td>
+        </g:each>
+      </tr>
+      </g:each>
+      </table>
+    </g:if>
+
+
     <g:if test="${referer}">
       <p>Click <a href="${referer}">here</a> to return to the page you came from.</p>