From: jeff Date: Tue, 1 Jun 2010 19:58:05 +0000 (+0000) Subject: add progressbar, redirection, and improve links RT#8274 X-Git-Tag: freeside_1_9_4~76 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fb1ac8b894c138a3a04c1d5941c969c99cd3d3f4 add progressbar, redirection, and improve links RT#8274 --- diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index f33a718fa..945478475 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -227,9 +227,15 @@ sub popurl { =cut sub rooturl { - # better to start with the client-provided URL - my $cgi = &FS::UID::cgi; - my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + my $url_string; + if ( scalar(@_) ) { + $url_string = shift; + } else { + # better to start with the client-provided URL + my $cgi = &FS::UID::cgi; + $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + } + $url_string =~ s/\?.*//; #even though this is kludgy diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 821b1916a..2d00d2c14 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -494,6 +494,7 @@ use JSON; use FS::UID qw(getotaker); use FS::Record qw(qsearchs); use FS::queue; +use FS::CGI qw(rooturl); $DEBUG = 0; @@ -565,6 +566,7 @@ sub start_job { } } $param{CurrentUser} = getotaker(); + $param{RootURL} = rooturl($self->{cgi}->self_url); warn "FS::UI::Web::start_job\n". join('', map { if ( ref($param{$_}) ) { @@ -620,13 +622,15 @@ sub job_status { } my @return; - if ( $job && $job->status ne 'failed' ) { + if ( $job && $job->status ne 'failed' && $job->status ne 'done' ) { my ($progress, $action) = split ',', $job->statustext, 2; $action ||= 'Server processing job'; @return = ( 'progress', $progress, $action ); } elsif ( !$job ) { #handle job gone case : job successful # so close popup, redirect parent window... @return = ( 'complete' ); + } elsif ( $job->status eq 'done' ) { + @return = ( 'done', $job->statustext, '' ); } else { @return = ( 'error', $job ? $job->statustext : $jobnum ); } diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm index 99e349c61..3f8763da8 100644 --- a/FS/FS/queue.pm +++ b/FS/FS/queue.pm @@ -12,7 +12,7 @@ use FS::Record qw( qsearch qsearchs dbh ); use FS::queue_arg; use FS::queue_depend; use FS::cust_svc; -use FS::CGI qw (rooturl); +use FS::CGI qw(rooturl); @ISA = qw(FS::Record); @EXPORT_OK = qw( joblisting ); @@ -67,6 +67,20 @@ Job status (new, locked, or failed) Freeform text status message +=cut + +sub statustext { + my $self = shift; + if ( defined ( $_[0] ) ) { + $self->SUPER::statustext(@_); + } else { + my $value = $self->SUPER::statustext(); + my $rooturl = rooturl(); + $value =~ s/%%%ROOTURL%%%/$rooturl/g; + $value; + } +} + =item _date UNIX timestamp @@ -363,7 +377,7 @@ If there is an error, returns the error, otherwise returns false. use vars qw($_update_statustext_dbh); sub update_statustext { my( $self, $statustext ) = @_; - return '' if $statustext eq $self->statustext; + return '' if $statustext eq $self->get('statustext'); #avoid rooturl expansion warn "updating statustext for $self to $statustext" if $DEBUG; $_update_statustext_dbh ||= myconnect; @@ -374,7 +388,7 @@ sub update_statustext { $sth->execute($statustext, $self->jobnum) or return $sth->errstr; $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr; - $self->statustext($statustext); + $self->set('statustext', $statustext); #avoid rooturl expansion ''; #my $new = new FS::queue { $self->hash }; diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index 94ba9dbb7..04780daca 100644 --- a/FS/FS/tax_rate.pm +++ b/FS/FS/tax_rate.pm @@ -27,8 +27,6 @@ use FS::part_pkg_taxproduct; use FS::cust_main; use FS::Misc qw( csv_from_fixed ); -#i'd like to dump these -use FS::CGI qw(rooturl popurl); use URI::Escape; @ISA = qw( FS::Record ); @@ -1767,17 +1765,21 @@ Launches a tax liability report. =cut sub queue_liability_report { - my $cgi = shift; + my $job = shift; + my $param = thaw(decode_base64(shift)); + + my $cgi = new CGI; + $cgi->param('beginning', $param->{beginning}); + $cgi->param('ending', $param->{ending}); my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); - my $agentnum = $cgi->param('agentnum'); + my $agentnum = $param->{agentnum}; $agentnum =~ /^(\d+)$/ ? $agentnum = $1 : $agentnum = ''; - my $job = new FS::queue { job => 'FS::tax_rate::generate_liability_report' }; - $job->insert( + generate_liability_report( 'beginning' => $beginning, 'ending' => $ending, 'agentnum' => $agentnum, - 'p' => popurl(2), - 'rooturl' => rooturl, + 'p' => $param->{RootURL}, + 'job' => $job, ); } @@ -1791,6 +1793,8 @@ agentnum, beginning, and ending sub generate_liability_report { my %args = @_; + my ( $count, $last, $min_sec ) = _progressbar_foo(); + #let us open the temp file early my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc; my $report = new File::Temp( TEMPLATE => 'report.tax.liability.XXXXXXXX', @@ -1845,14 +1849,25 @@ sub generate_liability_report { my $credit = 0; my %taxes = (); my %basetaxes = (); - foreach my $t (qsearch({ table => 'cust_bill_pkg', - select => $select, - hashref => { pkgpart => 0 }, - addl_from => $addl_from, - extra_sql => $where, - }) - ) - { + my $calculated = 0; + my @tax_and_location = qsearch({ table => 'cust_bill_pkg', + select => $select, + hashref => { pkgpart => 0 }, + addl_from => $addl_from, + extra_sql => $where, + }); + $count = scalar(@tax_and_location); + foreach my $t ( @tax_and_location ) { + + if ( $args{job} ) { + if ( time - $min_sec > $last ) { + $args{job}->update_statustext( int( 100 * $calculated / $count ). + ",Calculated" + ); + $last = time; + } + } + my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam; my $label = join('~', map { $t->$_ } @params); $label = 'Tax'. $label if $label =~ /^~/; @@ -1894,6 +1909,12 @@ sub generate_liability_report { #ordering + + if ( $args{job} ) { + $args{job}->update_statustext( "0,Sorted" ); + $last = time; + } + my @taxes = (); foreach my $tax ( sort { $a cmp $b } keys %taxes ) { @@ -1951,8 +1972,19 @@ EOF my $bgcolor2 = '#ffffff'; my $bgcolor = ''; + $count = scalar(@taxes); + $calculated = 0; foreach my $tax ( @taxes ) { + if ( $args{job} ) { + if ( time - $min_sec > $last ) { + $args{job}->update_statustext( int( 100 * $calculated / $count ). + ",Generated" + ); + $last = time; + } + } + if ( $bgcolor eq $bgcolor1 ) { $bgcolor = $bgcolor2; } else { @@ -1989,7 +2021,7 @@ EOF my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.'; $reportname =~ s/^$dropstring//; - my $reporturl = $args{rooturl}. "/misc/queued_report?report=$reportname"; + my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname"; die "view\n"; } diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html index 8a55efb4a..a29210201 100644 --- a/httemplate/elements/progress-popup.html +++ b/httemplate/elements/progress-popup.html @@ -69,6 +69,14 @@ function updateStatus( status_statustext ) { alert('job done but no url or message specified'); % } + } else if ( status.indexOf('done') > -1 ) { + + document.getElementById("progress_message").innerHTML = "Loading report"; + document.getElementById("progress_bar").innerHTML = ''; + document.getElementById("progress_percent").innerHTML = ''; + document.getElementById("progress_jobnum").innerHTML = ''; + window.top.location.href = statustext.substr(8, statustext.length-18); + } else if ( status.indexOf('error') > -1 ) { document.getElementById("progress_message").innerHTML = 'Error: ' + statustext + ''; document.getElementById("progress_bar").innerHTML = ''; diff --git a/httemplate/search/report_newtax.html b/httemplate/search/report_newtax.html index 2588b48d3..da39b0c4d 100755 --- a/httemplate/search/report_newtax.html +++ b/httemplate/search/report_newtax.html @@ -1,6 +1,6 @@ <% include('/elements/header.html', 'Tax Report' ) %> -
+ @@ -10,10 +10,17 @@
-
+
+<% include( '/elements/progress-init.html', + 'newtax', + [ qw( agentnum beginning ending ) ], + 'report_queued_newtax.cgi', + ) +%> + <% include('/elements/footer.html') %> <%init> diff --git a/httemplate/search/report_queued_newtax.cgi b/httemplate/search/report_queued_newtax.cgi index 1d5813ece..a375fce62 100755 --- a/httemplate/search/report_queued_newtax.cgi +++ b/httemplate/search/report_queued_newtax.cgi @@ -1,16 +1,10 @@ -<% include("/elements/header.html", "Queue Tax Report") %> -<% include("/elements/error.html") %> -% unless ($error) { -
- Report queued. Check the job queue for status. -
-% } -<% include("/elements/footer.html") %> +<% $server->process %> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Financial reports'); -my $error = FS::tax_rate::queue_liability_report($cgi); +my $server = + new FS::UI::Web::JSRPC 'FS::tax_rate::queue_liability_report', $cgi;