Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 84ba8214

Von Moritz Bunkus vor fast 17 Jahren hinzugefügt

  • ID 84ba8214f6f1e68de5fa317b8239a7888a4aac03
  • Vorgänger 1de28336
  • Nachfolger 786b3862

ReportGenerator: Unterstützung für mehrzeilige und individuell festgelegte Tabellenköpfe/Spaltenüberschriften implementiert.

Unterschiede anzeigen:

SL/ReportGenerator.pm
};
}
sub set_custom_headers {
my $self = shift;
if (@_) {
$self->{custom_headers} = [ @_ ];
} else {
delete $self->{custom_headers};
}
}
sub get_attachment_basename {
my $self = shift;
my $filename = $self->{options}->{attachment_basename} || 'report';
......
push @column_headers, $header;
}
my $header_rows;
if ($self->{custom_headers}) {
$header_rows = $self->{custom_headers};
} else {
$header_rows = [ \@column_headers ];
}
my ($outer_idx, $inner_idx) = (0, 0);
my $next_border_top;
my @rows;
......
'ALLOW_PDF_EXPORT' => $allow_pdf_export,
'ALLOW_CSV_EXPORT' => $opts->{allow_csv_export},
'SHOW_EXPORT_BUTTONS' => ($allow_pdf_export || $opts->{allow_csv_export}) && $self->{data_present},
'COLUMN_HEADERS' => \@column_headers,
'HEADER_ROWS' => $header_rows,
'NUM_COLUMNS' => scalar @column_headers,
'ROWS' => \@rows,
'EXPORT_VARIABLES' => \@export_variables,
......
my (@data, @column_props, @cell_props);
my $data_row = [];
my $cell_props_row = [];
my ($data_row, $cell_props_row);
my @visible_columns = $self->get_visible_columns('HTML');
my $num_columns = scalar @visible_columns;
my $num_header_rows = 1;
foreach $name (@visible_columns) {
$column = $self->{columns}->{$name};
push @{ $data_row }, $column->{text};
push @{ $cell_props_row }, {};
push @column_props, { 'justify' => $column->{align} eq 'right' ? 'right' : 'left' };
push @column_props, { 'justify' => $self->{columns}->{$name}->{align} eq 'right' ? 'right' : 'left' };
}
push @data, $data_row;
push @cell_props, $cell_props_row;
if (!$self->{custom_headers}) {
$data_row = [];
$cell_props_row = [];
push @data, $data_row;
push @cell_props, $cell_props_row;
foreach $name (@visible_columns) {
$column = $self->{columns}->{$name};
push @{ $data_row }, $column->{text};
push @{ $cell_props_row }, {};
}
my $num_columns = scalar @column_props;
} else {
$num_header_rows = scalar @{ $self->{custom_headers} };
foreach my $custom_header_row (@{ $self->{custom_headers} }) {
$data_row = [];
$cell_props_row = [];
push @data, $data_row;
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 }, {};
}
}
}
foreach my $row_set (@{ $self->{data} }) {
if ('HASH' eq ref $row_set) {
......
'font' => $font,
'font_size' => $font_size,
'font_color' => '#000000',
'num_header_rows' => $num_header_rows,
'header_props' => {
'bg_color' => '#ffffff',
'repeat' => 1,
......
my @visible_columns = $self->get_visible_columns('CSV');
if ($opts->{headers}) {
$csv->print($stdout, [ map { $self->unescape_string($self->{columns}->{$_}->{text}) } @visible_columns ]);
if (!$self->{custom_headers}) {
$csv->print($stdout, [ map { $self->unescape_string($self->{columns}->{$_}->{text}) } @visible_columns ]);
} else {
foreach my $custom_header_row (@{ $self->{custom_headers} }) {
$csv->print($stdout, [ map { $self->unescape_string($_->{text}) } @{ $custom_header_row } ]);
}
}
}
foreach my $row_set (@{ $self->{data} }) {
modules/override/PDF/Table.pm
# Table Header Section
#=====================================
# Disable header row into the table
my $header_props = 0;
my $header_props;
my $num_header_rows = 0;
my @header_rows;
# Check if the user enabled it ?
if (defined $arg{'header_props'} and ref( $arg{'header_props'}) eq 'HASH') {
# Transfer the reference to local variable
......
$header_props->{'font_color'} = $header_props->{'font_color'} || '#000066';
$header_props->{'font_size'} = $header_props->{'font_size'} || $fnt_size + 2;
$header_props->{'bg_color'} = $header_props->{'bg_color'} || '#FFFFAA';
$num_header_rows = $arg{'num_header_rows'} || 1;
}
my $header_row = undef;
#=====================================
# Other Parameters check
#=====================================
......
my $pg_cnt = 1;
my $cur_y = $ybase;
my $cell_props = $arg{cell_props} || []; # per cell properties
my $row_cnt = ( ref $header_props and $header_props->{'repeat'} ) ? 1 : 0; # current row in user data
my $row_cnt = $num_header_rows;
#If there is valid data array reference use it!
if (ref $data eq 'ARRAY') {
# Copy the header row if header is enabled
@$header_row = $$data[0] if defined $header_props;
if (defined $header_props) {
map { push @header_rows, $$data[$_] } (0..$num_header_rows - 1);
}
# Determine column widths based on content
# an arrayref whose values are a hashref holding
......
# the actual widths of the column/row intersection
my $row_props = [];
# An array ref with the widths of the header row
my $header_row_props = [];
my @header_row_props;
# Scalars that hold sum of the maximum and minimum widths of all columns
my ( $max_col_w, $min_col_w ) = ( 0,0 );
......
# Hash that will hold the width of every word from input text
my $word_w = {};
my $rows_counter = 0;
my $first_row = 1;
foreach $row ( @{$data} ) {
push(@header_row_props, []) if ($rows_counter < $num_header_rows);
my $column_widths = []; #holds the width of each column
for( my $j = 0; $j < scalar(@$row) ; $j++ ) {
# look for font information for this column
......
}#End of for(my $j....
$row_props->[$rows_counter] = $column_widths;
# Copy the calculated row properties of header row.
@$header_row_props = @$column_widths if (!$rows_counter and ref $header_props);
if (($rows_counter < $num_header_rows) && $header_props) {
push(@header_row_props, [ @{ $column_widths } ]);
}
$rows_counter++;
}
$main::lxdebug->dump(0, "hrp", \@header_row_props);
# Calc real column widths and expand table width if needed.
my $calc_column_widths;
($calc_column_widths, $width) = $self->CalcColumnWidths( $col_props, $width );
......
my ( $gfx , $gfx_bg , $background_color , $font_color, );
my ( $bot_marg, $table_top_y, $text_start , $record, $record_widths );
my $remaining_header_rows = $header_props ? $num_header_rows : 0;
# Each iteration adds a new page as neccessary
while(scalar(@{$data})) {
my $page_header;
......
$bot_marg = $table_top_y - $next_h;
if ( ref $header_props and $header_props->{'repeat'}) {
# Copy Header Data
@$page_header = @$header_row;
my $hrp ;
@$hrp = @$header_row_props ;
# Then prepend it to master data array
unshift @$data ,@$page_header ;
unshift @$row_props ,$hrp ;
$first_row = 1; # Means YES
foreach my $idx (0 .. $num_header_rows - 1) {
unshift @$data, [ @{ $header_rows[$idx] } ];
unshift @$row_props, [ @{ $header_row_props[$idx] } ];
}
$remaining_header_rows = $num_header_rows;
}
}
......
$background_color = $rows_counter % 2 ? $background_color_even : $background_color_odd;
$font_color = $rows_counter % 2 ? $font_color_even : $font_color_odd;
if ($first_row and ref $header_props) {
if ($remaining_header_rows and ref $header_props) {
$background_color = $header_props->{'bg_color'}
}
$text_start = $cur_y - $fnt_size - $pad_top;
......
$leftovers->[$j] = undef;
# Choose font color
if ( $first_row and ref $header_props ) {
if ( $remaining_header_rows and ref $header_props ) {
$txt->fillcolor( $header_props->{'font_color'} );
} elsif ( $cell_props->[$row_cnt][$j]{font_color} ) {
......
}
# Choose font size
if ( $first_row and ref $header_props ) {
if ( $remaining_header_rows and ref $header_props ) {
$col_fnt_size = $header_props->{'font_size'};
} elsif ( $col_props->[$j]->{'font_size'} ) {
......
}
# Choose font family
if ( $first_row and ref $header_props ) {
if ( $remaining_header_rows and ref $header_props ) {
$txt->font( $header_props->{'font'}, $header_props->{'font_size'});
} elsif ( $col_props->[$j]->{'font'} ) {
......
$col_props->[$j]->{justify} = $col_props->[$j]->{justify} || 'left';
my $this_width;
if (!$first_row && $cell_props->[$row_cnt]->[$j]->{colspan}) {
if (!$remaining_header_rows && $cell_props->[$row_cnt]->[$j]->{colspan}) {
$colspan = -1 == $cell_props->[$row_cnt]->[$j]->{colspan} ? $num_cols - $j : $cell_props->[$row_cnt]->[$j]->{colspan};
my $last_idx = $j + $colspan - 1;
$this_width = sum @{ $calc_column_widths }[$j..$last_idx];
......
$col_props->[$j]->{'background_color'} ||
$background_color ) {
$gfx_bg->rect( $cur_x, $cur_y-$row_h, $calc_column_widths->[$j], $row_h);
if ( $cell_props->[$row_cnt][$j]->{'background_color'} && !$first_row ) {
if ( $cell_props->[$row_cnt][$j]->{'background_color'} && !$remaining_header_rows ) {
$gfx_bg->fillcolor($cell_props->[$row_cnt][$j]->{'background_color'});
} elsif ( $col_props->[$j]->{'background_color'} && !$first_row ) {
} elsif ( $col_props->[$j]->{'background_color'} && !$remaining_header_rows ) {
$gfx_bg->fillcolor($col_props->[$j]->{'background_color'});
} else {
......
$gfx->move( $xbase , $cur_y );
$gfx->hline( $xbase + $width );
$rows_counter++;
$row_cnt++ unless ( $first_row );
$first_row = 0;
if ($remaining_header_rows) {
$remaining_header_rows--;
} else {
$row_cnt++;
}
}# End of while(scalar(@{$data}) and $cur_y-$row_h > $bot_marg)
# Draw vertical lines
templates/webpages/report_generator/html_report_de.html
[% IF DATA_PRESENT %]
<p>
<table width="100%">
[%- FOREACH row = HEADER_ROWS %]
<tr>
[% FOREACH col = COLUMN_HEADERS %]
[% FOREACH col = row %]
<th class="listheading">[% IF col.link %]<a href="[% col.link %]">[% END %][% col.text %][% IF col.link %][% IF col.show_sort_indicator %]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %]</a>[% ELSE %][% IF col.show_sort_indicator %]<img src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %][% END %]</th>
[% END %]
</tr>
[%- END %]
[% FOREACH row = ROWS %]
[% IF row.IS_CONTROL %]
templates/webpages/report_generator/html_report_master.html
[% IF DATA_PRESENT %]
<p>
<table width="100%">
[%- FOREACH row = HEADER_ROWS %]
<tr>
[% FOREACH col = COLUMN_HEADERS %]
[% FOREACH col = row %]
<th class="listheading">[% IF col.link %]<a href="[% col.link %]">[% END %][% col.text %][% IF col.link %][% IF col.show_sort_indicator %]<img border="0" src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %]</a>[% ELSE %][% IF col.show_sort_indicator %]<img src="image/[% IF col.sort_indicator_direction %]down[% ELSE %]up[% END %].png">[% END %][% END %]</th>
[% END %]
</tr>
[%- END %]
[% FOREACH row = ROWS %]
[% IF row.IS_CONTROL %]

Auch abrufbar als: Unified diff