Attachment 79659 Details for Bug 9188 – Bug 9188: counter patch -- just meaningful filter information

[patch] Bug 9188: counter patch -- just meaningful filter information

Bug-9188-counter-patch----just-meaningful-filter-i.patch (text/plain), 3.55 KB, created by Andreas Roussos on 2018-09-30 17:22:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Roussos

Created: 2018-09-30 17:22:05 UTC

Size: 3.55 KB

patch

obsolete

>From 736dc74a979bfd338a89047547dbc729e4ee6162 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Wed, 7 Jun 2017 15:28:11 -0400
>Subject: [PATCH] Bug 9188: counter patch -- just meaningful filter information
>
>TEST PLAN
>---------
>run patron statistics without filtering
>-- notice lots of text at top.
>run patron statistics with filtering
>-- notice lots of text at top.
>apply patch
>run it without and without filtering
>-- amount of text should be small or none and be related to the filtering selected.
>run koha qa test tools
>
>Signed-off-by: Andreas Roussos <arouss1980@gmail.com>
>Works as expected, i.e. only filtering information is displayed.
>---
> .../intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt  |  2 +-
> reports/borrowers_stats.pl                                    | 11 -----------
> 2 files changed, 1 insertion(+), 12 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>index 5edd401f48..3595784bed 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>@@ -24,7 +24,7 @@
> [% IF ( do_it ) %]
> 	[% FOREACH mainloo IN mainloop %]
> 		<h1>Patrons statistics</h1>
>-		[% IF ( mainloo.loopfilter ) %]
>+        [% IF ( mainloo.loopfilter.size>0 ) %]
>             <p>Filtered on:</p>
> 			[% FOREACH loopfilte IN mainloo.loopfilter %]
> 				<p>
>diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
>index 9bdf37d0dc..30e277cc57 100755
>--- a/reports/borrowers_stats.pl
>+++ b/reports/borrowers_stats.pl
>@@ -232,8 +232,6 @@ sub calculate {
>     my @branchcodes = map { $_->branchcode } Koha::Libraries->search;
> 	($status  ) and push @loopfilter,{crit=>"Status",  filter=>$status  };
> 	($activity) and push @loopfilter,{crit=>"Activity",filter=>$activity};
>-    push @loopfilter,{debug=>1, crit=>"Branches",filter=>join(" ", sort @branchcodes)};
>-	push @loopfilter,{debug=>1, crit=>"(line, column)", filter=>"($line,$column)"};
> # year of activity
> 	my ( $period_year, $period_month, $period_day )=Add_Delta_YM( Today(),-$period, 0);
> 	my $newperioddate=$period_year."-".$period_month."-".$period_day;
>@@ -252,12 +250,6 @@ sub calculate {
>         $linefield = $line;
>     }
>     my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['categorycode']});
>-    push @loopfilter,
>-        {
>-            debug  => 1,
>-            crit   => "Patron category",
>-            filter => join( ", ", map { $_->categorycode . ' (' . ( $_->description || 'NO_DESCRIPTION' ) . ')' } $patron_categories->as_list ),
>-        };
> 
>     my $strsth;
>     my @strparams; # bind parameters for the query
>@@ -278,7 +270,6 @@ sub calculate {
> 	$strsth .= " AND $status='1' " if ($status);
>     $strsth .=" order by $linefield";
> 	
>-	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth};
> 	my $sth = $dbh->prepare($strsth);
>     $sth->execute(@strparams);
>  	while (my ($celvalue) = $sth->fetchrow) {
>@@ -325,7 +316,6 @@ sub calculate {
> 	$strsth2 .= " AND $status='1' " if ($status);
> 
>     $strsth2 .= " order by $colfield";
>-	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth2};
> 	my $sth2 = $dbh->prepare($strsth2);
>     $sth2->execute(@strparams2);
>  	while (my ($celvalue) = $sth2->fetchrow) {
>@@ -422,7 +412,6 @@ sub calculate {
>         $strcalc .= " $colfield ";
>     }
> 
>-	push @loopfilter, {sql=>1, crit=>"Query", filter=>$strcalc};
> 	my $dbcalc = $dbh->prepare($strcalc);
> 	(scalar(@calcparams)) ? $dbcalc->execute(@calcparams) : $dbcalc->execute();
> 	
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 9188: 13828 | 55526 | 55625 | 64087 | 79659 | 79666