Changeset 1202

Timestamp:

Nov 25, 2010, 3:51:14 PM (13 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)

Location:

trunk/grails-app

Files:

• controllers/dbnp/importer/ImporterController.groovy (modified) (3 diffs)
• domain/dbnp/importer/ImportCell.groovy (modified) (1 diff)
• services/dbnp/importer/ImporterService.groovy (modified) (5 diffs)
• taglib/dbnp/importer/ImporterTagLib.groovy (modified) (1 diff)
• views/importer/common/_missingproperties.gsp (modified) (4 diffs)
• views/importer/step3_simple.gsp (modified) (1 diff)

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])
-        }
+        //}
     }
 

trunk/grails-app/domain/dbnp/importer/ImportCell.groovy

@@ -20 +20 @@
 class ImportCell extends Identity {
     MappingColumn mappingcolumn
+    int entityidentifier
     String value
 

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

@@ -217 +217 @@
         def sheet = wb.getSheetAt(sheetindex)
         def table = []
-        def failedcells = [:] // map [recordhash, importrecord] values
+        def failedcells = [] // list of records
         
         // walk through all rows and fill the table with records
@@ -227 +227 @@
             table.add(record)
 
-            // If failed cells have been found, add them to the failed cells map
-            // the record hashcode is later on used to put the failed data back
-            // in the data matrix            
-            if (failed.importcells?.size()>0) failedcells.put(record.hashCode(), failed)
+            // If failed cells have been found, add them to the failed cells list            
+            if (failed?.importcells?.size()>0) failedcells.add(failed)
         }
 
@@ -423 +421 @@
                 def tft = TemplateFieldType
                 def record = [] // list of entities and the read values
-                def failed = new ImportRecord() // list of failed cells with the value which couldn't be mapped into the entity
+                def failed = new ImportRecord() // map with entity identifier and failed mappingcolumn
 
                 // Initialize all possible entities with the chosen template
@@ -446 +444 @@
                                 }
 
-                                //println "temateplfedielfdtype=" + mc.templatefieldtype
-                                // Are we trying to map an ontology term which is empty? Then it is a failed cell
-                                /*if (value=="") {
-                                    println "empty term"
-                                    def temp = new MappingColumn()
-                                    //temp.properties = mc.properties
-                                    temp.value = "undefined"
-                                    failed.add(temp)
-                                }*/                                
-                              
-
                                 try {
                                 // which entity does the current cell (field) belong to?
@@ -481 +468 @@
                                 } catch (IllegalArgumentException iae) {
                                     // store the mapping column and value which failed
+                                    def identifier
+
+                                    switch (mc.entity) {
+                                        case Study:  identifier = study.getIdentifier()
+                                                break
+                                        case Subject: identifier = subject.getIdentifier()
+                                                break
+                                        case SamplingEvent: identifier = samplingEvent.getIdentifier()
+                                                break
+                                        case Event: identifier = event.getIdentifier()                                          
+                                                break
+                                        case Sample: identifier = sample.getIdentifier()
+                                                break
+                                        case Object:   // don't import
+                                                break
+                                    }
+                                    
                                     def mcInstance = new MappingColumn()
                                     mcInstance.properties = mc.properties
-                                    failed.addToImportcells(
-                                        new ImportCell(mappingcolumn:mcInstance,
-                                            value:value)
-                                        )
+                                    failed.addToImportcells(new ImportCell(mappingcolumn:mcInstance, value:value, entityidentifier:identifier))
                                 }
                         } // end
                 } // end for
         // a failed column means that using the entity.setFieldValue() threw an exception        
-        return [record, failed]        
+        return [record, failed]
     }
 

trunk/grails-app/taglib/dbnp/importer/ImporterTagLib.groovy

@@ -60 +60 @@
      */
     def missingProperties = { attrs ->
-        def datamatrix = attrs['datamatrix']    
-        out << render (template:"common/missingproperties", model:[datamatrix:datamatrix])
+        def datamatrix = attrs['datamatrix']
+        def failedcells = attrs['failedcells']
+        out << render (template:"common/missingproperties", model:[datamatrix:datamatrix, failedcells:failedcells])
     }
 

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

@@ -1 @@
-<%
+  <%
         /**
          * Missing properties template which shows missing properties
@@ -41 +41 @@
              updatefield = '<input type = "hidden" name="updatefield" value="true" / >';
              $('#missingpropertiesform').append(updatefield);
-
              $('#missingpropertiesform').submit();
-
         }
     });
 
 
+  });
+</script>
+
+<script type="text/javascript">
+  $(document).ready(function() {
+        // mark error fieldssss
+        <g:each in="${failedcells}" var="record">
+          <g:each in="${record.importcells}" var="cell">
+          var element = $("select[name=entity_${cell.entityidentifier}_${cell.mappingcolumn.property}]");
+
+          element.addClass('error')
+          element.append( new Option("Invalid: ${cell.value}","", true, true) );
+
+          console.log(element.val())
+          //element.
+          
+          //element.hide()
+          //element.attr('disabled', true)
+          
+          </g:each>
+        </g:each>
   });
 </script>
@@ -69 +88 @@
                         <div class="firstColumn">#</div>
                         <div class="firstColumn"></div>
-                        <wizard:templateColumns id="${entity.hashCode()}" entity="${entity}" template="${entity.template}" name="entity_${entity.hashCode()}" class="column" subject="${entity.hashCode()}" addDummy="true" />
+                        <wizard:templateColumns id="${entity.hashCode()}" entity="${entity}" template="${entity.template}" name="entity_${entity.getIdentifier()}" class="column" subject="${entity.hashCode()}" addDummy="true" />
                     </div>
                 </g:each>
@@ -80 +99 @@
 </g:form>    
 </div>
-

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

@@ -25 +25 @@
     <h1>Step 3: fill in missing mappings</h1>
     You must map the missing properties
-    <importer:missingProperties datamatrix="${datamatrix}"/>
+    <importer:missingProperties datamatrix="${datamatrix}" failedcells="${failedcells}"/>
   </body>
 </html>