X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fcsv_import%2F_preview.html;h=01fe4d9ff2eff2ec2c3faf41eb8a750e199c8195;hb=5ece50029a119fbdc50cf0f325e0ac89c279c77b;hp=323fdb4837ca699e78db58580e2df860bcbd49f7;hpb=f87763cd84d89aafc4c4110ba42d041b02ce4371;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/_preview.html b/templates/webpages/csv_import/_preview.html
index 323fdb483..01fe4d9ff 100644
--- a/templates/webpages/csv_import/_preview.html
+++ b/templates/webpages/csv_import/_preview.html
@@ -1,35 +1,48 @@
 [% USE HTML %]
 [% USE LxERP %]
 
-<h3>
- [%- IF SELF.import_status == 'tested' %]
-  [%- LxERP.t8('Import preview') %]
- [%- ELSE %]
-  [%- LxERP.t8('Import result') %]
- [%- END %]
-</h3>
-
-<p>[%- LxERP.t8('Found #1 objects to import.', SELF.data.size || 0) %]</p>
-
 [% IF SELF.data.size %]
+ <h3>
+  [%- IF SELF.import_status == 'tested' %]
+   [%- LxERP.t8('Import preview') %]
+  [%- ELSE %]
+   [%- LxERP.t8('Import result') %]
+  [%- END %]
+ </h3>
+
  <table>
   <tr class="listheading">
+   [%- FOREACH column = SELF.info_headers.headers %]
+    <th>[%- HTML.escape(column) %]</th>
+   [%- END %]
    [%- FOREACH column = SELF.headers.headers %]
     <th>[%- HTML.escape(column) %]</th>
    [%- END %]
+   [%- FOREACH column = SELF.raw_data_headers.headers %]
+    <th>[%- HTML.escape(column) %]</th>
+   [%- END %]
    <th>[%- LxERP.t8('Notes') %]</th>
   </tr>
 
   [%- FOREACH row = SELF.data %]
+  [%- IF (SELF.profile.get('full_preview') == 2) || ((SELF.profile.get('full_preview') == 1) && (row.errors.size || row.information.size)) || ((SELF.profile.get('full_preview') == 0) && (loop.count < 21)) %]
   <tr class="[% IF row.errors.size %]redrow[% ELSE %]listrow[% END %][% loop.count % 2 %]">
+   [%- FOREACH method = SELF.info_headers.methods %]
+    <td>[%- HTML.escape(row.info_data.$method) %]</td>
+   [%- END %]
    [%- FOREACH method = SELF.headers.methods %]
     <td>[%- HTML.escape(row.object.$method) %]</td>
    [%- END %]
+   [%- FOREACH method = SELF.raw_data_headers.headers %]
+    <td>[%- HTML.escape(row.raw_data.$method) %]</td>
+   [%- END %]
    <td>
     [%- FOREACH error = row.errors %][%- HTML.escape(error) %][% UNLESS loop.last %]<br>[%- END %][%- END %]
+    [%- FOREACH info  = row.information %][% IF !loop.first || row.errors.size %]<br>[%- END %][%- HTML.escape(info) %][%- END %]
    </td>
   </tr>
   [%- END %]
+  [%- END %]
 
  </table>
 [%- END %]