Changeset 1223

Timestamp:

Nov 30, 2010, 3:56:07 PM (12 years ago)

Author:

t.w.abma@…

Message:

• improved error messaging in the last step of the wizard

Location:

trunk/grails-app

Files:

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

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

@@ -377 +377 @@
             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

@@ -283 +283 @@
         def entitystored = null
         def failedtopersist = []
+        def persisterrors = []
         def updatedentities = []
         study.refresh()
@@ -292 +293 @@
                         case Study       :  print "Persisting Study `" + entity + "`: "
                                                 entity.owner = AuthenticationService.getLoggedInUser()
+                                                println "storing study" + entity
+                                                println "dump=" + entity.dump()
+                                                println "validate=" + entity.validate()
                                                 if (persistEntity(entity)) validatedSuccesfully++;
                                                     else failedtopersist.add(entity)
@@ -324 +328 @@
                                                     study.addToSamples(entity)
                                                     if (persistEntity(study)) validatedSuccesfully++;                                                       
-                                                } else failedtopersist.add(entity)
+                                                } else {
+                                                    failedtopersist.add(entity)
+                                                }
                                                 
                                                 break
@@ -396 +402 @@
      */
     boolean persistEntity(entity) {
-            println "persisting ${entity}"            
+            println "persisting ${entity}"        
             // if not validated
                 if (entity.validate()) {

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

@@ -31 +31 @@
       <p>The following entities could not be persisted:</p>
       <table>     
-      <g:each var="entity" in="${failedtopersist}">
+      <g:each var="entity" in="${failedtopersist}">       
         <tr>
         <g:each var="field" in="${entity.giveFields()}">
@@ -42 +42 @@
           </td>
         </g:each>
+        <td>
+           <g:each var="error" in="${entity.errors.allErrors}">
+             <b>error</b>: field `${error.getField()}` rejected value: ${error.getRejectedValue()}</b>
+        </g:each>
+        </td>
       </tr>
       </g:each>