Changeset 1121 for trunk/grails-app/views

Timestamp:

Nov 11, 2010, 2:29:16 PM (11 years ago)

Author:

t.w.abma@…

Message:

• rewrote part of the importer and added a ImportRecord? and ImportCell? domain
• ontologies should now always be shown individually

Location:

trunk/grails-app/views/importer/common

Files:

• _failedcells.gsp (modified) (1 diff)
• _missingproperties.gsp (modified) (1 diff)

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

@@ -31 +31 @@
   </tr>
 <g:form name="failedcellsform" action="saveCorrectedCells">
-        <g:each var="record" in="${failedcells}">
-          <g:each var="list" in="${record}">
-            <g:each var="cell" in="${list}">
+        <g:each var="item" in="${failedcells}"> <!-- [recordhash, importrecord] -->
+          <g:each var="cell" in="${item.value.importcells}">
             <tr>
-              <td>${cell.value.name}</td>
+              <td>${cell.mappingcolumn.name}</td>
               <td>-</td>
-              <td>${cell.value.value}</td>
+              <td>${cell}</td>
               <td>
-                  <input type="text" name="cell.index.${cell.hashCode()}" rel="ontology-all-name"/>
-                  <!-- <input type="hidden" name="cell.index.${cell.value}-concept_id"/>
-                  <input type="hidden" name="cell.index.${cell.value}-ontology_id"/>
-                  <input type="hidden" name="cell.index.${cell.value}-full_id"/> -->
+                  <input type="text" name="cell.index.${cell.getIdentifier()}" rel="ontology-all-name"/>
+                  <!-- <input type="hidden" name="cell.index.${cell}-concept_id"/>
+                  <input type="hidden" name="cell.index.${cell}-ontology_id"/>
+                  <input type="hidden" name="cell.index.${cell}-full_id"/> -->
               </td>
-            </tr>
-            </g:each>
+            </tr>            
           </g:each>
         </g:each>

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

@@ -25 +25 @@
         <g:set var="showHeader" value="${true}"/>
             <g:each status="index" var="table" in="${datamatrix}">
-                <g:each status="i" var="entity" in="${table}">                  
+                <g:each status="i" var="entity" in="${table}">
                     <g:if test="${showHeader}">
                         <g:set var="showHeader" value="${false}"/>