Bugzilla – Attachment 15291 Details for
Bug 9604
filter overdues with homebranch and holdingbranch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed patch
0001-Bug-9604-filter-overdues-with-homebranch-and-holding.patch (text/plain), 4.94 KB, created by
Fridolin Somers
on 2013-02-13 09:23:07 UTC
(
hide
)
Description:
Proposed patch
Filename:
MIME Type:
Creator:
Fridolin Somers
Created:
2013-02-13 09:23:07 UTC
Size:
4.94 KB
patch
obsolete
>From 68a2d141a033af5747683283e38d95b35fa3d9a8 Mon Sep 17 00:00:00 2001 >From: Fridolyn SOMERS <fridolyn.somers@biblibre.com> >Date: Wed, 13 Feb 2013 09:41:29 +0100 >Subject: [PATCH] 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. >--- > 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 cef345c..d5285d0 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 ) %] <span style="font-size:70% > </li> > > <li> >+ <label>Item home branch:</label> >+ <select name="homebranch" id="homebranch"> >+ <option value="">Any</option> >+ [% FOREACH homebranchloo IN homebranchloop %][% IF ( homebranchloo.selected ) %] >+ <option value="[% homebranchloo.value |html %]" selected="selected">[% homebranchloo.branchname %]</option>[% ELSE %] >+ <option value="[% homebranchloo.value |html %]">[% homebranchloo.branchname %]</option>[% END %] >+ [% END %] >+ </select> >+ </li> >+ >+ <li> >+ <label>Item holding branch:</label> >+ <select name="holdingbranch" id="holdingbranch"> >+ <option value="">Any</option> >+ [% FOREACH holdingbranchloo IN holdingbranchloop %][% IF ( holdingbranchloo.selected ) %] >+ <option value="[% holdingbranchloo.value |html %]" selected="selected">[% holdingbranchloo.branchname %]</option>[% ELSE %] >+ <option value="[% holdingbranchloo.value |html %]">[% holdingbranchloo.branchname %]</option>[% END %] >+ [% END %] >+ </select> >+ </li> >+ >+ <li> > <label>Library of the patron:</label><select name="branch" id="branch"> > <option value="">Any</option> > [% FOREACH branchloo IN branchloop %] >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9604
:
15291
|
15349
|
16804
|
16806
|
16807
|
16808