X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fgraph%2Felements%2Fmonthly.html;h=275e5e6ffa0e187846a0228de06ecf650634db8b;hb=665109510114cf56e5ebd8eda0bef24b12ca41a2;hp=de2b2e9d495f5fa29c7456ee04f7359a9e306eca;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/httemplate/graph/elements/monthly.html b/httemplate/graph/elements/monthly.html
index de2b2e9d4..275e5e6ff 100644
--- a/httemplate/graph/elements/monthly.html
+++ b/httemplate/graph/elements/monthly.html
@@ -19,6 +19,7 @@ Example:
     'links'           => \@links,      # or \%link, #opt
     'link_fromparam'  => 'param_from', #defaults to 'begin'
     'link_toparam'    => 'param_to',   #defaults to 'end'
+    'daily'           => 1, # omit for monthly granularity
 
     #optional, pulled from CGI params if not specified
     'start_month'     => $smonth,
@@ -26,6 +27,12 @@ Example:
     'end_month'       => $emonth,
     'end_year'        => $eyear,
 
+
+    #optional, pulled from CGI params if not specified, 
+    #only if 'daily' option is given
+    'start_day'       => $sday,
+    'end_day'         => $eday,
+
     #optional
     'agentnum'        => $agentnum,
     'nototal'         => 1,
@@ -42,8 +49,7 @@ Example:
             '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}} ],
+            'col_labels'    => $col_labels,
             'axis_labels'   => $data->{label},
             'colors'        => $data->{colors},
             'links'         => \@links,
@@ -58,6 +64,7 @@ Example:
 <%init>
 
 my(%opt) = @_;
+$opt{'debug'} ||= $cgi->param('debug');
 
 my $conf = new FS::Conf;
 my $money_char = $opt{'disable_money'} ? '' : $conf->config('money_char');
@@ -83,28 +90,65 @@ $opt{'start_year'}  ||= $cgi->param('start_year'); # || 1899+$curyear;
 $opt{'end_month'} ||= $cgi->param('end_month'); # || $curmon+1;
 $opt{'end_year'}  ||= $cgi->param('end_year'); # || 1900+$curyear;
 
-my $report = new FS::Report::Table::Monthly (
-
-  'items'        => \@items,
-  'params'       => $opt{'params'},
-  'item_labels'  => ( $cgi->param('_type') =~ /^(png)$/
-                        ? $opt{'graph_labels'}
-                        : $opt{'labels'}
-                    ),
-  'colors'       => $opt{'colors'},
-  'links'        => $opt{'links'},
-
-  'start_month'  => $opt{'start_month'},
-  'start_year'   => $opt{'start_year'},
-  'end_month'    => $opt{'end_month'},
-  'end_year'     => $opt{'end_year'},
-
-  'agentnum'     => $opt{'agentnum'},
-  'remove_empty' => $opt{'remove_empty'},
-  'doublemonths' => $opt{'doublemonths'},
+#find end of projection
+$opt{'project_month'} ||= $cgi->param('project_month') || 0;
+$opt{'project_year'}  ||= $cgi->param('project_year') || 0;
+# setting these to zero prevents projection on reports that don't support it
+
+if ( $opt{'daily'} ) { # daily granularity
+    $opt{'start_day'} ||= $cgi->param('start_day');
+    $opt{'end_day'} ||= $cgi->param('end_day');
+}
+
+my %reportopts = (
+      'items'        => \@items,
+      'params'       => $opt{'params'},
+      'item_labels'  => ( $cgi->param('_type') =~ /^(png)$/
+                            ? $opt{'graph_labels'}
+                            : $opt{'labels'}
+                        ),
+      'colors'       => $opt{'colors'},
+      'links'        => $opt{'links'},
+
+      'start_day'    => $opt{'start_day'},
+      'start_month'  => $opt{'start_month'},
+      'start_year'   => $opt{'start_year'},
+      'end_day'      => $opt{'end_day'},
+      'end_month'    => $opt{'end_month'},
+      'end_year'     => $opt{'end_year'},
+      'project_day'    => $opt{'project_day'},
+      'project_month'  => $opt{'project_month'},
+      'project_year'   => $opt{'project_year'},
+      'agentnum'     => $opt{'agentnum'},
+      'remove_empty' => $opt{'remove_empty'},
+      'doublemonths' => $opt{'doublemonths'},
 );
+
+warn Dumper({ 'REPORTOPTS' => \%reportopts }) if $opt{'debug'};
+
+my $report;
+$report = new FS::Report::Table::Daily(%reportopts) if $opt{'daily'};
+$report = new FS::Report::Table::Monthly(%reportopts) unless $opt{'daily'};
 my $data = $report->data;
 
+warn Dumper({'DATA' => $data}) if $opt{'debug'};
+
+if ( $data->{'error'} ) {
+  die $data->{'error'}; # could be smarter
+}
+
+my $col_labels = [ map { my $m = $_; $m =~ s/^(\d+)\//$mon[$1-1] / ; $m }
+                             @{$data->{label}} ];
+$col_labels = $data->{label} if $opt{'daily'};
+
+if ( $opt{'remove_empty'} ) {
+  # need to filter out series labels for collapsed rows
+  $opt{'graph_labels'} = [ 
+    map { $opt{'graph_labels'}[$_] } 
+    @{ $data->{indices} }
+  ];
+}
+
 my @links;
 foreach my $link (@{ $data->{'links'} }) {
   my @speriod = @{$data->{'speriod'}};