Merge branch 'patch-1' of https://github.com/gjones2/Freeside

[freeside.git] / httemplate / graph / elements / report.html

diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html
index 382c41f..b7073db 100644 (file)
--- a/httemplate/graph/elements/report.html
+++ b/httemplate/graph/elements/report.html
@@ -14,6 +14,7 @@ Example:
     '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
@@ -77,15 +78,16 @@ 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));
@@ -124,10 +126,22 @@ any delimiter and linked from the elements in @data.
 %   $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;
@@ -142,7 +156,7 @@ any delimiter and linked from the elements in @data.
 % # 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;
+%   my %chart_opt = %{ $opt{chart_options} || {} };
 %   if ( $num_labels > 28 ) {
 %     $chart_opt{x_ticks} = 'vertical';
 %     if ( $num_labels > 60 ) {
@@ -212,7 +226,6 @@ any delimiter and linked from the elements in @data.
 % }
 
 % # i for item, e for entry
-
 % my $i = 1;
 % foreach my $row ( @items ) {
 % #make a style
@@ -225,11 +238,13 @@ any delimiter and linked from the elements in @data.
 %   my $label = shift @row_labels;
 %   $cell[$i] = [ $label ];
 %
-%   my $data_row = shift @data;
+%   my $data_row = $data[$i-1];
+%#   my $data_row = shift @data;
 %   if ( ! $opt{'nototal'} ) {
 %     push @$data_row, sum(@$data_row);
 %   }
-%   foreach my $entry ( @$data_row ) {
+%   foreach ( @$data_row ) {
+%     my $entry = $_;
 %     $entry = $money_char . sprintf($sprintf, $entry);
 %     $entry = $link_prefix . shift(@$links) . "\">$entry</A>" if $link_prefix;
 %     push @{$cell[$i]}, $entry;
@@ -242,6 +257,7 @@ any delimiter and linked from the elements in @data.
 %   push @styles, ".i$i { text-align: right; background-color: #f5f6be; }";
 %   my $links = $opt{'bottom_link'} || [];
 %   my $link_prefix = shift @$links;
+%   $link_prefix = '<A CLASS="cell" HREF="'.$link_prefix if $link_prefix;
 %   $cell[$i] = [ emt('Total') ];
 %   for (my $e = 0; $e < $num_entries + 1; $e++) {
 %     my $entry = sum(map { $_->[$e] } @data);
@@ -302,9 +318,6 @@ td.cell {
 
 <% include('/elements/footer.html') %>
 % } 
-<%once>
-
-</%once>
 <%init>
 
 my(%opt) = @_;