From abd30b7f49a587b6f4c281e1066894f8a1d17e38 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Tue, 18 Apr 2023 23:11:47 +0000
Subject: [PATCH] Bug 33561: New dispay for location column

---
 .../prog/css/src/staff-global.scss            | 19 ++++--
 .../prog/en/modules/catalogue/results.tt      | 66 +++++++++----------
 2 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index ab0a8f9e3e..1089f641de 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -1770,7 +1770,6 @@ i {
 
 // style for shelving location in catalogsearch
 .shelvingloc {
-    display: block;
     font-style: italic;
 }
 
@@ -4247,14 +4246,22 @@ div .suggestion_note {
         }
     }
 
+    h4 {
+        margin-bottom: 0;
+    }
+
+    table td {
+        width: calc(100%/4);
+    }
+
     .item_counts {
         font-weight: bold;
         white-space: nowrap;
     }
 
     .results_available_count {
+        float: right;
         font-weight: bold;
-        margin-bottom: .5em;
     }
 
     .results_checkedout {
@@ -4262,9 +4269,13 @@ div .suggestion_note {
         margin: .3em 0;
     }
 
+    .results_available {
+        color: #060;
+        margin: .3em 0;
+    }
+
     .results_unavailable {
-        color: #555;
-        font-style: italic;
+        color: #900;
         margin: .3em 0;
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index b6e4380640..c6fc80e5cf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -594,76 +594,76 @@
                                                                 <span class="blocker inaccurate-item-statuses" title="Item statuses may be inaccurate. Please view the record details for accurate item statuses">
                                                             [% END %]
 
-                                                            [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %][% IF ( SEARCH_RESULT.availablecount ) %], [% SEARCH_RESULT.availablecount | html %] <span>available:</span>[% ELSE %], <span>None available</span>[% END %]
+                                                            [% tnx('{count} item', '{count} items', SEARCH_RESULT.items_count, {count = SEARCH_RESULT.items_count}) | html %]
 
                                                             [% IF MaxSearchResultsItemsPerRecordStatusCheck && SEARCH_RESULT.items_count > MaxSearchResultsItemsPerRecordStatusCheck %]
                                                                 </span>
                                                             [% END %]
                                                         </div> <!-- /.results_available_count -->
 
+                                                        [% IF SEARCH_RESULT.availablecount %]
+                                                            <h4 class="results_available">[% SEARCH_RESULT.availablecount | html %] Available</h4>
+                                                        [% END %]
                                                         [% BLOCK search_result_items %]
                                                             [% IF status_count == "onloancount" %]
                                                                 [% IF SEARCH_RESULT.${status_count} > 0 %]
-                                                                    <div class="results_checkedout">[% SEARCH_RESULT.${status_count} | html %] checked out:</div>
+                                                                    <h4 class="results_checkedout">[% SEARCH_RESULT.${status_count} | html %] Checked out</h4>
                                                                 [% END %]
                                                             [% ELSIF status_count == "othercount" %]
                                                                 [% IF SEARCH_RESULT.${status_count} > 0 %]
-                                                                    <div class="results_unavailable">[% SEARCH_RESULT.${status_count} | html %] unavailable:</div>
+                                                                    <h4 class="results_unavailable">[% SEARCH_RESULT.${status_count} | html %] Unavailable</h4>
                                                                 [% END %]
                                                             [% END %]
                                                             [% IF SEARCH_RESULT.${items_loop}.size > 0 %]
-                                                                <ul class="[% items_loop | html %]_items">
+                                                                <table class="table table-sm [% items_loop | html %]_items">
                                                                     [% FOREACH items_loo IN SEARCH_RESULT.${items_loop} %]
-                                                                        [% IF item_level_itypes && !noItemTypeImages && items_loo.imageurl %]
-                                                                            <li class="result_itype_image">
-                                                                                <img src="[% items_loo.imageurl | html %]" title="[% items_loo.description | html %]" alt="[% items_loo.description | html %]" />
-                                                                        [% ELSE %]
-                                                                            <li>
-                                                                        [% END %]
-                                                                        [% IF ( items_loo.branchname ) %]
-                                                                            [% items_loo.branchname | html %]
-                                                                        [% END %]
-                                                                        [% IF ( items_loo.location ) %]
-                                                                            <span class="shelvingloc">[% items_loo.location | html %]</span>
-                                                                        [% END %]
-
+                                                                        <tr class="[% IF items_loo.branchname %][% items_loo.branchname | html %][% END %]">
+                                                                        <td class="branchname">
+                                                                            [% IF ( items_loo.branchname ) %][% items_loo.branchname | html %][% END %]
+                                                                        </td>
+                                                                        <td class="shelvingloc">
+                                                                            [% IF ( items_loo.location ) %][% items_loo.location | html %][% END %]
                                                                             [% IF ( items_loo.itemcallnumber ) %]
-                                                                                <a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% items_loo.itemcallnumber |uri %]%22">[% items_loo.itemcallnumber | html %]</a>
+                                                                                <div>
+                                                                                    <a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=%22[% items_loo.itemcallnumber |uri %]%22">[% items_loo.itemcallnumber | html %]</a>
+                                                                                </div>
                                                                             [% END %]
-                                                                            <div class="result_item_details">
+                                                                        </td>
+                                                                            <td>
                                                                                 [% IF ( items_loo.withdrawn ) %]
-                                                                                    ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => items_loo.withdrawn ) | html %])
+                                                                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.withdrawn', authorised_value => items_loo.withdrawn ) | html %]
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.itemlost ) %]
-                                                                                    ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => items_loo.itemlost ) | html %])
+                                                                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.itemlost', authorised_value => items_loo.itemlost ) | html %]
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.damaged ) %]
-                                                                                    ([% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => items_loo.damaged ) | html %])
+                                                                                    [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.damaged', authorised_value => items_loo.damaged ) | html %]
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.intransit ) %]
-                                                                                    (<span>In transit</span>)
+                                                                                    <span>In transit</span>
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.onhold ) %]
-                                                                                    (<span>On hold</span>)
+                                                                                    <span>On hold</span>
                                                                                 [% END %]
                                                                                 [% IF ( items_loo.notforloan ) %]
                                                                                     [% items_loo.notforloan | html %]
                                                                                 [% END %]
+                                                                                [% IF status_count == "onloancount" %]
+                                                                                        Due: [% items_loo.due_date | $KohaDates %]
+                                                                                [% END %]
+                                                                                [% IF ( !items_loo.withdrawn && !items_loo.itemlost && !items_loo.damaged && !items_loo.intransit && !items_loo.onhold && !items_loo.notforloan && status_count != 'onloancount')  %]
+                                                                                    Available
+                                                                                [% END %]
                                                                                 <span class="item_count">[% items_loo.count | html %]</span>
-                                                                            </div> <!-- /.result_item_details -->
+                                                                            </td> <!-- /.result_item_details -->
 
-                                                                            [% IF status_count == "onloancount" %]
-                                                                                <span class="item-date-due">
-                                                                                    Due: [% items_loo.due_date | $KohaDates %]
-                                                                                </span>
-                                                                            [% END %]
 
                                                                             [% IF item_level_itypes && items_loo.description %]
-                                                                                <span class="item-itype-desc itypetext">[% items_loo.description | html %]</span>
+                                                                                <td class="item-itype-desc itypetext">[% items_loo.description | html %]</td>
                                                                             [% END %]
-                                                                        </li>
+                                                                        </tr>
                                                                     [% END # /FOREACH other_items_loo %]
-                                                                </ul> <!-- /.[% items_loop | html %]_items -->
+                                                                </table> <!-- /.[% items_loop | html %]_items -->
                                                             [% END # /IF SEARCH_RESULT.${items_loop}.size %]
                                                         [% END # /BLOCK search_result_items %]
 
-- 
2.30.2