dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10376
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-21 16:15:24 +0700
message:
  improved conflict part of import summary on dxf2 import
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm	2013-03-16 14:59:29 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm	2013-03-21 09:15:24 +0000
@@ -40,4 +40,4 @@
 </table>
 </div>
 
-<div id="importSummaryDiv" class="page formSection" style="display:none; width:400px; padding-bottom:20px;"></div>
+<div id="importSummaryDiv" class="page formSection" style="display:none; width:80%; padding-bottom:20px;"></div>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm	2013-03-16 15:00:57 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importMetaDataSummary.vm	2013-03-21 09:15:24 +0000
@@ -1,6 +1,5 @@
 <h3>$i18n.getString( "import_summary" )</h3>
-
-<h4>Counts</h4>
+<h4>$i18n.getString( "import_count" )</h4>
 
 $summary.importCount.imported Imported<br/>
 $summary.importCount.updated Updated<br/>
@@ -24,7 +23,34 @@
             <td>$typeSummary.importCount.imported</td>
             <td>$typeSummary.importCount.updated</td>
             <td>$typeSummary.importCount.ignored</td>
+            #if( !$typeSummary.importConflicts.isEmpty())
+                #set( $haveConflicts = true )
+            #end
         </tr>
         #end
     </tbody>
 </table>
+
+<h4>$i18n.getString( "conflicts" )</h4>
+#if( $haveConflicts )
+<table>
+    <col width="110">
+    <col width="110">
+    <tr>
+        <th>$i18n.getString( "type" )</th>
+        <th>$i18n.getString( "element" )</th>
+        <th>$i18n.getString( "description" )</th>
+    </tr>
+    #foreach( $typeSummary in $summary.importTypeSummaries )
+        #foreach( $conflict in $typeSummary.importConflicts )
+            <tr>
+                <td>${typeSummary.type}</td>
+                <td>${conflict.object}</td>
+                <td>$encoder.htmlEncode( $conflict.value )</td>
+            </tr>
+        #end
+    #end
+</table>
+#else
+<p>$i18n.getString( "no_conflicts_found" )</p>
+#end