X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FReportGenerator.pm;h=050984aa30693dbf10fd8ac7fe2361e14edd2dd7;hb=d43904e8740303c640001b7362eac01d7df019c6;hp=02c194070ca797be89ebdd08f3bbfd8b802175fb;hpb=62311126ae09507b29034c26fa17e1696c48a1d4;p=kivitendo-erp.git diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index 02c194070..050984aa3 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -1,9 +1,12 @@ package SL::ReportGenerator; +use Encode; use IO::Wrap; use List::Util qw(max); use Text::CSV_XS; use Text::Iconv; +use PDF::API2; +use PDF::Table; use SL::Form; @@ -270,6 +273,7 @@ sub prepare_html_content { my $header = { 'name' => $name, + 'align' => $column->{align}, 'link' => $column->{link}, 'text' => $column->{text}, 'show_sort_indicator' => $name eq $opts->{sort_indicator_column}, @@ -369,9 +373,6 @@ sub prepare_html_content { my $allow_pdf_export = $opts->{allow_pdf_export}; - eval { require PDF::API2; require PDF::Table; }; - $allow_pdf_export |= 1 if (! $@); - my $variables = { 'TITLE' => $opts->{title}, 'TOP_INFO_TEXT' => $self->html_format($opts->{top_info_text}), @@ -406,6 +407,15 @@ sub _cm2bp { return $_[0] * 72 / 2.54; } +sub _decode_text { + my $self = shift; + my $text = shift; + + $text = decode('UTF-8', $text) if ($self->{text_is_utf8}); + + return $text; +} + sub generate_pdf_content { eval { require PDF::API2; @@ -427,6 +437,9 @@ sub generate_pdf_content { my $num_columns = scalar @visible_columns; my $num_header_rows = 1; + my $font_encoding = $main::dbcharset || 'ISO-8859-15'; + $self->{text_is_utf8} = $font_encoding =~ m/^utf-?8$/i; + foreach $name (@visible_columns) { push @column_props, { 'justify' => $self->{columns}->{$name}->{align} eq 'right' ? 'right' : 'left' }; } @@ -440,7 +453,7 @@ sub generate_pdf_content { foreach $name (@visible_columns) { $column = $self->{columns}->{$name}; - push @{ $data_row }, $column->{text}; + push @{ $data_row }, $self->_decode_text($column->{text}); push @{ $cell_props_row }, {}; } @@ -454,8 +467,17 @@ sub generate_pdf_content { push @cell_props, $cell_props_row; foreach my $custom_header_col (@{ $custom_header_row }) { - push @{ $data_row }, $custom_header_col->{text}; - push @{ $cell_props_row }, {}; + push @{ $data_row }, $self->_decode_text($custom_header_col->{text}); + + my $num_output = ($custom_header_col->{colspan} * 1 > 1) ? $custom_header_col->{colspan} : 1; + if ($num_output > 1) { + push @{ $data_row }, ('') x ($num_output - 1); + push @{ $cell_props_row }, { 'colspan' => $num_output }; + push @{ $cell_props_row }, ({ }) x ($num_output - 1); + + } else { + push @{ $cell_props_row }, {}; + } } } } @@ -463,7 +485,7 @@ sub generate_pdf_content { foreach my $row_set (@{ $self->{data} }) { if ('HASH' eq ref $row_set) { if ($row_set->{type} eq 'colspan_data') { - push @data, [ $row_set->{data} ]; + push @data, [ $self->_decode_text($row_set->{data}) ]; $cell_props_row = []; push @cell_props, $cell_props_row; @@ -478,24 +500,27 @@ sub generate_pdf_content { } foreach my $row (@{ $row_set }) { - $data_row = []; - push @data, $data_row; + $data_row = []; + $cell_props_row = []; + + push @data, $data_row; + push @cell_props, $cell_props_row; my $col_idx = 0; foreach my $col_name (@visible_columns) { my $col = $row->{$col_name}; - push @{ $data_row }, join("\n", @{ $col->{data} }); + push @{ $data_row }, $self->_decode_text(join("\n", @{ $col->{data} })); $column_props[$col_idx]->{justify} = 'right' if ($col->{align} eq 'right'); - $col_idx++; - } + my $cell_props = { }; + push @{ $cell_props_row }, $cell_props; - $cell_props_row = []; - push @cell_props, $cell_props_row; + if ($col->{colspan} && $col->{colspan} > 1) { + $cell_props->{colspan} = $col->{colspan}; + } - foreach (0 .. $num_columns - 1) { - push @{ $cell_props_row }, { }; + $col_idx++; } } } @@ -542,7 +567,7 @@ sub generate_pdf_content { $pdf->mediabox($paper_width, $paper_height); my $font = $pdf->corefont(defined $pdfopts->{font_name} && $supported_fonts{lc $pdfopts->{font_name}} ? ucfirst $pdfopts->{font_name} : 'Verdana', - '-encoding' => $main::dbcharset || 'ISO-8859-15'); + '-encoding' => $font_encoding); my $font_size = $pdfopts->{font_size} || 7; my $title_font_size = $font_size + 1; my $padding = 1; @@ -555,7 +580,7 @@ sub generate_pdf_content { my $top_text_height = 0; if ($self->{options}->{top_info_text}) { - my $top_text = $self->{options}->{top_info_text}; + my $top_text = $self->_decode_text($self->{options}->{top_info_text}); $top_text =~ s/\r//g; $top_text =~ s/\n+$//; @@ -595,13 +620,14 @@ sub generate_pdf_content { }, 'column_props' => \@column_props, 'cell_props' => \@cell_props, + 'max_word_length' => 60, ); foreach my $page_num (1..$pdf->pages()) { my $curpage = $pdf->openpage($page_num); if ($pdfopts->{number}) { - my $label = $main::locale->text("Page #1/#2", $page_num, $pdf->pages()); + my $label = $self->_decode_text($main::locale->text("Page #1/#2", $page_num, $pdf->pages())); my $text_obj = $curpage->text(); $text_obj->font($font, $font_size); @@ -610,12 +636,13 @@ sub generate_pdf_content { } if ($opts->{title}) { + my $title = $self->_decode_text($opts->{title}); my $text_obj = $curpage->text(); $text_obj->font($font, $title_font_size); - $text_obj->translate(($paper_width - $margin_left - $margin_right) / 2 + $margin_left - $text_obj->advancewidth($opts->{title}) / 2, + $text_obj->translate(($paper_width - $margin_left - $margin_right) / 2 + $margin_left - $text_obj->advancewidth($title) / 2, $paper_height - $margin_top); - $text_obj->text($opts->{title}, '-underline' => 1); + $text_obj->text($title, '-underline' => 1); } } @@ -893,7 +920,7 @@ Output format. Used by generate_with_headers to determine the format. Supported =item allow_pdf_export -Used to determine if a button for PDF export should be displayed. Default is yes. The PDF button is hidden if neither the Perl module PDF::API2 nor the external applications html2ps and Ghostscript are available regardless of this parameter's value. +Used to determine if a button for PDF export should be displayed. Default is yes. =item allow_csv_export