Show
Ignore:
Timestamp:
25-11-10 15:51:14 (3 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)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/grails-app/controllers/dbnp/importer/ImporterController.groovy

    r1194 r1202  
    170170            table.each { entity -> 
    171171                entity.giveFields().each { field ->                  
    172                     entity.setFieldValue (field.toString(), params["entity_" + entity.hashCode() + "_" + field.escapedName()]) 
     172                    entity.setFieldValue (field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()]) 
    173173                }                
    174174            } 
     
    176176 
    177177        // a new ontology term was added, so stay at the current step otherwise go to the next step 
    178         if (params.updatefield) render(view:"step3_simple", model:[datamatrix:session.importer_importeddata]) 
     178        if (params.updatefield) render(view:"step3_simple", model:[datamatrix:session.importer_importeddata, failedcells:session.importer_failedcells]) 
    179179            else render(view:"step3", model:[datamatrix:session.importer_importeddata]) 
    180180    } 
     
    323323        session.importer_failedcells = failedcells 
    324324 
    325         if (failedcells.size()!=0) 
     325        // Are there any failed cells, then show an extra step to correct the cells 
     326        /*if (failedcells.size()!=0) 
    326327            render(view:"step2a_simple", model:[failedcells:session.importer_failedcells]) 
    327         else { 
     328        else {*/ 
    328329            if (params.layout=="horizontal") 
    329                 render(view:"step3_simple", model:[datamatrix:session.importer_importeddata]) 
     330                render(view:"step3_simple", model:[datamatrix:session.importer_importeddata, failedcells:session.importer_failedcells]) 
    330331            else if (params.layout=="vertical") 
    331332                render(view:"step3", model:[datamatrix:session.importer_importeddata]) 
    332         } 
     333        //} 
    333334    } 
    334335