Attachment 46967 Details for Bug 15560 – Bug 15560: Fix display of multiple branches and locations in pending reserves report

[patch] Bug 15560: Fix display of multiple branches and locations in pending reserves report

Bug-15560-Fix-display-of-multiple-branches-and-loc.patch (text/plain), 4.44 KB, created by natasha on 2016-01-20 01:37:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: natasha

Created: 2016-01-20 01:37:59 UTC

Size: 4.44 KB

patch

obsolete

>From 334f67c10bac78e761790dce6a800f67b17a58e2 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Wed, 20 Jan 2016 01:46:14 +0100
>Subject: [PATCH] Bug 15560: Fix display of multiple branches and locations in
> pending reserves report
>
>The patches from bug 12152 broke the display on the pending reserves/
>holds to pull report when items from multiple branches and with
>multiple locations were displayed. The table cells were left empty.
>
>To test:
>- Add a record with at least 2 items from different locations and
> holdingbranches
>- Open the 'holds to pull' report
>- Verify all branches and locations show with their correct
> description
>
>Signed-off-by: Natasha <tasham_8@hotmail.com>
>---
> circ/pendingreserves.pl | 8 ++++----
> .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 12 ++++++++++--
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
>diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
>index 9e811da..d5bcbbb 100755
>--- a/circ/pendingreserves.pl
>+++ b/circ/pendingreserves.pl
>@@ -97,7 +97,7 @@ if ( $run_report ) {
> "SELECT min(reservedate) as l_reservedate,
> reserves.borrowernumber as borrowernumber,
> GROUP_CONCAT(DISTINCT items.holdingbranch 
>- ORDER BY items.itemnumber SEPARATOR ' ') l_holdingbranch,
>+ ORDER BY items.itemnumber SEPARATOR '|') l_holdingbranch,
> reserves.biblionumber,
> reserves.branchcode,
> GROUP_CONCAT(DISTINCT reserves.branchcode 
>@@ -106,7 +106,7 @@ if ( $run_report ) {
> GROUP_CONCAT(DISTINCT items.itype 
> ORDER BY items.itemnumber SEPARATOR ' ') l_itype,
> GROUP_CONCAT(DISTINCT items.location 
>- ORDER BY items.itemnumber SEPARATOR ' ') l_location,
>+ ORDER BY items.itemnumber SEPARATOR '|') l_location,
> GROUP_CONCAT(DISTINCT items.itemcallnumber 
> ORDER BY items.itemnumber SEPARATOR ' ') l_itemcallnumber,
> GROUP_CONCAT(DISTINCT items.enumchron
>@@ -167,7 +167,7 @@ if ( $run_report ) {
> biblionumber => $data->{biblionumber},
> statusw => ( $data->{found} eq "W" ),
> statusf => ( $data->{found} eq "F" ),
>- holdingbranch => $data->{l_holdingbranch},
>+ holdingbranches => [split('\|', $data->{l_holdingbranch})],,
> branch => $data->{l_branch},
> itemcallnumber => $data->{l_itemcallnumber},
> enumchron => $data->{l_enumchron},
>@@ -178,7 +178,7 @@ if ( $run_report ) {
> rcount => $data->{rcount},
> pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
> itype => $data->{l_itype},
>- location => $data->{l_location},
>+ locations => [split('\|', $data->{l_location})],
> }
> );
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 662926d..28cbd4f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -126,12 +126,20 @@ $(document).ready(function() {
> <td>"</td>
> <td>"</td>
> [% END %]
>- <td>[% Branches.GetName ( reserveloo.holdingbranch ) %]</td>
>+ <td>
>+ [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
>+ [% Branches.GetName ( holdingbranch ) %] 
>+ [% END %]
>+ </td>
> <td>[% reserveloo.itemcallnumber %]</td>
> <td>[% reserveloo.copyno %]</td>
> <td>[% reserveloo.enumchron %]</td>
> <td>[% ItemTypes.GetDescription( reserveloo.itype ) %]</td>
>- <td>[% AuthorisedValues.GetByCode('LOC', reserveloo.location) %]</td>
>+ <td>
>+ [% FOREACH loc IN reserveloo.locations %]
>+ [% AuthorisedValues.GetByCode('LOC', loc) %] 
>+ [% END %]
>+ </td>
> <td>
> [% reserveloo.reservedate | $KohaDates %] in [% Branches.GetName ( reserveloo.branch ) %]
> [% IF ( reserveloo.statusw ) %]Waiting[% END %][% IF ( reserveloo.statusf ) %]Fullfilled[% END %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 15560: 46964 | 46967 | 46981 | 46982