Changeset 1367 for trunk/grails-app

Timestamp:

Jan 12, 2011, 11:50:56 AM (10 years ago)

Author:

t.w.abma@…

Message:

• added dialog (based on study wizard) for more detailed information what goes wrong in validation step

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (11 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• views/importer/common/_error.gsp (modified) (1 diff)
• views/importer/pages/_page_three.gsp (modified) (1 diff)

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

@@ -148 +148 @@
                         }
                 }
-
-
                 
                 // put your bussiness logic (if applicable) in here
@@ -214 +212 @@
                     success()
                 } else {
-                    log.error ".import wizard mapping error, could not validate all entities"                    
-                    error()                  
+                    log.error ".import wizard mapping error, could not validate all entities"
+                    error()
                 }
             }.to "pageFour"
@@ -284 +282 @@
 
         // render errors
-        error {
-            //println "error?"
+        error {                        
             render(view: "_error")
             onRender {
@@ -303 +300 @@
             on("toPageFour").to "pageFour"
             on("toPageFive").to "save"
-
         }
 
@@ -466 +462 @@
                         // field of type ontology and value "#invalidterm"?
                         if (field.type == dbnp.studycapturing.TemplateFieldType.ONTOLOGYTERM &&
-                            params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] == "#invalidterm"                            
+                            params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] == "#invalidterm"
                         ) {
                             invalidontologies++
                         } else
-                            entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])                                                
+                        if (field.type == dbnp.studycapturing.TemplateFieldType.ONTOLOGYTERM &&
+                            params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] != "#invalidterm") {
+                            removeFailedCell(flow.importer_failedcells, entity)
+                            entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
+                        }
+                        else
+                            entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
                 }
 
@@ -482 +484 @@
                     flow.importer_invalidentities++
 
-                    // add errors to map
-                    this.appendErrors(entity, flash.wizardErrors, 'subject_' + entity.getIdentifier() + '_')                    
+                    // add errors to map                    
+                    this.appendErrors(entity, flash.wizardErrors, "entity_"+entity.getIdentifier() + "_")
                     
                                         entity.errors.getAllErrors().each() {
@@ -489 +491 @@
                                         }
                 } else {                    
-                    // Valid entity, remove it from failedcells
-                    flow.importer_failedcells.each { record ->
-                        record.importcells.each { cell ->
-                            // remove the cell from the failed cells session
-                                if (cell.entityidentifier == entity.getIdentifier()) {
-                                record.removeFromImportcells(cell)
-                            }
-                        } // end of importcells
-                    } // end of failedcells
+                    removeFailedCell(flow.importer_failedcells, entity)
                 } // end else if
 
@@ -505 +499 @@
         return (flow.importer_invalidentities == 0) ? true : false
     } // end of method
+
+    /**
+     * @param failedcell failed ontology cells
+     * @param entity entity
+     */
+    def removeFailedCell(failedcells, entity) {
+        // Valid entity, remove it from failedcells
+        failedcells.each { record ->
+            record.importcells.each { cell ->
+            // remove the cell from the failed cells session
+                if (cell.entityidentifier == entity.getIdentifier()) {
+                    record.removeFromImportcells(cell)
+                }
+            } // end of importcells
+        } // end of failedcells
+    }
 
     /**
@@ -537 +547 @@
         def appendErrors(object, map) {
                 this.appendErrorMap(getHumanReadableErrors(object), map)
-        }
+    }
 
         def appendErrors(object, map, prepend) {
@@ -551 +561 @@
         def appendErrorMap(map, mapToExtend) {
                 map.each() {key, value ->
-                        mapToExtend[key] = ['key': key, 'value': value, 'dynamic': false]
+                        mapToExtend[key] = ['key': key, 'value': value, 'dynamic': false]            
                 }
         }
@@ -571 +581 @@
                 object.errors.getAllErrors().each() { error ->
                         // error.codes.each() { code -> println code }
+            println "errors is " + error
 
                         // generally speaking g.message(...) should work,

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

@@ -388 +388 @@
      */
     boolean persistEntity(entity) {
-            println "persisting ${entity}"        
-            // if not validated
-                if (entity.validate()) {
-                        if (entity.save(flush:true)) { //.merge?
-                                return true
-                        }
-                        else { // if save was unsuccesful
-                                entity.errors.allErrors.each {
-                                        println it
-                                }
-                                return false
-                        }
-                }
-            else { // if not validated
-                    entity.errors.each {
-                            println it
-                    }
-                        return false
-            }
+            log.info ".import wizard persisting ${entity}"
+            
+        if (entity.save(flush:true))
+            return true
+        else { // if save was unsuccesful
+            entity.errors.allErrors.each {
+                log.error ".import wizard: " + it
+            }
+            return false
+        }
          }
 

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

@@ -1 +1 @@
 <%
-        /**
-         * Error template
-         *
-         * @author Tjeerd Abma
-         * @since 20101008
-         * @package importer
-         *
-         * Revision information: 
-         * $Rev$
-         * $Author$
-         * $Date$
-         */
+/**
+ * Import Wizard error template
+ *
+ * @author Jeroen Wesbeek
+ * @since 20100114
+ * @package wizard
+ * @see dbnp.studycapturing.ImporterTagLib
+ * @see dbnp.studycapturing.ImporterController
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
+ */
 %>
-<html>
-  <head>
-    <meta name="layout" content="main"/>
-    <title>Importer wizard - error</title>
-  </head>
-  <body>
-  The following went wrong:<br/>
-  <p>${error}</p>
-  </body>
-</html>
+<g:if test="${wizardErrors}">
+        <div id="wizardError" class="error" title="Import wizard errors">
+                <g:each in="${wizardErrors}" var="error" status="e">
+                        <p>
+                                <g:if test="${!e}"><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 50px 0;"></span></g:if>
+                                ${error.value['key']} &rarr; ${error.value['value']}
+                        </p>
+                </g:each>
+        </div>
+        <script type="text/javascript">
+                // mark error fields
+                <g:each in="${wizardErrors}" var="error">
+                var element = $("input:[name='${error.key}'], input:[name='${error.key.toLowerCase().replaceAll("([^a-z0-9])","_")}'], select:[name='${error.key}'], select:[name='${error.key.toLowerCase().replaceAll("([^a-z0-9])","_")}'], textarea:[name='${error.key}'], textarea:[name='${error.key.toLowerCase().replaceAll("([^a-z0-9])","_")}']");
+                  <g:if test="${error.value['dynamic']}">
+                element.addClass('error');
+                 </g:if><g:else>
+                element.parent().parent().removeClass('required');
+                element.parent().parent().addClass('error');
+                 </g:else>
+                </g:each>
+
+                // show error dialog
+                var we = $("div#wizardError");
+                we.dialog({
+                        modal: true,
+                        width: 600,
+                        buttons: {
+                                Ok: function() {
+                                        $(this).dialog('close');
+                                        we.remove();
+                                }
+                        }
+                });
+        </script>
+</g:if>

trunk/grails-app/views/importer/pages/_page_three.gsp

@@ -17 +17 @@
     <importer:missingProperties datamatrix="${importer_importeddata}" failedcells="${importer_failedcells}"/>
 </af:page>
+
+<g:render template="common/error"/>