From: Bernd Bleßmann <bernd@kivitendo-premium.de>
Date: Tue, 24 Jan 2017 21:47:05 +0000 (+0100)
Subject: CsvImport: Bericht: Bemerkungs-/Fehler-Spalten untereiander anzeigen.
X-Git-Tag: release-3.5.4~1644
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a8151afb9e600b96569d0982465c5a2d3191e258;p=kivitendo-erp.git

CsvImport: Bericht: Bemerkungs-/Fehler-Spalten untereiander anzeigen.

Das ändert nur die Ansicht bei Multiplex-Daten, da hier die Anzahl der Spalten
unterschiedlich sein kann. Dazu wird eine leere Spalte in entsprechender Breite
eingefügt.
---

diff --git a/templates/webpages/csv_import/report.html b/templates/webpages/csv_import/report.html
index ab1cae0cf..dceed89de 100644
--- a/templates/webpages/csv_import/report.html
+++ b/templates/webpages/csv_import/report.html
@@ -18,12 +18,21 @@
 
 [%- PROCESS 'common/paginate.html' pages=SELF.pages, base_url = SELF.base_url %]
  <table>
+
+[%- SET max_col = 0 %]
 [%- FOREACH rownum = SELF.display_rows %]
+  [%- 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 %]
@@ -32,6 +41,7 @@
   [%- 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 rownum >= SELF.report_numheaders || csv_import_report_errors.size %]<br>[%- END %][%- info | html %][%- END %]