From: Mark Wells Date: Tue, 6 Mar 2012 03:31:01 +0000 (-0800) Subject: printer-friendly daily sales report, #16533 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=01ea05e688db67a832764bae7356fe460e314ec7;p=freeside.git printer-friendly daily sales report, #16533 --- diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 63eb47cab..60b0b5fe0 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -55,7 +55,7 @@ if ( -e $addl_handler_use_file ) { #use CGI::Carp qw(fatalsToBrowser); use CGI::Cookie; - use List::Util qw( max min ); + use List::Util qw( max min sum ); use Data::Dumper; use Date::Format; use Time::Local; diff --git a/FS/FS/Report/Table/Daily.pm b/FS/FS/Report/Table/Daily.pm index 5bbd6e4e7..3b21fa800 100644 --- a/FS/FS/Report/Table/Daily.pm +++ b/FS/FS/Report/Table/Daily.pm @@ -58,7 +58,7 @@ sub data { my $sdate = timelocal(0,0,0,$sday,$smonth-1,$syear); my $edate = timelocal(0,0,0,$eday,$emonth-1,$eyear); - warn "daily range $sdate $edate\n"; + #warn "daily range $sdate $edate\n"; # XXX: use date_format config for the labels since we have day in the labels now? # XXX: leap seconds / DST @@ -66,7 +66,7 @@ sub data { my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($sdate); $mon++; $year += 1900; - warn "label=$mday/$mon/$year\n"; + #warn "label=$mday/$mon/$year\n"; push @{$data{label}}, "$mday/$mon/$year"; my $speriod = $sdate; diff --git a/httemplate/elements/freeside.css b/httemplate/elements/freeside.css index 90c7291f6..79c98cdd9 100644 --- a/httemplate/elements/freeside.css +++ b/httemplate/elements/freeside.css @@ -223,3 +223,4 @@ div.fstabcontainer { .background { background-color:#f8f8f8; } + diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index 61d031376..d0ab3055d 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -47,7 +47,7 @@ Example: STYLE="margin-top:0; margin-bottom:0; margin-left:0px; margin-right:0px"> - +

+ % if ( $mobile ) { @@ -92,7 +92,7 @@ Example: - + + @@ -140,7 +140,7 @@ Example: % if ( $menu_position eq 'left' ) { - % } - +%# page content starts here - - - +%# 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 - -% } - -% unless ( $opt{'nototal'} ) { - -% } +% $column =~ s/ /\/; +% push @{$cell[0]}, $column; +% } +% if ( ! $opt{'nototal'} ) { +% $num_entries++; +% push @{$cell[0]}, emt('Total'); +% } - +% # i for item, e for entry -% my @bottom_total = (); +% 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 = ' - - +% my $data_row = shift @data; +% if ( ! $opt{'nototal'} ) { +% push @$data_row, sum(@$data_row); +% } +% foreach my $entry ( @$data_row ) { +% $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; +% $cell[$i] = [ emt('Total') ]; +% for (my $e = 0; $e < $num_entries + 1; $e++) { +% my $entry = sum(map { $_->[$e] } @data); +% $entry = $money_char . sprintf($sprintf, $entry); +% $entry = $link_prefix . shift(@$links) . "\">$entry" if $link_prefix; +% push @{$cell[$i]}, $entry; +% } +% } -% my $total = 0; -% my $col = 0; -% foreach my $column ( @{ shift( @data ) } ) { + - +<% 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++ ) { + +% } + +% } % -% $total += $column; -% $bottom_total[$col++] += $column; -% -% } - -% unless ( $opt{'nototal'} ) { - -% $bottom_total[$col++] += $total; -% } - - - -% } - -% if ( $opt{'bottom_total'} ) { +% } else { #!transpose +% +% for (my $i = 0; $i < $num_items + 1; $i++) { - -% 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 ) { - - - -% } - +% for (my $e = 0; $e < $num_entries + 1; $e++) { + +% } - -% } - +% }

	@@ -69,7 +69,7 @@ Example: % if ( $menu_position eq 'top' ) { -
<% include('searchbar-prospect.html') \|n %> @@ -124,7 +124,7 @@ Example: % } else { #$menu_position eq 'left' -
			+	@@ -156,7 +156,7 @@ Example:	diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index 3b1064f02..b3a555a9f 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -14,6 +14,7 @@ % unless ( $opt{'nocss'} ) { + % } diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html index 275e5e6ff..2fd605d5e 100644 --- a/httemplate/graph/elements/monthly.html +++ b/httemplate/graph/elements/monthly.html @@ -54,6 +54,7 @@ Example: 'colors' => $data->{colors}, 'links' => \@links, 'bottom_link' => \@bottom_link, + 'transpose' => $opt{'daily'}, map { $_, $opt{$_} } (qw(title nototal graph_type diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html index da2235fa9..382c41f6c 100644 --- a/httemplate/graph/elements/report.html +++ b/httemplate/graph/elements/report.html @@ -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; +% 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,6 +166,7 @@ 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' ); @@ -169,9 +184,10 @@ any delimiter and linked from the elements in @data. <% include('/elements/header.html', $opt{'title'} ) %> % unless ( $opt{'graph_type'} eq 'none' ) { -" WIDTH="976" HEIGHT="384"> +" WIDTH="976" HEIGHT="384" + STYLE="page-break-after:always;"> % } - + % unless ( $opt{'disable_download'} ) { Download full results @@ -180,88 +196,109 @@ any delimiter and linked from the elements in @data. % } % -<% include('/elements/table.html', 'f8f8f8') %> - -
	<% $column %>	Total
- <% $label %> -	- <% $link_prefix ? $link_prefix . shift(@links) . '">' : '' %><% $money_char %><% sprintf($sprintf,, $column) %><% $link_prefix ? '' : '' %> -
"><% $cell[$i][$e] %>
- <% $link_prefix ? $link_prefix. shift(@links) . '">' : '' %><% $money_char %><% sprintf($sprintf, $total) %><% $link_prefix ? '' : '' %> -
Total	- <% $prefix - ? '' - : '' - %><% $money_char %><% sprintf($sprintf, $total) %><% $prefix ? '' : '' %> - -	"><% $cell[$i][$e] %>

+% } <% include('/elements/footer.html') %> % }