Changeset 1202 for trunk/grails-app/controllers

Timestamp:

Nov 25, 2010, 3:51:14 PM (11 years ago)

Author:

t.w.abma@…

Message:

• removed extra step and implemented a failed cells check in step 3 (missing mappings) which shows the failed ontologies in the table editor (might have to tune appearance)

File:

• trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)

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

@@ -170 +170 @@
             table.each { entity ->
                 entity.giveFields().each { field ->                 
-                    entity.setFieldValue (field.toString(), params["entity_" + entity.hashCode() + "_" + field.escapedName()])
+                    entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
                 }               
             }
@@ -176 +176 @@
 
         // 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])
+        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])
     }
@@ -323 +323 @@
         session.importer_failedcells = failedcells
 
-        if (failedcells.size()!=0)
+        // Are there any failed cells, then show an extra step to correct the cells
+        /*if (failedcells.size()!=0)
             render(view:"step2a_simple", model:[failedcells:session.importer_failedcells])
-        else {
+        else {*/
             if (params.layout=="horizontal")
-                render(view:"step3_simple", model:[datamatrix:session.importer_importeddata])
+                render(view:"step3_simple", model:[datamatrix:session.importer_importeddata, failedcells:session.importer_failedcells])
             else if (params.layout=="vertical")
                 render(view:"step3", model:[datamatrix:session.importer_importeddata])
-        }
+        //}
     }