X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Felements%2Freport.html;h=f1b0d166d4012424bdc9de460095df2f375f2708;hb=600e9b690d7649e8cde7a9a4cd1089fcb432d238;hp=b7073db31d45a001b48a3e5ffb9c069985d837a7;hpb=06fb1346ff8076a84f743fa07de31852942e144f;p=freeside.git
diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index b7073db31..f1b0d166d 100644
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -50,19 +50,19 @@ any delimiter and linked from the elements in @data.
<% $csv->string %>
%
% my @bottom_total = ();
+% my $row = 0;
% foreach ( @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, $_) } @{ 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 %>
%
% }
@@ -92,35 +92,35 @@ any delimiter and linked from the elements in @data.
%
% 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;
+% $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, $_) );
% }
-% 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: $!";
@@ -207,7 +207,7 @@ any delimiter and linked from the elements in @data.
Download full results
as ">Excel spreadsheet
as ">CSV file