X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FReportGenerator.pm;h=57a8c958c28fee74958d4fbfd20125a17477be4d;hb=740a0719dcc7d9dbe1001664a23e5791e4c859e7;hp=87c83971576563fbe9c7ea21d42f897809fbb89e;hpb=af1e7bc52686b03992b03d53649a17b6a9e78958;p=kivitendo-erp.git diff --git a/SL/ReportGenerator.pm b/SL/ReportGenerator.pm index 87c839715..57a8c958c 100644 --- a/SL/ReportGenerator.pm +++ b/SL/ReportGenerator.pm @@ -37,7 +37,7 @@ sub new { 'quote_char' => '"', 'sep_char' => ';', 'escape_char' => '"', - 'eol_style' => 'DOS', + 'eol_style' => 'Unix', 'headers' => 1, }, }; @@ -93,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; @@ -116,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; @@ -244,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; @@ -259,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 ], @@ -303,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 { @@ -458,8 +484,11 @@ sub generate_csv_content { foreach my $row_set (@{ $self->{data} }) { next if ('ARRAY' ne ref $row_set); foreach my $row (@{ $row_set }) { - map { $row->{$_}->{data} =~ s/\r?\n/$eol/g } @visible_columns; - $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); } } }