From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 13 Jun 2007 13:38:38 +0000 (+0000)
Subject: Reportgenerator: Man kann jetzt auch Trennzeilen einfügen, die in der HTML-Ausgabe... 
X-Git-Tag: release-2.4.3^2~148
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=24e8b08430fe09e219b61b07d40bfc12c8f5ed1e;p=kivitendo-erp.git

Reportgenerator: Man kann jetzt auch Trennzeilen einfügen, die in der HTML-Ausgabe als horizontale Linie über die gesamte Tabellenbreite realisiert sind.
---

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index 37e6bede0..6a78c5370 100644
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -86,17 +86,30 @@ sub set_sort_indicator {
 sub add_data {
   my $self = shift;
 
+  my $last_row_set;
+
   while (my $arg = shift) {
     if ('ARRAY' eq ref $arg) {
       push @{ $self->{data} }, $arg;
+      $last_row_set = $arg;
 
     } elsif ('HASH' eq ref $arg) {
-      push @{ $self->{data} }, [ $arg ];
+      my $row_set = [ $arg ];
+      push @{ $self->{data} }, $row_set;
+      $last_row_set = $row_set;
 
     } else {
       $self->{form}->error('Incorrect usage -- expecting hash or array ref');
     }
   }
+
+  return $last_row_set;
+}
+
+sub add_separator {
+  my $self = shift;
+
+  push @{ $self->{data} }, { 'type' => 'separator' };
 }
 
 sub clear_data {
@@ -239,6 +252,18 @@ sub prepare_html_content {
   my @rows;
 
   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,
+      };
+
+      push @rows, $row_data;
+
+      next;
+    }
+
     $outer_idx++;
 
     foreach my $row (@{ $row_set }) {
@@ -404,6 +429,7 @@ sub generate_csv_content {
   }
 
   foreach my $row_set (@{ $self->{data} }) {
+    next if ('ARRAY' ne ref $row_set);
     foreach my $row (@{ $row_set }) {
       $csv->print($stdout, [ map { $row->{$_}->{data} } @visible_columns ]);
     }
diff --git a/templates/webpages/report_generator/html_report_de.html b/templates/webpages/report_generator/html_report_de.html
index 899968e21..e60b0e77f 100644
--- a/templates/webpages/report_generator/html_report_de.html
+++ b/templates/webpages/report_generator/html_report_de.html
@@ -17,17 +17,21 @@
    </tr>
 
    <TMPL_LOOP ROWS>
-    <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 raw_data><TMPL_VAR raw_data></TMPL_IF>
-       <TMPL_IF data>
-        <TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF>
-        <TMPL_VAR data><TMPL_IF link></a></TMPL_IF>
-       </TMPL_IF>
-      </td>
-     </TMPL_LOOP>
-    </tr>
+    <TMPL_IF IS_CONTROL>
+     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></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_IF data>
+         <TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF>
+         <TMPL_VAR data><TMPL_IF link></a></TMPL_IF>
+        </TMPL_IF>
+       </td>
+      </TMPL_LOOP>
+     </tr>
+    </TMPL_IF>
    </TMPL_LOOP>
 
    <tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr>
diff --git a/templates/webpages/report_generator/html_report_master.html b/templates/webpages/report_generator/html_report_master.html
index 4a8d8eb45..718cacaec 100644
--- a/templates/webpages/report_generator/html_report_master.html
+++ b/templates/webpages/report_generator/html_report_master.html
@@ -17,17 +17,21 @@
    </tr>
 
    <TMPL_LOOP ROWS>
-    <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 raw_data><TMPL_VAR raw_data></TMPL_IF>
-       <TMPL_IF data>
-        <TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF>
-        <TMPL_VAR data><TMPL_IF link></a></TMPL_IF>
-       </TMPL_IF>
-      </td>
-     </TMPL_LOOP>
-    </tr>
+    <TMPL_IF IS_CONTROL>
+     <TMPL_IF IS_SEPARATOR><tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></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_IF data>
+         <TMPL_IF link><a href="<TMPL_VAR link>"></TMPL_IF>
+         <TMPL_VAR data><TMPL_IF link></a></TMPL_IF>
+        </TMPL_IF>
+       </td>
+      </TMPL_LOOP>
+     </tr>
+    </TMPL_IF>
    </TMPL_LOOP>
 
    <tr><td colspan="<TMPL_VAR NUM_COLUMNS>"><hr size="3" noshade></td></tr>