From ffab1df95263b5a8832a4cdeffae0272d436df77 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 27 Jun 2024 20:05:34 +0000
Subject: [PATCH] Bug 30411: Put shelving location into its own column in holds
 queue

To test:
1. Put some items on hold, make some bib level holds and some item
   level holds. Make sure that some of the holds have different shelving
   locations.
2. Build the holds queue. In KTD: perl
   /kohadevbox/koha/misc/cronjobs/holds/build_holds_queue.pl
3. Notice that the shelving location is in the same column as
   itemcallnumber
4. Apply patch and restart_all
5. Reload the holds queue and notice that shelving location now has it's
   own column.
6. Make sure you can sort by shelving location correctly.
7. Re-run the holds queue and apply the filter for shelving location.
   Make sure all your holds of that shelving location are shown.
8. While in the holds queue try usiong the 'Shelving location' filter on
   the left side of the page, make sure it works right.
9. Go to Admin > Table settings. Try hiding the shelving location column
   and reload the holds queue to make sure it is properly hidden.
10. Try hiding some other columns via Table settings to make sure all
    columns are still properly being hid.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 admin/columns_settings.yml                               | 2 ++
 .../prog/en/modules/circ/view_holdsqueue.tt              | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 154b66ae17..5999889ce1 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1665,6 +1665,8 @@ modules:
               is_hidden: 1
             -
               columnname: collection
+            -
+              columnname: location
             -
               columnname: document_type
             -
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 ce05243308..3a88c14e87 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
@@ -80,6 +80,7 @@
                     <th class="hq-holdingbranch">Current library</th>
                     <th class="hq-homebranch">Home library</th>
                     <th class="hq-collection">Collection</th>
+                    <th class="hq-location">Shelving location</th>
                     <th class="hq-itemtype">Item type</th>
                     <th class="hq-callnumber">Call number</th>
                     <th class="hq-copynumber">Copy number</th>
@@ -112,6 +113,11 @@
                             <input type="text" placeholder="Collection">
                         </span>
                     </td>
+                    <td class="hq-location">
+                        <span class="filter_column filter_text">
+                            <input type="text" placeholder="Location">
+                        </span>
+                    </td>
                     <td class="hq-itemtype">
                         <span class="filter_column filter_text">
                             <input type="text" placeholder="Item type">
@@ -192,8 +198,9 @@
                         <td class="hq-holdingbranch">[% Branches.GetName( itemsloo.holdingbranch ) | html %]</td>
                         <td class="hq-homebranch">[% Branches.GetName( itemsloo.item.homebranch ) | html %]</td>
                         <td class="hq-collection">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.ccode', authorised_value => itemsloo.item.ccode ) | html %]</td>
+                        <td class="hq-location">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => itemsloo.item.location ) | html %]</td>
                         <td class="hq-itemtype">[% ItemTypes.GetDescription( itemsloo.item.effective_itemtype ) | html %]</td>
-                        <td class="hq-callnumber">[% IF ( itemsloo.item.location ) %]<span class="location"><em>[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => itemsloo.item.location ) | html %]</em></span> [% END %]<span class="itemcallnumber">[% itemsloo.item.itemcallnumber | html %]</span></td>
+                        <td class="hq-callnumber"><span class="itemcallnumber">[% itemsloo.item.itemcallnumber | html %]</span></td>
                         <td class="hq-copynumber">[% itemsloo.item.copynumber | html %]</td>
                         <td class="hq-enumchron">[% itemsloo.item.enumchron | html %]</td>
                         <td class="hq-barcode">
-- 
2.39.5