Übergabe des Templates an den ReportGenerator nicht über $form, sondern über ReportGe...

[kivitendo-erp.git] / SL / ReportGenerator.pm

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index 2e8bcf9..23dd508 100644 (file)
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -7,6 +7,10 @@ use Text::Iconv;
 
 use SL::Form;
 
+# Cause locales.pl to parse these files:
+# parse_html_template('report_generator/html_report')
+# parse_html_template('report_generator/pdf_report')
+
 sub new {
   my $type = shift;
 
@@ -21,6 +25,8 @@ sub new {
     'output_format'         => 'HTML',
     'allow_pdf_export'      => 1,
     'allow_csv_export'      => 1,
+    'html_template'         => 'report_generator/html_report',
+    'pdf_template'          => 'report_generator/pdf_report',
     'pdf_export'            => {
       'paper_size'          => 'A4',
       'orientation'         => 'landscape',
@@ -44,7 +50,7 @@ sub new {
   };
   $self->{export}   = {
     'nextsub'       => '',
-    'variable_list' => '',
+    'variable_list' => [],
   };
 
   $self->{data_present} = 0;
@@ -61,17 +67,18 @@ sub new {
 sub _init_escaped_strings_map {
   my $self = shift;
 
-  $self->{escaped_strings_map} =
-    ('ä'  => 'ä',
-     'ö'  => 'ö',
-     'ü'  => 'ü',
-     'Ä'  => 'Ä',
-     'Ö'  => 'Ö',
-     'Ü'  => 'Ü',
-     'ß' => 'ß',
-     '>'    => '>',
+  $self->{escaped_strings_map} = {
+    'ä'  => 'ä',
+    'ö'  => 'ö',
+    'ü'  => 'ü',
+    'Ä'  => 'Ä',
+    'Ö'  => 'Ö',
+    'Ü'  => 'Ü',
+    'ß' => 'ß',
+    '>'    => '>',
      '&lt;'    => '<',
-     '&quot;'  => '"');
+    '&quot;'  => '"',
+  };
 
   my $iconv = $main::locale->{iconv_iso8859};
 
@@ -208,7 +215,7 @@ sub set_export_options {
 
   $self->{export} = {
     'nextsub'       => shift,
-    'variable_list' => join(" ", @_),
+    'variable_list' => [ @_ ],
   };
 }
 
@@ -342,7 +349,7 @@ sub prepare_html_content {
         # will format the table cell (e.g. borders etc).
         if (!scalar @{ $col->{CELL_ROWS} }) {
           push @{ $col->{CELL_ROWS} }, { 'data' => '&nbsp;' };
-        } elsif ((1 == scalar @{ $col->{CELL_ROWS} }) && !$col->{CELL_ROWS}->[0]->{data}) {
+        } elsif ((1 == scalar @{ $col->{CELL_ROWS} }) && (!defined $col->{CELL_ROWS}->[0]->{data} || ($col->{CELL_ROWS}->[0]->{data} eq ''))) {
           $col->{CELL_ROWS}->[0]->{data} = '&nbsp;';
         }
       }
@@ -361,10 +368,7 @@ sub prepare_html_content {
     }
   }
 
-  my @export_variables;
-  foreach my $key (split m/ +/, $self->{export}->{variable_list}) {
-    push @export_variables, { 'key' => $key, 'value' => $self->{form}->{$key} };
-  }
+  my @export_variables = $self->{form}->flatten_variables(@{ $self->{export}->{variable_list} });
 
   my $allow_pdf_export = $opts->{allow_pdf_export} && (-x $main::html2ps_bin) && (-x $main::ghostscript_bin);
 
@@ -381,7 +385,7 @@ sub prepare_html_content {
     'NUM_COLUMNS'          => scalar @column_headers,
     'ROWS'                 => \@rows,
     'EXPORT_VARIABLES'     => \@export_variables,
-    'EXPORT_VARIABLE_LIST' => $self->{export}->{variable_list},
+    'EXPORT_VARIABLE_LIST' => join(' ', @{ $self->{export}->{variable_list} }),
     'EXPORT_NEXTSUB'       => $self->{export}->{nextsub},
     'DATA_PRESENT'         => $self->{data_present},
   };
@@ -393,7 +397,7 @@ sub generate_html_content {
   my $self      = shift;
   my $variables = $self->prepare_html_content();
 
-  return $self->{form}->parse_html_template('report_generator/html_report', $variables);
+  return $self->{form}->parse_html_template($self->{options}->{html_template}, $variables);
 }
 
 sub verify_paper_size {
@@ -469,7 +473,7 @@ END
     $form->error($locale->text('Could not write the temporary HTML file.'));
   }
 
-  $html_file->print($form->parse_html_template('report_generator/pdf_report', $variables));
+  $html_file->print($form->parse_html_template($self->{options}->{pdf_template}, $variables));
   $html_file->close();
 
   my $cmdline =
@@ -521,7 +525,7 @@ sub unescape_string {
   my $self = shift;
   my $text = shift;
 
-  foreach my $key (keys %{ $self->{escaped_strigns_map} }) {
+  foreach my $key (keys %{ $self->{escaped_strings_map} }) {
     $text =~ s/\Q$key\E/$self->{escaped_strings_map}->{$key}/g;
   }