From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 18 Jun 2007 12:42:11 +0000 (+0000)
Subject: ReportGenerator: Möglichkeit zum Einfügen einer "leeren" Zeile, die die ganze Tabelle... 
X-Git-Tag: release-2.4.3^2~105
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=971ca3897f02d09ed3f7580625362434dbdc7756;p=kivitendo-erp.git

ReportGenerator: Möglichkeit zum Einfügen einer "leeren" Zeile, die die ganze Tabellenbreite einnimmt.
---

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index 28399f794..f3030b284 100644
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -124,6 +124,13 @@ sub add_separator {
   push @{ $self->{data} }, { 'type' => 'separator' };
 }
 
+sub add_control {
+  my $self = shift;
+  my $data = shift;
+
+  push @{ $self->{data} }, $data;
+}
+
 sub clear_data {
   my $self = shift;
 
@@ -252,9 +259,11 @@ sub prepare_html_content {
   foreach my $row_set (@{ $self->{data} }) {
     if ('HASH' eq ref $row_set) {
       my $row_data = {
-        'IS_CONTROL'    => 1,
-        'IS_SEPARATOR'  => $row_set->{type} eq 'separator',
-        'NUM_COLUMNS'   => scalar @visible_columns,
+        'IS_CONTROL'      => 1,
+        'IS_SEPARATOR'    => $row_set->{type} eq 'separator',
+        'IS_COLSPAN_DATA' => $row_set->{type} eq 'colspan_data',
+        'NUM_COLUMNS'     => scalar @visible_columns,
+        'data'            => $row_set->{data},
       };
 
       push @rows, $row_data;
diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 9673a484a..2230b5766 100644
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -32,7 +32,7 @@
 
    <TMPL_LOOP ROWS>
     <TMPL_IF IS_CONTROL>
-     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr></TMPL_IF>
+     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr></TMPL_IF><TMPL_IF IS_COLSPAN_DATA><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><TMPL_VAR data></td></tr></TMPL_IF>
      <TMPL_ELSE>
      <tr class="listrow<TMPL_VAR outer_idx_odd>">
       <TMPL_LOOP COLUMNS><td<TMPL_IF align> align="<TMPL_VAR align>"</TMPL_IF><TMPL_IF valign> valign="<TMPL_VAR valign>"</TMPL_IF><TMPL_IF class> class="<TMPL_VAR class>"</TMPL_IF>><TMPL_IF raw_data><TMPL_VAR raw_data></TMPL_IF><TMPL_LOOP CELL_ROWS><TMPL_IF data><TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF><TMPL_VAR data><TMPL_IF link></a></TMPL_IF></TMPL_IF><TMPL_UNLESS __last__><br></TMPL_UNLESS></TMPL_LOOP></td>
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index 01e7c61da..2e2ecce0b 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -32,7 +32,7 @@
 
    <TMPL_LOOP ROWS>
     <TMPL_IF IS_CONTROL>
-     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr></TMPL_IF>
+     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr></TMPL_IF><TMPL_IF IS_COLSPAN_DATA><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><TMPL_VAR data></td></tr></TMPL_IF>
      <TMPL_ELSE>
      <tr class="listrow<TMPL_VAR outer_idx_odd>">
       <TMPL_LOOP COLUMNS><td<TMPL_IF align> align="<TMPL_VAR align>"</TMPL_IF><TMPL_IF valign> valign="<TMPL_VAR valign>"</TMPL_IF><TMPL_IF class> class="<TMPL_VAR class>"</TMPL_IF>><TMPL_IF raw_data><TMPL_VAR raw_data></TMPL_IF><TMPL_LOOP CELL_ROWS><TMPL_IF data><TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF><TMPL_VAR data><TMPL_IF link></a></TMPL_IF></TMPL_IF><TMPL_UNLESS __last__><br></TMPL_UNLESS></TMPL_LOOP></td>