X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcdr.html;h=bf59ff625bcac6eb831001ca86db49c527fb7676;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=26eac75b3cb33ff9e14d6811466951a95270ef6c;hpb=69678d308805f5ca4b171ea0c5ac1da957811aa0;p=freeside.git diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html index 26eac75b3..bf59ff625 100644 --- a/httemplate/search/cdr.html +++ b/httemplate/search/cdr.html @@ -8,6 +8,7 @@ 'order_by' => 'ORDER BY calldate', }, 'count_query' => $count_query, + 'count_addl' => [ $totalminutes_sub ], 'header' => [ '', # checkbox column @header, @@ -23,6 +24,7 @@ @fields, #XXX fill in some pretty-print #processing, etc. ], + 'links' => \@links, 'html_form' => qq!
!, #false laziness w/queue.html @@ -44,7 +46,6 @@ ''; } }, - ) %> <%init> @@ -54,6 +55,13 @@ die "access denied" my $edit_data = $FS::CurrentUser::CurrentUser->access_right('Edit rating data'); +my $totalminutes_sub = sub { + my $billsec = shift; + sprintf("%.2f",$billsec/60) . ' total minutes'; +}; + +my $conf = new FS::Conf; + my $areboxes = 0; my $title = 'Call Detail Records'; @@ -69,10 +77,11 @@ my @search = (); ### my $str2time_sql = str2time_sql; +my $closing = str2time_sql_closing; my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); -push @search, "$str2time_sql calldate) >= $beginning ", - "$str2time_sql calldate) <= $ending"; +push @search, "$str2time_sql calldate $closing >= $beginning ", + "$str2time_sql calldate $closing <= $ending"; ### # duration / billsec @@ -124,7 +133,7 @@ foreach my $param ( grep /^termpart\d+status$/, $cgi->param ) { $search = "NOT EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )"; - } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) { + } elsif ( $status =~ /^([\w ]+)$/ ) { #false lazienss w/cdr_termination.pm (i should be a part_termination method) my $where_term = @@ -143,46 +152,111 @@ foreach my $param ( grep /^termpart\d+status$/, $cgi->param ) { } ### -# src/dest/charged_party +# src/dest/charged_party/svcnum ### -if ( $cgi->param('src') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) { - ( my $src = $1 ) =~ s/\D//g; +my $phonenum = qr/^\s*([\d\-\+\ ]+)\s*$/; +my $x = qr/\D/; +if ( $conf->exists('svc_phone-allow_alpha_phonenum') ) { + $phonenum = qr/^\s*([\d\-\+\ A-Za-z]+)\s*$/; + $x = qr/[^\dA-Za-z]/; +} + +if ( $cgi->param('src') =~ $phonenum ) { + ( my $src = $1 ) =~ s/$x//g; $hashref->{'src'} = $src; push @search, "src = '$src'"; } -if ( $cgi->param('dst') =~ /^\s*([\d\-\+ ]+)\s*$/ ) { - ( my $dst = $1 ) =~ s/\D//g; - $hashref->{'dst'} = $dst; - push @search, "dst = '$dst'"; +if ( $cgi->param('dst') ) { + + my @d = map { $_, "1$_" } split(/\s*,\s*/, $cgi->param('dst') ); + + my $search = 'dst IN ('. join(',', map dbh->quote($_), @d). ')'; + + push @search, $search; + push @qsearch, $search; + +} + +if ( $cgi->param('dcontext') =~ /^\s*(.+)\s*$/ ) { + my $dcontext = $1; + $hashref->{'dcontext'} = $dcontext; + push @search, "dcontext = '$dcontext'"; } -if ( $cgi->param('charged_party') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) { - ( my $charged_party = $1 ) =~ s/\D//g; - #$hashref->{'charged_party'} = $charged_party; - #push @search, "charged_party = '$charged_party'"; - #XXX countrycode +if ( $cgi->param('charged_party') ) { - my $search = " ( charged_party = '$charged_party' - OR charged_party = '1$charged_party' ) "; + my @cp = map { $_, "1$_" } + split(/\s*,\s*/, $cgi->param('charged_party') ); + + my $search = 'charged_party IN ('. join(',', map dbh->quote($_), @cp). ')'; push @search, $search; push @qsearch, $search; } +if ( $cgi->param('charged_party_or_src') ) { + + my @cp = map { $_, "1$_" } + split(/\s*,\s*/, $cgi->param('charged_party_or_src') ); + my $in = join(',', map dbh->quote($_), @cp); + + my $search = "( charged_party IN ($in) OR src IN ($in) )"; + + push @search, $search; + push @qsearch, $search; +} + +if ( $cgi->param('svcnum') =~ /^([\d, ]+)$/ ) { + my $svcnum = $1; + my $search = "svcnum IN ($svcnum)"; + push @search, $search; + push @qsearch, $search; +} + ### -# cdrbatch +# cdrbatchnum (or legacy cdrbatch) ### -if ( $cgi->param('cdrbatch') ne '__ALL__' ) { - if ( $cgi->param('cdrbatch') eq '' ) { - my $search = "( cdrbatch IS NULL OR cdrbatch = '' )"; +if ( $cgi->param('cdrbatch') ) { + + my $cdr_batch = + qsearchs('cdr_batch', { 'cdrbatch' => scalar($cgi->param('cdrbatch')) } ); + if ( $cdr_batch ) { + $hashref->{cdrbatchnum} = $cdr_batch->cdrbatchnum; + push @search, 'cdrbatchnum = '. $cdr_batch->cdrbatchnum; + } else { + die "unknown cdrbatch ". $cgi->param('cdrbatch'); + } + +} elsif ( $cgi->param('cdrbatchnum') ne '__ALL__' ) { + + if ( $cgi->param('cdrbatchnum') eq '' ) { + my $search = "( cdrbatchnum IS NULL )"; + push @qsearch, $search; + push @search, $search; + } elsif ( $cgi->param('cdrbatchnum') =~ /^(\d+)$/ ) { + $hashref->{cdrbatchnum} = $1; + push @search, "cdrbatchnum = $1"; + } + +} + +### +# acctid +### + +if ( $cgi->param('acctid') =~ /\d/ ) { + my $acctid = $cgi->param('acctid'); + $acctid =~ s/\r\n/\n/g; #browsers? + my @acctid = map { /^\s*(\d+)\s*$/ or die "guru meditation #4"; $1; } + grep { /^\s*(\d+)\s*$/ } + split(/\n/, $acctid); + if ( @acctid ) { + my $search = 'acctid IN ( '. join(',', @acctid). ' )'; push @qsearch, $search; push @search, $search; - } else { - $hashref->{cdrbatch} = $cgi->param('cdrbatch'); - push @search, 'cdrbatch = '. dbh->quote($cgi->param('cdrbatch')); } } @@ -193,7 +267,7 @@ if ( $cgi->param('cdrbatch') ne '__ALL__' ) { my $search = join(' AND ', @search); $search = "WHERE $search" if $search; -my $count_query = "SELECT COUNT(*) FROM cdr $search"; +my $count_query = "SELECT COUNT(*), sum(billsec) FROM cdr $search"; my $qsearch = join(' AND ', @qsearch); $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch @@ -203,32 +277,49 @@ $qsearch = ( scalar(keys %$hashref) ? ' AND ' : ' WHERE ' ) . $qsearch # display fields ### -#XXX fill in some (more) nice names -my %header = ( - 'calldate' => 'Call Date', - 'clid' => 'Caller ID', - 'charged_party' => 'Charged party', - 'src' => 'Source', - 'dst' => 'Destination', - 'dcontext' => 'Destination Context', - 'channel' => 'Channel', - 'dstchannel' => 'Destination Channel', - 'freesidestatus' => 'Freeside status', -); +my %header = %{ FS::cdr->table_info->{'fields'} }; my @first = qw( acctid calldate clid charged_party src dst dcontext ); my %first = map { $_=>1 } @first; my @fields = ( @first, grep !$first{$_}, fields('cdr') ); +if ( $cgi->param('show') ) { + @fields = grep $cgi->param("show_$_"), @fields; +} + my @header = map { if ( exists($header{$_}) ) { $header{$_}; } else { my $header = $_; - $header =~ s/\_/ /g; + $header =~ s/\_/ /g; #//wtf ucfirst($header); } } @fields; +my $date_sub_factory = sub { + my $column = shift; + sub { + #my $cdr = shift; + my $date = shift->$column(); + $date ? time2str( '%Y-%m-%d %T', $date ) : ''; #config time2str format? + }; +}; + +my %fields = ( + #any other formatters? + map { $_ => &{ $date_sub_factory }($_) } qw( startdate answerdate enddate ) +); + +my %links = ( + 'svcnum' => + sub { $_[0]->svcnum ? [ $p.'view/svc_phone.cgi?', 'svcnum' ] : ''; }, +); + +@fields = map { exists($fields{$_}) ? $fields{$_} : $_ } @fields; + + #checkbox column +my @links = ( '', map { exists($links{$_}) ? $links{$_} : '' } @fields ); +