Changeset 1489

Timestamp:

Feb 3, 2011, 5:07:42 PM (10 years ago)

Author:

t.w.abma@…

Message:

• improved missing values in stringlist fields, still to fix: make cell identifier really unique

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (9 diffs)
• services/dbnp/importer/ImporterService.groovy (modified) (1 diff)
• views/importer/common/_missingproperties.gsp (modified) (1 diff)
• views/importer/common/_on_page.gsp (modified) (2 diffs)
• views/importer/index.gsp (modified) (2 diffs)
• views/importer/pages/_page_one.gsp (modified) (1 diff)

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

@@ -111 +111 @@
 
             on("refresh") {
-                flash.importer_params = params
+                flash.importer_params = params                
                                 success()
                         }.to "pageOne"
@@ -251 +251 @@
                         render(view: "_error")
                         onRender {
-
                                 // Grom a development message
                                 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial pages/_error.gsp".grom()
@@ -267 +266 @@
                         render(view: "_final_page")
                         onRender {
-                                println "EEN"
                                 // Grom a development message
                                 if (pluginManager.getGrailsPlugin('grom')) ".rendering the partial pages/_final_page.gsp".grom()
-                                println "TWEE"
-
-                                success()
-                                println "DRIE"
+                                success()
                         }
                         onEnd {
@@ -422 +417 @@
                 flow.importer_importeddata.each { table ->
                         table.each { entity ->
-                                def invalidontologies = 0
+                                def invalidfields = 0
 
                                 // Set the fields for this entity by retrieving values from the params
@@ -430 +425 @@
                                                 params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] == "#invalidterm"
                                         ) {
-                                                invalidontologies++
+                                                invalidfields++
                                         } else
                                         if (field.type == org.dbnp.gdt.TemplateFieldType.ONTOLOGYTERM &&
                                                 params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] != "#invalidterm") {
-                                                removeFailedCell(flow.importer_failedcells, entity)
+                                                if (entity) removeFailedCell(flow.importer_failedcells, entity, field)
+                        println "removedcellontology" + entity
                                                 entity.setFieldValue(field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
                                         }
                                         else
+
+                    if (field.type == org.dbnp.gdt.TemplateFieldType.STRINGLIST &&
+                                                params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] != "#invalidterm") {
+                                                if (entity) removeFailedCell(flow.importer_failedcells, entity, field)
+                        println "removedcellstringlist" + entity.getIdentifier()
+                                                entity.setFieldValue(field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
+                    } else
+                    if (field.type == org.dbnp.gdt.TemplateFieldType.STRINGLIST &&
+                                                params["entity_" + entity.getIdentifier() + "_" + field.escapedName()] == "#invalidterm"
+                                        ) {
+                                                invalidfields++
+                                        } else
+
                                                 entity.setFieldValue(field.toString(), params["entity_" + entity.getIdentifier() + "_" + field.escapedName()])
                                 }
@@ -447 +456 @@
 
                                 // Try to validate the entity now all fields have been set
-                                if (!entity.validate() || invalidontologies) {
+                                if (!entity.validate() || invalidfields) {
                                         flow.importer_invalidentities++
 
@@ -463 +472 @@
                 } // end of table
 
+        println "invalidentities="+flow.importer_invalidentities
+
                 return (flow.importer_invalidentities == 0) ? true : false
         } // end of method
@@ -470 +481 @@
          * @param entity entity to remove from the failedcells list
          */
-        def removeFailedCell(failedcells, entity) {
+        def removeFailedCell(failedcells, entity, field) {
                 // Valid entity, remove it from failedcells
                 failedcells.each { record ->
@@ -476 +487 @@
 
                         record.importcells.each { cell ->
+               // println "cell_entity=" + cell.value
+               // println "fieldname=" + field.name
+
                                 // remove the cell from the failed cells session
                                 if (cell.entityidentifier != entity.getIdentifier()) {

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

@@ -323 +323 @@
                         if (!study.save(flush: true)) {
                                 //this.appendErrors(flow.study, flash.wizardErrors)
-                                throw new Exception('error saving study')
+                                throw new Exception('.importer wizard [saveDatamatrix] error while saving study')
                         }
                 } else {
-                        throw new Exception('study does not validate')
+                        throw new Exception('.importer wizard [saveDatamatrix] study does not validate')
                 }
 

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

@@ -18 +18 @@
         <g:each in="${importer_failedcells}" var="record">
           <g:each in="${record.importcells}" var="cell">
-          var element = $("select[name=entity_${cell.entityidentifier}_${cell.mappingcolumn.property}]");
+          var element = $("select[name=entity_${cell.entityidentifier}_${cell.mappingcolumn.property.toLowerCase()}]");
 
           element.addClass('error')

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

@@ -93 +93 @@
                 // handle template selects
                 new SelectAddMore().init({
-                        rel      : 'typetemplate',
+                        rel      : 'template',
                         url      : baseUrl + '/templateEditor',
                         vars    : 'entity', // can be a comma separated list of variable names to pass on
@@ -99 +99 @@
                         style   : 'modify',
                         onClose : function(scope) {
-                                location.reload();
+                                refreshFlow()
                         }
                 });

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

@@ -28 +28 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.min.js', plugin: 'gdt')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js', plugin: 'gdt')}"></script>
-        <script type="text/javascript" src="${resource(dir: 'js', file: 'importer.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js', plugin: 'gdt')}"></script>
         </g:if><g:else>
@@ -36 +35 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'ontology-chooser.js', plugin: 'gdt')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js', plugin: 'gdt')}"></script>
-        <script type="text/javascript" src="${resource(dir: 'js', file: 'importer.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'tooltips.js', plugin: 'gdt')}"></script>
         </g:else>

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

@@ -82 +82 @@
             </td>
             <td>
-                <g:select rel="typetemplate" entity="none" name="template_id" optionKey="id" optionValue="name" from="[]" value="${importer_params?.template_id}"/>
+                <g:select rel="template" entity="none" name="template_id" optionKey="id" optionValue="name" from="[]" value="${importer_params?.template_id}"/>
             </td>
         </tr>