Den Test, ob ein Artikel noch nicht benutzt wurde und deshalb gelöscht werden kann...

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

diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm
index cdcf18fabf782b1ed376790e7db7b2b4653acf1c..29e2d9480c89938d08f131abc57d0aed58e300ac 100644 (file)
--- a/SL/ReportGenerator.pm
+++ b/SL/ReportGenerator.pm
@@ -3,6 +3,7 @@ package SL::ReportGenerator;
 use IO::Wrap;
 use List::Util qw(max);
 use Text::CSV_XS;
 use IO::Wrap;
 use List::Util qw(max);
 use Text::CSV_XS;

+use Text::Iconv;

 
 use SL::Form;
 
 
 use SL::Form;
 


@@ -48,9 +49,36 @@ sub new {
 
   $self->{data_present} = 0;
 
 
   $self->{data_present} = 0;
 

+  bless $self, $type;
+

   $self->set_options(@_) if (@_);
 
   $self->set_options(@_) if (@_);
 

-  return bless $self, $type;
+  $self->_init_escaped_strings_map();
+
+  return $self;
+}
+
+sub _init_escaped_strings_map {
+  my $self = shift;
+
+  $self->{escaped_strings_map} = {
+    'ä'  => 'ä',
+    'ö'  => 'ö',
+    'ü'  => 'ü',
+    'Ä'  => 'Ä',
+    'Ö'  => 'Ö',
+    'Ü'  => 'Ü',
+    'ß' => 'ß',
+    '>'    => '>',
+     '&lt;'    => '<',
+    '&quot;'  => '"',
+  };
+
+  my $iconv = $main::locale->{iconv_iso8859};
+
+  if ($iconv) {
+    map { $self->{escaped_strings_map}->{$_} = $iconv->convert($self->{escaped_strings_map}->{$_}) } keys %{ $self->{escaped_strings_map} };
+  }

 }
 
 sub set_columns {
 }
 
 sub set_columns {


@@ -229,7 +257,7 @@ sub get_visible_columns {
   my $self   = shift;
   my $format = shift;
 
   my $self   = shift;
   my $format = shift;
 

-  return grep { my $c = $self->{columns}->{$_}; $c && $c->{visible} && (($c->{visible} == 1) || ($c->{visible} =~ /${format}/i)) } @{ $self->{column_order} };
+  return grep { my $c = $self->{columns}->{$_}; $c && $c->{visible} && (($c->{visible} == 1) || ($c->{visible} =~ /\Q${format}\E/i)) } @{ $self->{column_order} };

 }
 
 sub html_format {
 }
 
 sub html_format {


@@ -266,20 +294,33 @@ sub prepare_html_content {
   }
 
   my ($outer_idx, $inner_idx) = (0, 0);
   }
 
   my ($outer_idx, $inner_idx) = (0, 0);

+  my $next_border_top;

   my @rows;
 
   foreach my $row_set (@{ $self->{data} }) {
     if ('HASH' eq ref $row_set) {
   my @rows;
 
   foreach my $row_set (@{ $self->{data} }) {
     if ('HASH' eq ref $row_set) {

+      if ($row_set->{type} eq 'separator') {
+        if (! scalar @rows) {
+          $next_border_top = 1;
+        } else {
+          $rows[-1]->{BORDER_BOTTOM} = 1;
+        }
+
+        next;
+      }
+

       my $row_data = {
         'IS_CONTROL'      => 1,
       my $row_data = {
         'IS_CONTROL'      => 1,

-        'IS_SEPARATOR'    => $row_set->{type} eq 'separator',

         'IS_COLSPAN_DATA' => $row_set->{type} eq 'colspan_data',
         'NUM_COLUMNS'     => scalar @visible_columns,
         'IS_COLSPAN_DATA' => $row_set->{type} eq 'colspan_data',
         'NUM_COLUMNS'     => scalar @visible_columns,

+        'BORDER_TOP'      => $next_border_top,

         'data'            => $row_set->{data},
       };
 
       push @rows, $row_data;
 
         'data'            => $row_set->{data},
       };
 
       push @rows, $row_data;
 

+      $next_border_top = 0;
+

       next;
     }
 
       next;
     }
 


@@ -296,7 +337,15 @@ sub prepare_html_content {
             'data' => $self->html_format($col->{data}->[$i]),
             'link' => $col->{link}->[$i],
           };
             'data' => $self->html_format($col->{data}->[$i]),
             'link' => $col->{link}->[$i],
           };

-        };
+        }
+
+        # Force at least a &nbsp; to be displayed so that browsers
+        # 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}) {
+          $col->{CELL_ROWS}->[0]->{data} = '&nbsp;';
+        }

       }
 
       my $row_data = {
       }
 
       my $row_data = {


@@ -304,9 +353,12 @@ sub prepare_html_content {
         'outer_idx'     => $outer_idx,
         'outer_idx_odd' => $outer_idx % 2,
         'inner_idx'     => $inner_idx,
         'outer_idx'     => $outer_idx,
         'outer_idx_odd' => $outer_idx % 2,
         'inner_idx'     => $inner_idx,

+        'BORDER_TOP'    => $next_border_top,

       };
 
       push @rows, $row_data;
       };
 
       push @rows, $row_data;

+
+      $next_border_top = 0;

     }
   }
 
     }
   }
 


@@ -342,7 +394,7 @@ sub generate_html_content {
   my $self      = shift;
   my $variables = $self->prepare_html_content();
 
   my $self      = shift;
   my $variables = $self->prepare_html_content();
 

-  return $self->{form}->parse_html_template2('report_generator/html_report', $variables);
+  return $self->{form}->parse_html_template('report_generator/html_report', $variables);

 }
 
 sub verify_paper_size {
 }
 
 sub verify_paper_size {


@@ -466,6 +518,19 @@ END
   }
 }
 
   }
 }
 

+sub unescape_string {
+  my $self = shift;
+  my $text = shift;
+
+  foreach my $key (keys %{ $self->{escaped_strings_map} }) {
+    $text =~ s/\Q$key\E/$self->{escaped_strings_map}->{$key}/g;
+  }
+
+  $text =~ s/\Q&amp;\E/&/g;
+
+  return $text;
+}
+

 sub generate_csv_content {
   my $self = shift;
 
 sub generate_csv_content {
   my $self = shift;
 


@@ -491,7 +556,7 @@ sub generate_csv_content {
   my @visible_columns = $self->get_visible_columns('CSV');
 
   if ($opts->{headers}) {
   my @visible_columns = $self->get_visible_columns('CSV');
 
   if ($opts->{headers}) {

-    $csv->print($stdout, [ map { $self->{columns}->{$_}->{text} } @visible_columns ]);
+    $csv->print($stdout, [ map { $self->unescape_string($self->{columns}->{$_}->{text}) } @visible_columns ]);

   }
 
   foreach my $row_set (@{ $self->{data} }) {
   }
 
   foreach my $row_set (@{ $self->{data} }) {