X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Felements%2Freport.html;h=6e6c382f6b2a2a3ebab373910c96c6a2d0a21f2b;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hp=2be511aecaf1da3aa70097c46884e94e5ff1e737;hpb=79136b67e2b45e4017b1aaf8104a3d721fa8dcd9;p=freeside.git
diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index 2be511aec..6e6c382f6 100644
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -11,9 +11,11 @@ Example:
#these run parallel to items, and can be given as hashes
'row_labels' => \@row_labels, #required
'colors' => \@colors, #required
+ 'bgcolors' => \@bgcolors, #optional
'graph_labels' => \@graph_labels, #defaults to row_labels
'links' => \@links, #optional
+ 'no_graph' => \@no_graph, #optional
#these run parallel to the elements of each @item
'col_labels' => \@col_labels, #required
@@ -21,7 +23,7 @@ Example:
#optional
'nototal' => 1,
- 'graph_type' => 'LinesPoints',
+ 'graph_type' => 'LinesPoints', #can be 'none' for no graph
'bottom_total' => 1,
'sprintf' => '%u', #sprintf format, overrides default %.2f
'disable_money' => 1,
@@ -49,19 +51,19 @@ any delimiter and linked from the elements in @data.
<% $csv->string %>
%
% my @bottom_total = ();
-% foreach ( @items ) {
+% my $row = 0;
+% foreach my $i ( @items ) {
%
% my $col = 0;
-% my $total = 0;
-% $csv->combine(
-% shift( @row_labels ),
-% map { $total += $_; $bottom_total[$col++] += $_; sprintf($sprintf, $_); }
-% ( @{ shift( @data ) } ),
-% ( $opt{'nototal'} ? () : sprintf($sprintf, $total) ),
-% );
-% unless ( $opt{'nototal'} ) {
-% $bottom_total[$col++] += $total;
-% }
+% my @row = map { sprintf($sprintf_fields->{$i} ? $sprintf_fields->{$i} : $sprintf, $_) } @{ shift(@data) };
+% my $total = sum(@row);
+% push @row, sprintf($sprintf, $total) unless $opt{'nototal'};
+% unless ($opt{'no_graph'}[$row]) {
+% foreach (@row) {
+% $bottom_total[$col++] += $_;
+% }
+% }
+% $csv->combine(shift(@row_labels), @row);
<% $csv->string %>
%
% }
@@ -77,57 +79,70 @@ any delimiter and linked from the elements in @data.
% }
%
% } elsif ( $cgi->param('_type') =~ /(xls)$/ ) {
-%
-% #http_header('Content-Type' => 'application/excel' ); #eww
-% http_header('Content-Type' => 'application/vnd.ms-excel' );
-% #http_header('Content-Type' => 'application/msexcel' ); #alas
-% http_header('Content-Disposition' => "attachment;filename=$filename.xls");
+% #false laziness w/ search/elements/search-xls
+% my $format = $FS::CurrentUser::CurrentUser->spreadsheet_format;
+% $filename .= $format->{extension};
+%
+% http_header('Content-Type' => $format->{mime_type} );
+% http_header('Content-Disposition' => qq!attachment;filename="$filename"! );
%
% my $output = '';
% my $XLS = new IO::Scalar \$output;
-% my $workbook = Spreadsheet::WriteExcel->new($XLS)
+% my $workbook = $format->{class}->new($XLS)
% or die "Error opening .xls file: $!";
%
% my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31));
%
-% my($r,$c) = (0,0);
+% my($row,$col) = (0,0);
%
% foreach ('', @col_labels, ($opt{'nototal'} ? () : 'Total') ) {
% my $header = $_;
-% $worksheet->write($r, $c++, $header)
+% $worksheet->write($row, $col++, $header)
% }
%
% my @bottom_total = ();
-% foreach ( @items ) {
-% $r++;
-% $c = 0;
+% foreach my $i ( @items ) {
+% $row++;
+% $col = 0;
% my $total = 0;
-% $worksheet->write( $r, $c++, shift( @row_labels ) );
+% $worksheet->write( $row, $col++, shift( @row_labels ) );
% foreach ( @{ shift( @data ) } ) {
% $total += $_;
-% $bottom_total[$c-1] += $_;
-% $worksheet->write($r, $c++, sprintf($sprintf, $_) );
+% $bottom_total[$col-1] += $_ unless $opt{no_graph}[$row];
+% $worksheet->write_number($row, $col++, sprintf($sprintf_fields->{$i} ? $sprintf_fields->{$i} : $sprintf, $_) );
% }
-% unless ( $opt{'nototal'} ) {
-% $bottom_total[$c-1] += $total;
-% $worksheet->write($r, $c++, sprintf($sprintf, $total) );
+% if ( !$opt{'nototal'} ) {
+% $bottom_total[$col-1] += $total unless $opt{no_graph}[$row];
+% $worksheet->write_number($row, $col++, sprintf($sprintf, $total) );
% }
% }
%
-% $c = 0;
+% $col = 0;
% if ( $opt{'bottom_total'} ) {
-% $r++;
-% $worksheet->write($r, $c++, 'Total');
-% $worksheet->write($r, $c++, sprintf($sprintf, $_)) foreach @bottom_total;
+% $row++;
+% $worksheet->write($row, $col++, 'Total');
+% $worksheet->write_number($row, $col++, sprintf($sprintf, $_)) foreach @bottom_total;
% }
%
% $workbook->close();# or die "Error creating .xls file: $!";
%
% http_header('Content-Length' => length($output) );
-%
-<% $output %>
-% } elsif ( $cgi->param('_type') eq 'png' ) {
+% $m->print($output);
%
+% } elsif ( $cgi->param('_type') eq 'png' ) {
+% # delete any items that shouldn't be on the graph
+% if ( my $no_graph = $opt{'no_graph'} ) {
+% my $i = 0;
+% while (@$no_graph) {
+% if ( shift @$no_graph ) {
+% splice @data, $i, 1;
+% splice @{$opt{'graph_labels'}}, $i, 1;
+% splice @{$opt{'colors'}}, $i, 1;
+% $i--; # because everything is shifted down
+% }
+% $i++;
+% }
+% }
% my $graph_type = 'LinesPoints';
% if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain|Bars)$/ ) {
% $graph_type = $1;
@@ -135,7 +150,21 @@ any delimiter and linked from the elements in @data.
% my $class = "Chart::$graph_type";
%
% my $chart = $class->new(976,384);
-%
+% # the chart area itself is 900 pixels wide, and the date labels are ~60 each.
+% # staggered, we can fit about 28 of them.
+% # they're about 12 pixels high, so vertically, we can fit about 60 (allowing
+% # space for them to be readable).
+% # after that we have to start skipping labels. also remove the dots, since
+% # they're just a blob at that point.
+% my $num_labels = scalar(@{ $opt{axis_labels} });
+% my %chart_opt = %{ $opt{chart_options} || {} };
+% if ( $num_labels > 28 ) {
+% $chart_opt{x_ticks} = 'vertical';
+% if ( $num_labels > 60 ) {
+% $chart_opt{skip_x_ticks} = int($num_labels / 60) + 1;
+% $chart_opt{pt_size} = 1;
+% }
+% }
% my $d = 0;
% $chart->set(
% #'min_val' => 0,
@@ -152,125 +181,161 @@ any delimiter and linked from the elements in @data.
% },
% 'legend_labels' => $opt{'graph_labels'},
% 'brush_size' => 4,
+% %chart_opt,
% );
%
% http_header('Content-Type' => 'image/png' );
+% http_header('Cache-Control' => 'no-cache' );
%
% $chart->_set_colors();
%
<% $chart->scalar_png([ $opt{'axis_labels'}, @data ]) %>
%
% } else {
+% # image and download links should use the cached data
+% # just directly reference this component
+% my $myself = $p.'graph/elements/report.html?session='.$session;
%
<% include('/elements/header.html', $opt{'title'} ) %>
% unless ( $opt{'graph_type'} eq 'none' ) {
-% $cgi->param('_type', 'png');
-
+
" WIDTH="976" HEIGHT="384"
+ STYLE="page-break-after:always;">
% }
-
+
-% $cgi->param('_type', "html" ); -% } + as ">Excel spreadsheet