From 61ee2b79d22b0b974a2b522dc3e1db357f6e1234 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Wed, 30 Mar 2022 22:03:13 +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.
---
 admin/columns_settings.yml                            |  2 ++
 .../prog/en/modules/circ/view_holdsqueue.tt           | 11 +++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 394b5d346e..ea532d164d 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1196,6 +1196,8 @@ modules:
               columnname: collection
             -
               columnname: document_type
+            -
+              columnname: shelving_location
             -
               columnname: callnumber
             -
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 6eeb9f65c6..eee9503500 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
@@ -79,6 +79,7 @@
         <th class="hq-title anti-the">Title</th>
         <th class="hq-collection">Collection</th>
         <th class="hq-itemtype">Item type</th>
+        <th class="hq-location">Shelving location</th>
         <th class="hq-callnumber">Call number</th>
         <th class="hq-copynumber">Copy number</th>
         <th class="hq-enumchron">Enumeration</th>
@@ -105,6 +106,11 @@
                 <input type="text" placeholder="Item type">
             </span>
         </td>
+        <td class="hq-location">
+            <span class="filter_column filter_text">
+                <input type="text" placeholder="Shelving location">
+            </span>
+        </td>
         <td class="hq-callnumber">
             <span class="filter_column filter_text">
                 <input type="text" placeholder="Call number">
@@ -181,7 +187,8 @@
             </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>
+            <td class="hq-location">[% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => itemsloo.location ) | html %]</td>
+            <td class="hq-callnumber">[% itemsloo.itemcallnumber | html %]</td>
             <td class="hq-copynumber">[% itemsloo.copynumber | html %]</td>
             <td class="hq-enumchron">[% itemsloo.enumchron | html %]</td>
             <td class="hq-barcode">
@@ -300,7 +307,7 @@
 
             var columns_settings = [% TablesSettings.GetColumns('circ', 'view_holdsqueue', 'holds-table', 'json') | $raw %];
             var holdst = KohaTable("holdst", {
-                "aaSorting": [[ 3, "asc" ]],
+                "aaSorting": [[ 4, "asc" ]],
                 "sDom": 'B<"clearfix">t',
                 "bSortCellsTop": true,
                 "bPaginate": false
-- 
2.20.1