X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FReportGenerator.pm;h=57a8c958c28fee74958d4fbfd20125a17477be4d;hb=b3673e83306a36c0582a08ea9eada300fe3987aa;hp=6a78c5370261988f4aac2788348b86e70bae16f1;hpb=24e8b08430fe09e219b61b07d40bfc12c8f5ed1e;p=kivitendo-erp.git diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index 6a78c5370..57a8c958c 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -1,6 +1,7 @@ package SL::ReportGenerator; use IO::Wrap; +use List::Util qw(max); use Text::CSV_XS; use SL::Form; @@ -28,12 +29,15 @@ sub new { 'margin_bottom' => 1.5, 'margin_right' => 1.5, 'number' => 1, + 'print' => 0, + 'printer_id' => 0, + 'copies' => 1, }, 'csv_export' => { 'quote_char' => '"', 'sep_char' => ';', 'escape_char' => '"', - 'eol_style' => 'DOS', + 'eol_style' => 'Unix', 'headers' => 1, }, }; @@ -89,18 +93,26 @@ sub add_data { my $last_row_set; while (my $arg = shift) { + my $row_set; + if ('ARRAY' eq ref $arg) { - push @{ $self->{data} }, $arg; - $last_row_set = $arg; + $row_set = $arg; } elsif ('HASH' eq ref $arg) { - my $row_set = [ $arg ]; - push @{ $self->{data} }, $row_set; - $last_row_set = $row_set; + $row_set = [ $arg ]; } else { $self->{form}->error('Incorrect usage -- expecting hash or array ref'); } + + foreach my $row (@{ $row_set }) { + foreach my $field (qw(data link)) { + map { $row->{$_}->{$field} = [ $row->{$_}->{$field} ] if (ref $row->{$_}->{$field} ne 'ARRAY') } keys %{ $row }; + } + } + + push @{ $self->{data} }, $row_set; + $last_row_set = $row_set; } return $last_row_set; @@ -112,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; @@ -154,57 +173,43 @@ sub set_export_options { }; } -sub generate_content { - my $self = shift; - my $format = lc $self->{options}->{output_format}; - - if (!$self->{columns}) { - $self->{form}->error('Incorrect usage -- no columns specified'); - } - - if ($format eq 'html') { - return $self->generate_html_content(); - - } elsif ($format eq 'csv') { - return $self->generate_csv_content(); - - } elsif ($format eq 'pdf') { - return $self->generate_pdf_content(); +sub get_attachment_basename { + my $self = shift; + my $filename = $self->{options}->{attachment_basename} || 'report'; + $filename =~ s|.*\\||; + $filename =~ s|.*/||; - } else { - $self->{form}->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)'); - } + return $filename; } sub generate_with_headers { my $self = shift; my $format = lc $self->{options}->{output_format}; + my $form = $self->{form}; if (!$self->{columns}) { - $self->{form}->error('Incorrect usage -- no columns specified'); + $form->error('Incorrect usage -- no columns specified'); } - my $filename = $self->{options}->{attachment_basename} || 'report'; - $filename =~ s|.*\\||; - $filename =~ s|.*/||; - if ($format eq 'html') { - $self->{form}->{title} = $self->{title}; - $self->{form}->header(); + my $title = $form->{title}; + $form->{title} = $self->{title} if ($self->{title}); + $form->header(); + $form->{title} = $title; + print $self->generate_html_content(); } elsif ($format eq 'csv') { + my $filename = $self->get_attachment_basename(); print qq|content-type: text/csv\n|; print qq|content-disposition: attachment; filename=${filename}.csv\n\n|; $self->generate_csv_content(); } elsif ($format eq 'pdf') { - print qq|content-type: application/pdf\n|; - print qq|content-disposition: attachment; filename=${filename}.pdf\n\n|; $self->generate_pdf_content(); } else { - $self->{form}->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)'); + $form->error('Incorrect usage -- unknown format (supported are HTML, CSV, PDF)'); } } @@ -254,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; @@ -269,7 +276,16 @@ sub prepare_html_content { foreach my $row (@{ $row_set }) { $inner_idx++; - map { $row->{$_}->{data} = $self->html_format($row->{$_}->{data}) } @visible_columns; + foreach my $col_name (@visible_columns) { + my $col = $row->{$col_name}; + $col->{CELL_ROWS} = [ ]; + foreach my $i (0 .. scalar(@{ $col->{data} }) - 1) { + push @{ $col->{CELL_ROWS} }, { + 'data' => $self->html_format($col->{data}->[$i]), + 'link' => $col->{link}->[$i], + }; + }; + } my $row_data = { 'COLUMNS' => [ map { $row->{$_} } @visible_columns ], @@ -313,7 +329,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_template2('report_generator/html_report', $variables); } sub verify_paper_size { @@ -368,6 +384,13 @@ BODY { END ; + my $printer_command; + if ($opt->{print} && $opt->{printer_id}) { + $form->{printer_id} = $opt->{printer_id}; + $form->get_printer_code($myconfig); + $printer_command = $form->{printer_command}; + } + my $cfg_file_name = Common::tmpname() . '-html2ps-config'; my $cfg_file = IO::File->new($cfg_file_name, 'w') || $form->error($locale->text('Could not write the html2ps config file.')); @@ -385,15 +408,45 @@ END $html_file->print($form->parse_html_template('report_generator/pdf_report', $variables)); $html_file->close(); - my $gs = IO::File->new("\"${main::html2ps_bin}\" -f \"${cfg_file_name}\" \"${html_file_name}\" | " . - "\"${main::ghostscript_bin}\" -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sPAPERSIZE=${opt_paper_size} -sOutputFile=- -c .setpdfwrite - |"); + my $cmdline = + "\"${main::html2ps_bin}\" -f \"${cfg_file_name}\" \"${html_file_name}\" | " . + "\"${main::ghostscript_bin}\" -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sPAPERSIZE=${opt_paper_size} -sOutputFile=- -c .setpdfwrite -"; + + my $gs = IO::File->new("${cmdline} |"); if ($gs) { - while (my $line = <$gs>) { - print $line; + my $content; + + if (!$printer_command) { + my $filename = $self->get_attachment_basename(); + print qq|content-type: application/pdf\n|; + print qq|content-disposition: attachment; filename=${filename}.pdf\n\n|; + + while (my $line = <$gs>) { + print $line; + } + + } else { + while (my $line = <$gs>) { + $content .= $line; + } } + $gs->close(); unlink $cfg_file_name, $html_file_name; + if ($printer_command && $content) { + foreach my $i (1 .. max $opt->{copies}, 1) { + my $printer = IO::File->new("| ${printer_command}"); + if (!$printer) { + $form->error($locale->text('Could not spawn the printer command.')); + } + $printer->print($content); + $printer->close(); + } + + $form->{report_generator_printed} = 1; + } + } else { unlink $cfg_file_name, $html_file_name; $form->error($locale->text('Could not spawn html2ps or GhostScript.')); @@ -431,7 +484,11 @@ 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 ]); + my @data; + foreach my $col (@visible_columns) { + push @data, join($eol, map { s/\r?\n/$eol/g; $_ } @{ $row->{$col}->{data} }); + } + $csv->print($stdout, \@data); } } }