X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Freport.html;h=77e69601ea02b1699bdbcd6137085eba196de0dc;hb=b24dfcbb7755c7c2d3389185091f951755de463c;hp=7154e75a2cba9a6caedf689d9490a282da0f6aae;hpb=e5a690f9c51aab7ac96130cb11b9d4c740c84016;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/report.html b/templates/webpages/csv_import/report.html
index 7154e75a2..77e69601e 100644
--- a/templates/webpages/csv_import/report.html
+++ b/templates/webpages/csv_import/report.html
@@ -1,27 +1,50 @@
 [% USE HTML %]
 [% USE LxERP %]
 [% USE L %]
- <h3>[%- LxERP.t8('Import result') %]</h3>
+ <h2>
+ [%- IF SELF.report.test_mode %]
+  [%- LxERP.t8('Import preview') %]
+ [%- ELSE %]
+  [%- LxERP.t8('Import result') %]
+ [%- END %]
+</h2>
+
+[%- IF SELF.report.test_mode %]
+ <p>
+  [% LxERP.t8("The following is only a preview.") %]
+  [% LxERP.t8("No entries have been imported yet.") %]
+ </p>
+[%- END %]
 
 [%- PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
  <table>
+
+[%- SET max_col = 0 %]
 [%- FOREACH rownum = SELF.display_rows %]
- [%- IF loop.first %]
+  [%- SET max_col = max_col > SELF.report_rows.${rownum}.size ? max_col : SELF.report_rows.${rownum}.size  %]
+  [%- LAST IF rownum >= SELF.report_numheaders %]
+[%- END %]
+
+[%- FOREACH rownum = SELF.display_rows %]
+ [%- SET to_pad = max_col - SELF.report_rows.${rownum}.size %]
+ [%- IF rownum < SELF.report_numheaders %]
   <tr class="listheading">
   [%- FOREACH value = SELF.report_rows.${rownum} %]
    <th>[% value | html %]</th>
-  [%- END  %]
+  [%- END %]
+   [%- IF to_pad -%]<th style="text-align:center" colspan="[%- to_pad -%]">-</th>[%- END -%]
    <th>[%- LxERP.t8('Notes') %]</th>
   </tr>
  [%- ELSE %]
   [% csv_import_report_errors = SELF.report_status.${rownum}.errors %]
-  <tr class="[% IF csv_import_report_errors.size %]redrow[% ELSE %]listrow[% END %][% 1 - loop.count % 2 %]">
+  <tr class="listrow[% IF csv_import_report_errors && csv_import_report_errors.size %]_error[% END %][% (loop.count + SELF.report_numheaders) % 2 %]">
   [%- FOREACH value = SELF.report_rows.${rownum} %]
    <td>[%- value | html  %]</td>
   [%- END %]
+   [%- IF to_pad -%]<td align="center" colspan="[%- to_pad -%]">-</td>[%- END -%]
    <td>
     [%- FOREACH error = csv_import_report_errors %][%- error | html %][% UNLESS loop.last %]<br>[%- END %][%- END %]
-    [%- FOREACH info  = SELF.report_status.${rownum}.information %][% IF !loop.first || csv_import_report_errors.size %]<br>[%- END %][%- info | html %][%- END %]
+    [%- FOREACH info  = SELF.report_status.${rownum}.information %][% IF rownum >= SELF.report_numheaders || csv_import_report_errors.size %]<br>[%- END %][%- info | html %][%- END %]
    </td>
   </tr>
  [%- END %]
@@ -32,5 +55,12 @@
 [%- PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
 
 <script type='text/javascript'>
-  $(function(){ $('#action_import').show() });
+  $(function(){
+    [%- IF SELF.reporterror %]
+      kivi.clear_flash('info',0);
+      kivi.display_flash('error','[% SELF.reporterror %]',0);
+    [%- ELSIF SELF.report.test_mode %]
+      kivi.ActionBar.Action('#action_import').enable();
+    [%- END %]
+  });
 </script>