diff options
| -rw-r--r-- | FS/FS/Mason.pm | 1 | ||||
| -rw-r--r-- | FS/FS/cust_main.pm | 21 | ||||
| -rw-r--r-- | httemplate/elements/select-user.html | 30 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-user.html | 10 | ||||
| -rw-r--r-- | httemplate/graph/elements/monthly.html | 318 | ||||
| -rw-r--r-- | httemplate/graph/elements/report.html | 296 | ||||
| -rw-r--r-- | httemplate/graph/report_signupdate.html | 30 | ||||
| -rw-r--r-- | httemplate/graph/signupdate.cgi | 60 | ||||
| -rwxr-xr-x | httemplate/search/cust_main.html | 6 |
9 files changed, 503 insertions, 269 deletions
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 4c8c808..82e64f2 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -102,6 +102,7 @@ if ( -e $addl_handler_use_file ) { use String::Approx qw(amatch); use Chart::LinesPoints; use Chart::Mountain; + use Chart::Bars; use Color::Scheme; use HTML::Widgets::SelectLayers 0.07; #should go away in favor of #selectlayers.html diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 81b654c..24eb73a 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -8522,6 +8522,15 @@ sub search { } ## + # do the same for user + ## + + if ( $params->{'usernum'} =~ /^(\d+)$/ and $1 ) { + push @where, + "cust_main.usernum = $1"; + } + + ## # parse status ## @@ -8556,13 +8565,23 @@ sub search { next unless exists($params->{$field}); - my($beginning, $ending) = @{$params->{$field}}; + my($beginning, $ending, $hour) = @{$params->{$field}}; push @where, "cust_main.$field IS NOT NULL", "cust_main.$field >= $beginning", "cust_main.$field <= $ending"; + # XXX: do this for mysql and/or pull it out of here + if(defined $hour) { + if ($dbh->{Driver}->{Name} eq 'Pg') { + push @where, "extract(hour from to_timestamp(cust_main.$field)) = $hour"; + } + else { + warn "search by time of day not supported on ".$dbh->{Driver}->{Name}." databases"; + } + } + $orderby ||= "ORDER BY cust_main.$field"; } diff --git a/httemplate/elements/select-user.html b/httemplate/elements/select-user.html new file mode 100644 index 0000000..bdb92e7 --- /dev/null +++ b/httemplate/elements/select-user.html @@ -0,0 +1,30 @@ +<SELECT NAME="usernum"> + +% unless ( $opt{'multiple'} || $opt{'disable_empty'} ) { + <OPTION VALUE="">all</OPTION> +% } + +% foreach my $otaker ( @{ $opt{'otakers'} } ) { + <OPTION VALUE="<% shift(@{$opt{'usernums'}}) %>"><% $otaker %></OPTION> +% } + +</SELECT> + +<%init> + +my %opt = @_; + +unless ( $opt{'otakers'} ) { + + my $sth = dbh->prepare("SELECT username,usernum FROM access_user". + " WHERE disabled = '' or disabled IS NULL") + or die dbh->errstr; + $sth->execute or die $sth->errstr; + for($sth->fetchall_arrayref) { + $opt{'otakers'} = [ map { $_->[0] } @$_ ]; + $opt{'usernums'} = [ map { $_->[1] } @$_ ]; + } + +} + +</%init> diff --git a/httemplate/elements/tr-select-user.html b/httemplate/elements/tr-select-user.html new file mode 100644 index 0000000..a9572af --- /dev/null +++ b/httemplate/elements/tr-select-user.html @@ -0,0 +1,10 @@ +<TR> + <TD ALIGN="right"><% $opt{'label'} || 'Employee: ' %></TD> + <TD><% include('select-user.html', %opt) %></TD> +</TR> + +<%init> + +my %opt = @_; + +</%init> diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html index 7039bfe..7b1b98a 100644 --- a/httemplate/graph/elements/monthly.html +++ b/httemplate/graph/elements/monthly.html @@ -37,280 +37,37 @@ Example: ); </%doc> -% if ( $cgi->param('_type') =~ /^(csv)$/ ) { -% -% #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes -% http_header('Content-Type' => 'text/plain' ); -% -% my $csv = new Text::CSV_XS { 'always_quote' => 1, -% 'eol' => "\n", #"\015\012", #"\012" -% }; -% -% $csv->combine(map { my $m=$_; $m =~ s/^(\d+)\//$mon[$1-1] /; $m; } -% ('', @{$data->{label}}, $opt{'nototal'} ? () : 'Total') -% ); -% -<% $csv->string %> -% -% my @bottom_total = (); -% foreach ( @{ $data->{'items'} } ) { -% -% my $col = 0; -% my $total = 0; -% $csv->combine( -% shift( @{ $data->{'item_labels'} } ), -% map { $total += $_; $bottom_total[$col++] += $_; sprintf($sprintf, $_); } -% ( @{ shift( @{$data->{data}} ) } ), -% ( $opt{'nototal'} ? () : sprintf($sprintf, $total) ), -% ); -% unless ( $opt{'nototal'} ) { -% $bottom_total[$col++] += $total; -% } -% -<% $csv->string %> -% -% } -% -% if ( $opt{'bottom_total'} ) { -% $csv->combine( -% 'Total', -% map { sprintf($sprintf, $_) } @bottom_total, -% ); -% -<% $csv->string %> -% -% } -% -% } 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 -% -% my $output = ''; -% my $XLS = new IO::Scalar \$output; -% my $workbook = Spreadsheet::WriteExcel->new($XLS) -% or die "Error opening .xls file: $!"; -% -% my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31)); -% -% my($r,$c) = (0,0); -% -% foreach ('', @{$data->{label}}, ($opt{'nototal'} ? () : 'Total') ) { -% my $header = $_; -% $header =~ s/^(\d+)\//$mon[$1-1] /; -% $worksheet->write($r, $c++, $header) -% } -% -% my @bottom_total = (); -% foreach ( @{ $data->{'items'} } ) { -% $r++; -% $c = 0; -% my $total = 0; -% $worksheet->write( $r, $c++, shift( @{ $data->{'item_labels'} } ) ); -% foreach ( @{ shift( @{$data->{data}} ) } ) { -% $total += $_; -% $bottom_total[$c] += $_; -% $worksheet->write($r, $c++, sprintf($sprintf, $_) ); -% } -% unless ( $opt{'nototal'} ) { -% $bottom_total[$c] += $total; -% $worksheet->write($r, $c++, sprintf($sprintf, $total) ); -% } -% } -% -% $c = 0; -% if ( $opt{'bottom_total'} ) { -% $r++; -% $worksheet->write($r, $c++, 'Total'); -% $worksheet->write($r, $c++, sprintf($sprintf, $_)) foreach @bottom_total; -% } -% -% $workbook->close();# or die "Error creating .xls file: $!"; -% -% http_header('Content-Length' => length($output) ); -% -<% $output %> -% } elsif ( $cgi->param('_type') =~ /^(png)$/ ) { -% -% #my $chart = Chart::LinesPoints->new(1024,480); -% #my $chart = Chart::LinesPoints->new(768,480); -% -% my $graph_type = 'LinesPoints'; -% if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain)$/ ) { -% $graph_type = $1; -% } -% my $class = "Chart::$graph_type"; -% -% my $chart = $class->new(976,384); -% -% my $d = 0; -% $chart->set( -% #'min_val' => 0, -% 'legend' => 'bottom', -% 'colors' => { ( -% map { my $color = $_; -% 'dataset'.$d++ => -% [ map hex($_), unpack 'a2a2a2', $color ] -% } -% #@{ $opt{'colors'} } -% @{ $data->{'colors'} } -% ), -% #'grey_background' => [ 211, 211, 211 ], -% 'grey_background' => 'white', -% 'background' => [ 0xe8, 0xe8, 0xe8 ], #grey -% }, -% #'grey_background' => 'false', -% 'legend_labels' => $data->{'item_labels'}, -% 'brush_size' => 4, -% #'pt_size' => 12, -% ); -% -% #my @data = map { $data->{$_} } ( 'label', @items ); -% my @data = @{ $data->{data} }; -% unshift @data, $data->{'label'}; -% -% http_header('Content-Type' => 'image/png' ); -% -% $chart->_set_colors(); -% -<% $chart->scalar_png(\@data) %> -% -% } else { -% -<% include('/elements/header.html', $opt{'title'} ) %> -% $cgi->param('_type', 'png'); - -<IMG SRC="<% $cgi->self_url %>" WIDTH="976" HEIGHT="384"> -<P ALIGN="right"> - -% unless ( $opt{'disable_download'} ) { -% $cgi->param('_type', "monthly.xls" ); - Download full results<BR> - as <A HREF="<% $cgi->self_url %>">Excel spreadsheet</A><BR> -% $cgi->param('_type', 'csv'); - as <A HREF="<% $cgi->self_url %>">CSV file</A></P> -% $cgi->param('_type', "html" ); -% } -% -</P> -<% include('/elements/table.html', 'e8e8e8') %> - -<TR> - - <TD></TD> - -% foreach my $column ( @{$data->{label}} ) { -% #$column =~ s/^(\d+)\//$mon[$1-1]<BR>/e; -% $column =~ s/^(\d+)\//$mon[$1-1]<BR>/; - <TH><% $column %></TH> -% } - -% unless ( $opt{'nototal'} ) { - <TH>Total</TH> -% } - -</TR> - -% my @bottom_total = (); -% foreach my $row ( @{ $data->{'items'} } ) { -% -% #my $color = shift( @{ $opt{'colors'} } ); -% my $color = shift( @{ $data->{'colors'} } ); -% my $link = shift( @{ $data->{'links'} } ); -% my ( $begin, $end ) = ( $fromparam, $toparam ); -% if ( ref($link) ) { -% my $ref = $link; -% $link = $ref->{link}; -% $begin = $ref->{fromparam}; -% $end = $ref->{toparam}; -% } -% $link = $link ? qq(<A HREF="$link) : ''; -% my $label = shift( @{ $data->{'item_labels'} } ); - - <TR> - - <TH> - <FONT COLOR="#<% $color %>"><% $label %></FONT> - </TH> - -% #my $link = exists($opt{'links'}{$row}) -% # ? qq(<A HREF="$opt{'links'}{$row}) -% # : ''; -% my @speriod = @{$data->{speriod}}; -% my @eperiod = @{$data->{eperiod}}; -% my $total = 0; -% -% my $col = 0; -% foreach my $column ( @{ shift( @{$data->{data}} ) } ) { - - <TD ALIGN="right" BGCOLOR="#ffffff"> - <% $link ? $link. "$begin=". shift(@speriod). ";$end=". shift(@eperiod). '">' : '' %><FONT COLOR="#<% $color %>"><% $money_char %><% sprintf($sprintf,, $column) %></FONT><% $link ? '</A>' : '' %> - </TD> -% -% $total += $column; -% $bottom_total[$col++] += $column; -% -% } - -% unless ( $opt{'nototal'} ) { - <TD ALIGN="right" BGCOLOR="#f5f6be"> - <% $link ? $link. "$begin=". ${$data->{speriod}}[0]. ";$end=". ${$data->{eperiod}}[-1]. '">' : '' %><FONT COLOR="#<% $color %>"><% $money_char %><% sprintf($sprintf, $total) %></FONT><% $link ? '</A>' : '' %> - </TD> -% $bottom_total[$col++] += $total; -% } - - </TR> - -% } - -% if ( $opt{'bottom_total'} ) { -% my @speriod = ( @{$data->{speriod}}, ${$data->{speriod}}[0] ); -% my @eperiod = ( @{$data->{eperiod}}, ${$data->{eperiod}}[-1] ); - - <TR> - <TH>Total</TH> - -% foreach my $total ( @bottom_total ) { - - <TD ALIGN="right" BGCOLOR="#f5f6be"> - <% $opt{'bottom_link'} - ? '<A HREF="'. $opt{'bottom_link'}. - "$fromparam=". shift(@speriod). - ";$toparam=". shift(@eperiod). '">' - : '' - %>$<% sprintf($sprintf, $total) %><% $opt{'bottom_link'} ? '</A>' : '' %> - - </TD> - -% } - - </TR> - -% } - -</TABLE> - -<% include('/elements/footer.html') %> -% } -<%once> - -</%once> +<% include('report.html', + 'items' => $data->{'items'}, + 'data' => $data->{'data'}, + 'row_labels' => $data->{'item_labels'}, + 'graph_labels' => $opt{'graph_labels'} || $data->{'item_labels'}, + 'col_labels' => [ map { my $m = $_; $m =~ s/^(\d+)\//$mon[$1-1] / ; $m } + @{$data->{label}} ], + 'axis_labels' => $data->{label}, + 'colors' => $data->{colors}, + 'links' => \@links, + 'bottom_link' => \@bottom_link, + map { $_, $opt{$_} } (qw(title + nototal + graph_type + bottom_total + sprintf + disable_money)), + ) %> <%init> my(%opt) = @_; -my $sprintf = $opt{'sprintf'} || '%.2f'; -my $fromparam = $opt{'link_fromparam'} || 'begin'; -my $toparam = $opt{'link_toparam'} || 'end'; - my $conf = new FS::Conf; my $money_char = $opt{'disable_money'} ? '' : $conf->config('money_char'); +my $fromparam = $opt{'link_fromparam'} || 'begin'; +my $toparam = $opt{'link_toparam'} || 'end'; + my @items = @{ $opt{'items'} }; foreach my $other (qw( labels graph_labels colors links )) { -#foreach my $other (qw( labels graph_labels colors )) { if ( ref($opt{$other}) eq 'HASH' ) { $opt{$other} = [ map $opt{$other}{$_}, @items ]; } @@ -328,7 +85,6 @@ $opt{'end_year'} ||= $cgi->param('end_year'); # || 1900+$curyear; my $report = new FS::Report::Table::Monthly ( - #'items' => $opt{'items'}, 'items' => \@items, 'params' => $opt{'params'}, 'item_labels' => ( $cgi->param('_type') =~ /^(png)$/ @@ -348,4 +104,36 @@ my $report = new FS::Report::Table::Monthly ( ); my $data = $report->data; +my @links; +foreach my $link (@{ $data->{'links'} }) { + my @speriod = @{$data->{'speriod'}}; + my @eperiod = @{$data->{'eperiod'}}; + my ($begin, $end) = ($fromparam, $toparam); + + my @new = ( $link ); + if(ref($link)) { + $begin = $link->{'fromparam'}; + $end = $link->{'toparam'}; + @new = ( $link->{'link'} ); + } + while(@speriod) { + push @new, "$begin=". shift(@speriod).";$end=".shift(@eperiod); + } + if(! $opt{'nototal'}) { + push @new, "$begin=". $data->{'speriod'}[0] . ";$end=". $data->{'eperiod'}[-1]; + } + push @links, \@new; +} + +my @bottom_link; +if($opt{'bottom_link'}) { + my @speriod = (@{$data->{'speriod'}}, $data->{'speriod'}[0]); + my @eperiod = (@{$data->{'eperiod'}}, $data->{'eperiod'}[-1]); + + push @bottom_link, $opt{'bottom_link'}; + while(@speriod) { + push @bottom_link, "$fromparam=". shift(@speriod). ";$toparam=". shift(@eperiod); + } +} + </%init> diff --git a/httemplate/graph/elements/report.html b/httemplate/graph/elements/report.html new file mode 100644 index 0000000..e24c663 --- /dev/null +++ b/httemplate/graph/elements/report.html @@ -0,0 +1,296 @@ +<%doc> + +Example: + + include('elements/report.html', + #required + 'title' => 'Page title', + 'items' => \@items, + 'data' => [ \@item1 \@item2 ... ], + + #these run parallel to items, and can be given as hashes + 'row_labels' => \@row_labels, #required + 'colors' => \@colors, #required + 'graph_labels' => \@graph_labels, #defaults to row_labels + + 'links' => \@links, #optional + + #these run parallel to the elements of each @item + 'col_labels' => \@col_labels, #required + 'axis_labels' => \@axis_labels, #defaults to col_labels + + #optional + 'nototal' => 1, + 'graph_type' => 'LinesPoints', + 'bottom_total' => 1, + 'sprintf' => '%u', #sprintf format, overrides default %.2f + 'disable_money' => 1, + ); + +About @links: Each element must be an arrayref, corresponding to an element of +@items. Within the array, the first element is a URL prefix, and the rest +are suffixes corresponding to data elements. These will be joined without +any delimiter and linked from the elements in @data. + +</%doc> +% if ( $cgi->param('_type') =~ /^(csv)$/ ) { +% +% #http_header('Content-Type' => 'text/comma-separated-values' ); #IE chokes +% #http_header('Content-Type' => 'text/plain' ); +% http_header('Content-Type' => 'text/csv'); +% http_header('Content-Disposition' => "attachment;filename=$filename.csv"); +% +% my $csv = new Text::CSV_XS { 'always_quote' => 1, +% 'eol' => "\n", #"\015\012", #"\012" +% }; +% +% $csv->combine('', @col_labels, $opt{'nototal'} ? () : 'Total'); +% +<% $csv->string %> +% +% my @bottom_total = (); +% 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; +% } +<% $csv->string %> +% +% } +% +% if ( $opt{'bottom_total'} ) { +% $csv->combine( +% 'Total', +% map { sprintf($sprintf, $_) } @bottom_total, +% ); +% +<% $csv->string %> +% +% } +% +% } 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"); +% +% my $output = ''; +% my $XLS = new IO::Scalar \$output; +% my $workbook = Spreadsheet::WriteExcel->new($XLS) +% or die "Error opening .xls file: $!"; +% +% my $worksheet = $workbook->add_worksheet(substr($opt{'title'},0,31)); +% +% my($r,$c) = (0,0); +% +% foreach ('', @col_labels, ($opt{'nototal'} ? () : 'Total') ) { +% my $header = $_; +% $worksheet->write($r, $c++, $header) +% } +% +% my @bottom_total = (); +% foreach ( @items ) { +% $r++; +% $c = 0; +% my $total = 0; +% $worksheet->write( $r, $c++, shift( @row_labels ) ); +% foreach ( @{ shift( @data ) } ) { +% $total += $_; +% $bottom_total[$c] += $_; +% $worksheet->write($r, $c++, sprintf($sprintf, $_) ); +% } +% unless ( $opt{'nototal'} ) { +% $bottom_total[$c] += $total; +% $worksheet->write($r, $c++, sprintf($sprintf, $total) ); +% } +% } +% +% $c = 0; +% if ( $opt{'bottom_total'} ) { +% $r++; +% $worksheet->write($r, $c++, 'Total'); +% $worksheet->write($r, $c++, 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' ) { +% +% my $graph_type = 'LinesPoints'; +% if ( $opt{'graph_type'} =~ /^(LinesPoints|Mountain|Bars)$/ ) { +% $graph_type = $1; +% } +% my $class = "Chart::$graph_type"; +% +% my $chart = $class->new(976,384); +% +% my $d = 0; +% $chart->set( +% #'min_val' => 0, +% 'legend' => 'bottom', +% 'colors' => { ( +% map { my $color = $_; +% 'dataset'.$d++ => +% [ map hex($_), unpack 'a2a2a2', $color ] +% } +% @{ $opt{'colors'} } +% ), +% 'grey_background' => 'white', +% 'background' => [ 0xe8, 0xe8, 0xe8 ], #grey +% }, +% 'legend_labels' => $opt{'graph_labels'}, +% 'brush_size' => 4, +% ); +% +% http_header('Content-Type' => 'image/png' ); +% +% $chart->_set_colors(); +% +<% $chart->scalar_png([ $opt{'axis_labels'}, @data ]) %> +% +% } else { +% +<% include('/elements/header.html', $opt{'title'} ) %> +% $cgi->param('_type', 'png'); + +<IMG SRC="<% $cgi->self_url %>" WIDTH="976" HEIGHT="384"> +<P ALIGN="right"> + +% unless ( $opt{'disable_download'} ) { +% $cgi->param('_type', "xls" ); + Download full results<BR> + as <A HREF="<% $cgi->self_url %>">Excel spreadsheet</A><BR> +% $cgi->param('_type', 'csv'); + as <A HREF="<% $cgi->self_url %>">CSV file</A></P> +% $cgi->param('_type', "html" ); +% } +% +</P> +<% include('/elements/table.html', 'e8e8e8') %> + +<TR> + + <TD></TD> + +% foreach my $column ( @col_labels ) { +% $column =~ s/ /\<BR\>/; # working on a smarter way to do this + <TH><% $column %></TH> +% } + +% unless ( $opt{'nototal'} ) { + <TH>Total</TH> +% } + +</TR> + +% my @bottom_total = (); +% foreach my $row ( @items ) { +% +% my $color = shift( @{ $opt{'colors'} } ); +% my @links = @{ shift( @{ $opt{'links'} } ) }; +% # $opt{'links'} is an array parallel to items. +% # Each element of that is an array containing a prefix, +% # followed by suffixes matched to the cells of the table. +% my $link_prefix = shift @links; +% $link_prefix = $link_prefix ? qq(<A HREF="$link_prefix) : ''; #" +% my $label = shift( @row_labels ); + + <TR> + + <TH> + <FONT COLOR="#<% $color %>"><% $label %></FONT> + </TH> + +% my $total = 0; +% my $col = 0; +% foreach my $column ( @{ shift( @data ) } ) { + + <TD ALIGN="right" BGCOLOR="#ffffff"> + <% $link_prefix ? $link_prefix . shift(@links) . '">' : '' %><FONT COLOR="#<% $color %>"><% $money_char %><% sprintf($sprintf,, $column) %></FONT><% $link_prefix ? '</A>' : '' %> + </TD> +% +% $total += $column; +% $bottom_total[$col++] += $column; +% +% } + +% unless ( $opt{'nototal'} ) { + <TD ALIGN="right" BGCOLOR="#f5f6be"> + <% $link_prefix ? $link_prefix. shift(@links) . '">' : '' %><FONT COLOR="#<% $color %>"><% $money_char %><% sprintf($sprintf, $total) %></FONT><% $link_prefix ? '</A>' : '' %> + </TD> +% $bottom_total[$col++] += $total; +% } + + </TR> + +% } + +% if ( $opt{'bottom_total'} ) { + <TR> + <TH>Total</TH> +% 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 ) { + + <TD ALIGN="right" BGCOLOR="#f5f6be"> + <% $prefix + ? '<A HREF="'. $prefix .shift(@bottom_links). '">' + : '' + %><% $money_char %><% sprintf($sprintf, $total) %><% $prefix ? '</A>' : '' %> + + </TD> + +% } + + </TR> + +% } + +</TABLE> + +<% include('/elements/footer.html') %> +% } +<%once> + +</%once> +<%init> + +my(%opt) = @_; + +my $sprintf = $opt{'sprintf'} || '%.2f'; + +my $conf = new FS::Conf; +my $money_char = $opt{'disable_money'} ? '' : $conf->config('money_char'); + +my @items = @{ $opt{'items'} }; + +foreach my $other (qw( col_labels row_labels graph_labels axis_labels colors links )) { + if ( ref($opt{$other}) eq 'HASH' ) { + $opt{$other} = [ map $opt{$other}{$_}, @items ]; + } +} + +my @col_labels = @{$opt{'col_labels'}}; +my @row_labels = @{$opt{'row_labels'}}; +my @data = @{$opt{'data'}}; + +$opt{'axis_labels'} ||= $opt{'col_labels'}; +$opt{'graph_labels'} ||= $opt{'row_labels'}; + +my $filename = $cgi->url(-relative => 1); +$filename =~ s/\.(cgi|html)$//; + +</%init> diff --git a/httemplate/graph/report_signupdate.html b/httemplate/graph/report_signupdate.html new file mode 100644 index 0000000..7c22f11 --- /dev/null +++ b/httemplate/graph/report_signupdate.html @@ -0,0 +1,30 @@ +<% include('/elements/header.html', 'Customer Signups by Date/Time' ) %> + +<FORM ACTION="signupdate.cgi" METHOD="GET"> + +<TABLE> + +<% include('/elements/tr-select-from_to.html' ) %> + +<% include('/elements/tr-select-agent.html', + 'curr_value' => scalar($cgi->param('agentnum')), + 'label' => 'For agent: ', + 'disable_empty' => 0, + ) +%> + +<% include('/elements/tr-select-user.html') %> + +</TABLE> + +<BR><INPUT TYPE="submit" VALUE="Display"> +</FORM> + +<% include('/elements/footer.html') %> +<%init> + +#XXX use a different ACL for package churn? +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); + +</%init> diff --git a/httemplate/graph/signupdate.cgi b/httemplate/graph/signupdate.cgi new file mode 100644 index 0000000..5b70758 --- /dev/null +++ b/httemplate/graph/signupdate.cgi @@ -0,0 +1,60 @@ +<% include('elements/report.html', + 'title' => $agentname . 'Customer signups by time of day', + 'items' => [ 'signupdate' ], + 'data' => [ \@count ], + 'row_labels' => [ 'New customers' ], + 'colors' => [ '00cc00' ], #green + 'col_labels' => [ map { "$_:00" } @hours ], + 'links' => [ \@links ], + 'graph_type' => 'Bars', + 'nototal' => 0, + 'sprintf' => '%u', + 'disable_money' => 1, + ) %> +<%init> + +die "access denied" + unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); + +#XXX or virtual +my( $agentnum, $agent ) = ('', ''); +if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { + $agentnum = $1; + $agent = qsearchs('agent', { 'agentnum' => $agentnum } ); + die "agentnum $agentnum not found!" unless $agent; +} + +my $agentname = $agent ? $agent->agent.' ' : ''; +my $usernum = $cgi->param('usernum'); + +my @hours = (0..23); +my @count = (0) x 24; +my %where; +$where{'agentnum'} = $agentnum if $agentnum; +$where{'usernum'} = $usernum if $usernum; +my $sdate = $cgi->param('start_year'). + '-'. + $cgi->param('start_month'). + '-01'; +my $edate = ($cgi->param('end_year') + + ($cgi->param('end_month')==12)). + '-'. + ($cgi->param('end_month') % 12 + 1). + '-01'; # first day of the next month + +my $sql = "AND signupdate >= ".str2time($sdate). + " AND signupdate < ".str2time($edate); + +foreach my $cust (qsearch({ table => 'cust_main', + hashref => \%where, + extra_sql => $sql } )) { + next if !$cust->signupdate; + my $hour = time2str('%H',$cust->signupdate); + $count[$hour]++; +} + +my @links = ("${p}search/cust_main.html?" . + join (';', map {$_.'='.$where{$_}} (keys(%where))) ). + ";signupdate_beginning=$sdate;signupdate_ending=$edate"; +push @links, map { ";signuphour=$_" } @hours; +</%init> diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 644e093..270fc38 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -44,7 +44,7 @@ my %search_hash = (); #scalars my @scalars = qw ( - agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch + agentnum status cancelled_pkgs cust_fields flattened_pkgs custbatch usernum no_censustract paydate_year paydate_month invoice_terms ); @@ -66,10 +66,10 @@ foreach my $field (qw( signupdate )) { my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field); - next if $beginning == 0 && $ending == 4294967295; + next if $beginning == 0 && $ending == 4294967295 && !defined($cgi->param('signuphour')); #or $disable{$cgi->param('status')}->{$field}; - $search_hash{$field} = [ $beginning, $ending ]; + $search_hash{$field} = [ $beginning, $ending, $cgi->param('signuphour') ]; } |