From e94d0bcedcb08505f7b8b2b4a0c9a74c6cb5f88e Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 13 Feb 2013 09:41:29 +0100 Subject: [PATCH] [PASSED QA] Bug 9604: filter overdues with homebranch and holdingbranch This patch adds in overdues.pl filters on item home branch and holding branch. Test plan : Play with item home branch and holding branch filters and check it filters well results. Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer Filters are added to the list of overdues in the circulation module. All tests and QA script pass. --- circ/overdue.pl | 12 +++++++++++ .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 22 ++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/circ/overdue.pl b/circ/overdue.pl index 8fed8c8..1e1bd6f 100755 --- a/circ/overdue.pl +++ b/circ/overdue.pl @@ -40,6 +40,8 @@ my $borcatfilter = $input->param('borcat') || ''; my $itemtypefilter = $input->param('itemtype') || ''; my $borflagsfilter = $input->param('borflag') || ''; my $branchfilter = $input->param('branch') || ''; +my $homebranchfilter = $input->param('homebranch') || ''; +my $holdingbranchfilter = $input->param('holdingbranch') || ''; my $op = $input->param('op') || ''; my $dateduefrom = format_date_in_iso($input->param( 'dateduefrom' )) || ''; my $datedueto = format_date_in_iso($input->param( 'datedueto' )) || ''; @@ -214,7 +216,11 @@ if (@patron_attr_filter_loop) { $template->param( patron_attr_header_loop => [ map { { header => $_->{description} } } grep { ! $_->{isclone} } @patron_attr_filter_loop ], branchloop => GetBranchesLoop($branchfilter, $onlymine), + homebranchloop => GetBranchesLoop( $homebranchfilter, $onlymine ), + holdingbranchloop => GetBranchesLoop( $holdingbranchfilter, $onlymine ), branchfilter => $branchfilter, + homebranchfilter => $homebranchfilter, + holdingbranchfilter => $homebranchfilter, borcatloop=> \@borcatloop, itemtypeloop => \@itemtypeloop, patron_attr_filter_loop => \@patron_attr_filter_loop, @@ -260,6 +266,8 @@ if ($noreport) { issues.itemnumber, issues.issuedate, items.barcode, + items.homebranch, + items.holdingbranch, biblio.title, biblio.author, borrowers.borrowernumber, @@ -295,6 +303,8 @@ if ($noreport) { $strsth .= " AND borrowers.lost <> 0"; } $strsth.=" AND borrowers.branchcode = '" . $branchfilter . "' " if $branchfilter; + $strsth.=" AND items.homebranch = '" . $homebranchfilter . "' " if $homebranchfilter; + $strsth.=" AND items.holdingbranch = '" . $holdingbranchfilter . "' " if $holdingbranchfilter; $strsth.=" AND date_due < '" . $datedueto . "' " if $datedueto; $strsth.=" AND date_due > '" . $dateduefrom . "' " if $dateduefrom; # restrict patrons (borrowers) to those matching the patron attribute filter(s), if any @@ -352,6 +362,8 @@ if ($noreport) { title => $data->{title}, author => $data->{author}, branchcode => $data->{branchcode}, + homebranchcode => $data->{homebranchcode}, + holdingbranchcode => $data->{holdingbranchcode}, itemcallnumber => $data->{itemcallnumber}, replacementprice => $data->{replacementprice}, enumchron => $data->{enumchron}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt index f45dbea..5e5dd59 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -194,6 +194,28 @@ overdue as of [% todaysdate %][% IF ( isfiltered ) %] + + [% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %] + [% ELSE %] + [% END %] + [% END %] + + + +
  • + + +
  • + +