From 28d41896dd9aa72d9b6de55dfec42dfd38125a0d Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Tue, 2 Nov 2021 11:57:21 +0000
Subject: [PATCH] Bug 29389: Add holding branch to the holds queue report

This patch adds the holding branch to the hold queue report.
It is added as hidden by default, when running per branch it is not needed

To test:
 1 - Place some holds in your system
 2 - perl misc/cronjobs/holds/build_holdsqueue.pl
 3 - View the holds queue
 4 - Note there is no 'Current library' column
 5 - Apply patch
 6 - Reload
 7 - Note the column is not there
 8 - Click column setting gear
 9 - Check the column and confirm it appears
10 - Confirm the filter works

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 admin/columns_settings.yml                                 | 3 +++
 .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt  | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 1b27cb60f1..be507f2041 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1376,6 +1376,9 @@ modules:
         columns:
             -
               columnname: title
+            -
+              columnname: holdingbranch
+              is_hidden: 1
             -
               columnname: collection
             -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 7d1032386c..e4c9135046 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -77,6 +77,7 @@
 	<thead>
     <tr>
         <th class="hq-title anti-the">Title</th>
+        <th class="hq-holdingbranch">Current library</th>
         <th class="hq-collection">Collection</th>
         <th class="hq-itemtype">Item type</th>
         <th class="hq-callnumber">Call number</th>
@@ -95,6 +96,11 @@
                 <input class="text_filter" type="text" placeholder="Title">
             </span>
         </td>
+        <td class="hq-holdingbranch">
+            <span class="filter_column filter_text">
+                <input class="text_filter" type="text" placeholder="Current library">
+            </span>
+        </td>
         <td class="hq-collection">
             <span class="filter_column filter_text">
                 <input type="text" placeholder="Collection">
@@ -179,6 +185,7 @@
                     </div>
                 </p>
             </td>
+            <td class="hq-holdingbranch">[% Branches.GetName( itemsloo.holdingbranch ) | html %]</td>
             <td class="hq-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemsloo.ccode ) | html %]</td>
             <td class="hq-itemtype">[% ItemTypes.GetDescription( itemsloo.itype ) | html %]</td>
             <td class="hq-callnumber">[% IF ( itemsloo.location ) %]<em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => itemsloo.location ) | html %]</em> [% END %][% itemsloo.itemcallnumber | html %]</td>
-- 
2.39.5