Attachment 86940 Details for Bug 22536 – Bug 22536: Display problem in Holds to Pull report

[patch] Bug 22536: Display problem in Holds to Pull report

Bug-22536-Display-problem-in-Holds-to-Pull-report.patch (text/plain), 6.28 KB, created by Josef Moravec on 2019-03-23 09:06:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2019-03-23 09:06:00 UTC

Size: 6.28 KB

patch

obsolete

>From ce497079608e5ffd5d2fc4a5aca239e7b05afee5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 19 Mar 2019 12:41:26 +0000
>Subject: [PATCH] Bug 22536: Display problem in Holds to Pull report
>
>This patch modifies the display of several values in the holds to pull
>report so that they can be displayed as lists instead of as chunks of
>HTML generated in SQL.
>
>This patch modifies the SQL in pendingreserves.pl so that values can be
>formatted in the same way that holding branch is. The better long-term
>solution is to remove SQL from pendingreserves.pl altogether, but this
>is a quick fix.
>
>This patch also makes a couple of minor markup changes to fix
>validation.
>
>To test, apply the patch and go to Circulation -> Holds to pull. To see
>the changes the patch makes your holds to pull list should have titles
>with multiple items at multiple branches, with call number, copy number,
>and enumeration data. These values should all be displayed in bulleted
>lists.
>
>Signed-off-by: David Roberts <david.roberts@ptfs-europe.com>
>Signed-off-by: Bin Wen <bin.wen@inlibro.com>
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> circ/pendingreserves.pl                            | 12 ++---
> .../prog/en/modules/circ/pendingreserves.tt        | 51 +++++++++++++++++++---
> 2 files changed, 50 insertions(+), 13 deletions(-)
>
>diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
>index 734b8d7b94..d0c727413f 100755
>--- a/circ/pendingreserves.pl
>+++ b/circ/pendingreserves.pl
>@@ -192,11 +192,11 @@ my $strsth =
>             GROUP_CONCAT(DISTINCT items.location 
>                     ORDER BY items.itemnumber SEPARATOR '|') l_location,
>             GROUP_CONCAT(DISTINCT items.itemcallnumber 
>-                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_itemcallnumber,
>+                    ORDER BY items.itemnumber SEPARATOR '|') l_itemcallnumber,
>             GROUP_CONCAT(DISTINCT items.enumchron
>-                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_enumchron,
>+                    ORDER BY items.itemnumber SEPARATOR '|') l_enumchron,
>             GROUP_CONCAT(DISTINCT items.copynumber
>-                    ORDER BY items.itemnumber SEPARATOR '<br/>') l_copynumber,
>+                    ORDER BY items.itemnumber SEPARATOR '|') l_copynumber,
>             biblio.title,
>             biblio.author,
>             count(DISTINCT items.itemnumber) as icount,
>@@ -251,9 +251,9 @@ while ( my $data = $sth->fetchrow_hashref ) {
>             biblionumber    => $data->{biblionumber},
>             holdingbranches => [split('\|', $data->{l_holdingbranch})],
>             branch          => $data->{l_branch},
>-            itemcallnumber  => $data->{l_itemcallnumber},
>-            enumchron       => $data->{l_enumchron},
>-            copyno          => $data->{l_copynumber},
>+            itemcallnumber  => [split('\|', $data->{l_itemcallnumber})],
>+            enumchron       => [split('\|', $data->{l_enumchron})],
>+            copyno          => [split('\|', $data->{l_copynumber})],
>             count           => $data->{icount},
>             rcount          => $data->{rcount},
>             pullcount       => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
>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 2f0b7755c8..331e0a155f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -46,7 +46,7 @@
> <h2>Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]</h2>
> <h3>Reported on [% todaysdate | $KohaDates %]</h3>
> <p>The following holds have not been filled. Please retrieve them and check them in.</p>
>-<div class="searchresults">
>+<div id="searchresults">
>     [% IF ( reserveloop ) %]
>     <table id="holdst">
>     <thead>
>@@ -54,7 +54,7 @@
>         <th>Pull this many items</th>
>         <th>Items available</th>
>         <th>Patrons with holds</th>
>-        <th>First patron</td>
>+        <th>First patron</th>
>         <th class="anti-the">Title</th>
>         <th class="string-sort">Libraries</th>
>         <th>Available call numbers</th>
>@@ -88,13 +88,49 @@
>             <td>"</td>
>         [% END %]
>         <td>
>-            [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
>-                [% Branches.GetName ( holdingbranch ) | html %]
>+            [% IF ( reserveloo.holdingbranches ) %]
>+               <ul>
>+                    [% FOREACH holdingbranch IN reserveloo.holdingbranches %]
>+                        <li>
>+                            [% Branches.GetName ( holdingbranch ) | html %]
>+                        </li>
>+                    [% END %]
>+               </ul>
>+            [% END %]
>+        </td>
>+        <td>
>+            [% IF ( reserveloo.itemcallnumber ) %]
>+                <ul>
>+                    [% FOREACH itemcallnumber IN reserveloo.itemcallnumber  %]
>+                        <li>
>+                            [% itemcallnumber | html %]
>+                        </li>
>+                    [% END %]
>+                </ul>
>+            [% END %]
>+        </td>
>+        <td>
>+            [% IF ( reserveloo.copyno ) %]
>+                <ul>
>+                    [% FOREACH copyno IN reserveloo.copyno %]
>+                        <li>
>+                            [% copyno | html %]
>+                        </li>
>+                    [% END %]
>+                </ul>
>+            [% END %]
>+        </td>
>+        <td>
>+            [% IF ( reserveloo.enumchron ) %]
>+                <ul>
>+                    [% FOREACH enumchron IN reserveloo.enumchron %]
>+                        <li>
>+                            [% enumchron | html %]
>+                        </li>
>+                    [% END %]
>+                </ul>
>             [% END %]
>         </td>
>-        <td><p>[% reserveloo.itemcallnumber | html %]</p></td>
>-        <td><p>[% reserveloo.copyno | html %]</p></td>
>-        <td><p>[% reserveloo.enumchron | html %]</p></td>
>         <td>
>         [% FOREACH itemType IN reserveloo.itemTypes %]
>             [% ItemTypes.GetDescription( itemType ) | html %]
>@@ -135,6 +171,7 @@
>                 <span>Biblio level hold.</span>
>             [% END %]
>         [% END %]
>+            </td>
>         </tr>
>         [% END %]
>     </tbody>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 22536: 86732 | 86738 | 86872 | 86927 | 86940