X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Felements%2Freport.html;h=3600f2c66071e80e175c26c68a28a1c7090748ea;hb=9f97c81b19a3184ea68df32aaea43808b22e10f0;hp=b831f3a4f047bfd694c5e7b1b660df07d520172c;hpb=f22b714f2b7a38c8a930d8248ccb32751db82b5e;p=freeside.git
diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index b831f3a4f..3600f2c66 100644
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -105,11 +105,11 @@ any delimiter and linked from the elements in @data.
% $worksheet->write( $r, $c++, shift( @row_labels ) );
% foreach ( @{ shift( @data ) } ) {
% $total += $_;
-% $bottom_total[$c] += $_;
+% $bottom_total[$c-1] += $_;
% $worksheet->write($r, $c++, sprintf($sprintf, $_) );
% }
% unless ( $opt{'nototal'} ) {
-% $bottom_total[$c] += $total;
+% $bottom_total[$c-1] += $total;
% $worksheet->write($r, $c++, sprintf($sprintf, $total) );
% }
% }
@@ -135,7 +135,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,114 +166,141 @@ 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'} ) %>
-% $cgi->param('_type', 'png');
+% unless ( $opt{'graph_type'} eq 'none' ) {
-
-
+" WIDTH="976" HEIGHT="384"
+ STYLE="page-break-after:always;">
+% }
+
% unless ( $opt{'disable_download'} ) {
-% $cgi->param('_type', "xls" );
Download full results
- as Excel spreadsheet
-% $cgi->param('_type', 'csv');
- as CSV file
-% $cgi->param('_type', "html" );
+ as ">Excel spreadsheet
+ as ">CSV file
% }
%
-<% include('/elements/table.html', 'f8f8f8') %>
-
-
-
- |
-
+%# indexed by item, then by entry (the element indices of @{$data[$i]}).
+% my @cell = ();
+% my @styles;
+% my $num_entries = scalar(@col_labels);
+% my $num_items = scalar(@items);
+% $cell[0] = ['']; #top left corner
% foreach my $column ( @col_labels ) {
-% $column =~ s/ /\
/; # working on a smarter way to do this
- <% $column %> |
-% }
-
-% unless ( $opt{'nototal'} ) {
- Total |
-% }
-
-
-
-% my @bottom_total = ();
+% $column =~ s/ /\
/;
+% push @{$cell[0]}, $column;
+% }
+% if ( ! $opt{'nototal'} ) {
+% $num_entries++;
+% push @{$cell[0]}, emt('Total');
+% }
+
+% # i for item, e for entry
+% my $i = 1;
% foreach my $row ( @items ) {
+% #make a style
+% my $color = shift @{ $opt{'colors'} };
+% push @styles, ".i$i { text-align: right; color: #$color; }";
+% #create the data row
+% my $links = shift @{$opt{'links'}} || [''];
+% my $link_prefix = shift @$links;
+% $link_prefix = '
-
-
- <% $label %>
- |
+% my $data_row = $data[$i-1];
+%# my $data_row = shift @data;
+% if ( ! $opt{'nototal'} ) {
+% push @$data_row, sum(@$data_row);
+% }
+% foreach ( @$data_row ) {
+% my $entry = $_;
+% $entry = $money_char . sprintf($sprintf, $entry);
+% $entry = $link_prefix . shift(@$links) . "\">$entry" if $link_prefix;
+% push @{$cell[$i]}, $entry;
+% }
+% $i++;
+% }
+% if ( $opt{'bottom_total'} ) {
+% # it's an extra item
+% $num_items++;
+% push @styles, ".i$i { text-align: right; background-color: #f5f6be; }";
+% my $links = $opt{'bottom_link'} || [];
+% my $link_prefix = shift @$links;
+% $link_prefix = '$entry" if $link_prefix;
+% push @{$cell[$i]}, $entry;
+% }
+% }
-% my $total = 0;
-% my $col = 0;
-% foreach my $column ( @{ shift( @data ) } ) {
+
-
- <% $link_prefix ? $link_prefix . shift(@links) . '">' : '' %><% $money_char %><% sprintf($sprintf,, $column) %><% $link_prefix ? '' : '' %>
- |
+<% include('/elements/table.html', 'f8f8f8') %>
+% if ( $opt{'transpose'} ) {
+% for ( my $e = 0; $e < $num_entries + 1; $e++ ) {
+
+% for ( my $i = 0; $i < $num_items + 1; $i++ ) {
+ "><% $cell[$i][$e] %> |
+% }
+
+% }
%
-% $total += $column;
-% $bottom_total[$col++] += $column;
-%
-% }
-
-% unless ( $opt{'nototal'} ) {
-
- <% $link_prefix ? $link_prefix. shift(@links) . '">' : '' %><% $money_char %><% sprintf($sprintf, $total) %><% $link_prefix ? '' : '' %>
- |
-% $bottom_total[$col++] += $total;
-% }
-
-
-
-% }
-
-% if ( $opt{'bottom_total'} ) {
+% } else { #!transpose
+%
+% for (my $i = 0; $i < $num_items + 1; $i++) {
- Total |
-% my @bottom_links = $opt{'bottom_link'} ? @{ $opt{'bottom_link'} } : ();
-% my $prefix = shift(@bottom_links);
-% pop @bottom_links if $opt{'nototal'};
-% foreach my $total ( @bottom_total ) {
-
-
- <% $prefix
- ? ''
- : ''
- %><% $money_char %><% sprintf($sprintf, $total) %><% $prefix ? '' : '' %>
-
- |
-
-% }
-
+% for (my $e = 0; $e < $num_entries + 1; $e++) {
+ "><% $cell[$i][$e] %> |
+% }
-
-% }
-
+% }
+% }
<% include('/elements/footer.html') %>
% }
@@ -269,6 +310,16 @@ any delimiter and linked from the elements in @data.
<%init>
my(%opt) = @_;
+my $session;
+# load from cache if possible, to avoid recalculating
+if ( $cgi->param('session') =~ /^(\d+)$/ ) {
+ $session = $1;
+ %opt = %{ $m->cache->get($session) };
+}
+else {
+ $session = sprintf("%010d%06d", time, int(rand(1000000)));
+ $m->cache->set($session, \%opt, '1h');
+}
my $sprintf = $opt{'sprintf'} || '%.2f';