Changeset 1215

Timestamp:

Nov 30, 2010, 9:28:59 AM (13 years ago)

Author:

t.w.abma@…

Message:

• step 3 (mapping properties) now requires all fields to be valid before one can continue to the next step, added validation

Location:

trunk/grails-app

Files:

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

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

@@ -165 +165 @@
      */
 
-    def saveMissingProperties = {
+    def saveMissingProperties = {        
+        def fielderrors = 0
+        def invalidentities = 0
         
         session.importer_importeddata.each { table ->
             table.each { entity ->
-                entity.giveFields().each { field ->                 
-                    entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
-                }               
-            }
-        }
+                // a new entity is being traversed, if a field cannot be set, increase this counter
+                fielderrors = 0
+
+                entity.giveFields().each { field ->                    
+                    try {
+                        // try to set the value
+                        entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])                        
+                    } catch (Exception e) {                    
+                        fielderrors++
+                    }
+                }
+
+                // a field could not be set in the entity, so the entity failed (is not validated)
+                if (fielderrors) invalidentities++
+
+                // all fields in the entity could be set, no errors, so remove it from the failed cells
+                if (!fielderrors) {
+                     session.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 fielderrors
+            } // end of record
+        } // end of table
 
         // a new ontology term was added, so stay at the current step otherwise go to the next step
         if (params.updatefield) render(view:"step3_simple", model:[datamatrix:session.importer_importeddata, failedcells:session.importer_failedcells])
-            else render(view:"step3", model:[datamatrix:session.importer_importeddata])
+            else 
+        if (invalidentities)
+            render(view:"step3_simple", model:[datamatrix:session.importer_importeddata, failedcells:session.importer_failedcells])
+        else
+            render(view:"step3", model:[datamatrix:session.importer_importeddata])
     }
 

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

@@ -57 +57 @@
 
           element.addClass('error')
-          element.append( new Option("Invalid: ${cell.value}","", true, true) );
+          element.append( new Option("Invalid: ${cell.value}","#invalidterm", true, true) );
   
           </g:each>