From bebdbd535b9e28b982f615a301a2817aa1454951 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 28 Oct 2019 16:02:35 +0000
Subject: [PATCH] Bug 23913: Use a single menu to sort lists in the OPAC

This patch modifies the sorting form on the OPAC list contents view so
that the two menus (sort field and direction) are combined into one.
This makes it consistent with the sort menu on the search results page.

To test, apply the patch and view a list with multiple titles on it.

Test the "Sort by" menu, trying all the various options. Confirm that
the pre-selected item in the sorting menu is correct after each re-sort.

Edit the list to change the default sorting and verify that the "Sort
by" menu reflects your selection.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/modules/opac-shelves.tt      | 110 +++++++++++-------
 opac/opac-shelves.pl                          |   9 +-
 2 files changed, 72 insertions(+), 47 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 5e9f40d3f2..52f2efca5a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -207,52 +207,68 @@
                                     <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber | html %]" />
 
                                     <label for="sortfield">Sort by: </label>
-                                    <select name="sortfield" id="sortfield" class="resort" onchange="$('#sorting-form').submit()">
+                                    <select name="sortfield" id="sortfield" class="resort">
                                         <option value="">Default sorting</option>
-
-                                        [% IF sortfield == 'author' %]
-                                            <option value="author" selected="selected">Author</option>
-                                        [% ELSE %]
-                                            <option value="author">Author</option>
-                                        [% END %]
-
-                                        [% IF sortfield == 'title' %]
-                                            <option value="title" selected="selected">Title</option>
-                                        [% ELSE %]
-                                            <option value="title">Title</option>
-                                        [% END %]
-
-                                        [% IF sortfield == 'itemcallnumber' %]
-                                            <option value="itemcallnumber" selected="selected">Call number</option>
-                                        [% ELSE %]
-                                            <option value="itemcallnumber">Call number</option>
-                                        [% END %]
-
-                                        [% IF sortfield == 'copyrightdate' %]
-                                            <option value="copyrightdate" selected="selected">Copyright date</option>
-                                        [% ELSE %]
-                                            <option value="copyrightdate">Copyright date</option>
-                                        [% END %]
-
-                                        [% IF sortfield == "dateadded" %]
-                                            <option value="dateadded" selected="selected">Date added</option>
-                                        [% ELSE %]
-                                            <option value="dateadded">Date added</option>
-                                        [% END %]
-                                    </select>
-
-                                    <select name="direction" class="resort" onchange="$('#sorting-form').submit()">
-                                        [% IF direction == 'asc' %]
-                                            <option value="asc" selected="selected">Ascending</option>
-                                        [% ELSE %]
-                                            <option value="asc">Ascending</option>
-                                        [% END %]
-
-                                        [% IF direction == 'desc' %]
-                                            <option value="desc" selected="selected">Descending</option>
-                                        [% ELSE %]
-                                            <option value="desc">Descending</option>
-                                        [% END %]
+                                        <optgroup label="Author">
+                                            [% IF sortfield == 'author' && direction == 'asc' %]
+                                                <option value="author:asc" selected="selected">Author (A-Z)</option>
+                                            [% ELSE %]
+                                                <option value="author:asc">Author (A-Z)</option>
+                                            [% END %]
+                                            [% IF sortfield == 'author' && direction == 'desc' %]
+                                                <option value="author:desc" selected="selected">Author (Z-A)</option>
+                                            [% ELSE %]
+                                                <option value="author:desc">Author (Z-A)</option>
+                                            [% END %]
+                                        </optgroup>
+                                        <optgroup label="Title">
+                                            [% IF sortfield == 'title' && direction == 'asc' %]
+                                                <option value="title:asc" selected="selected">Title (A-Z)</option>
+                                            [% ELSE %]
+                                                <option value="title:asc">Title (A-Z)</option>
+                                            [% END %]
+                                            [% IF sortfield == 'title' && direction == 'desc' %]
+                                                <option value="title:desc" selected="selected">Title (Z-A)</option>
+                                            [% ELSE %]
+                                                <option value="title:desc">Title (Z-A)</option>
+                                            [% END %]
+                                        </optgroup>
+                                        <optgroup label="Call number">
+                                            [% IF sortfield == 'itemcallnumber' && direction == 'asc' %]
+                                                <option value="itemcallnumber:asc" selected="selected">Call number (A-Z)</option>
+                                            [% ELSE %]
+                                                <option value="itemcallnumber:asc">Call number (A-Z)</option>
+                                            [% END %]
+                                            [% IF sortfield == 'itemcallnumber' && direction == 'desc' %]
+                                                <option value="itemcallnumber:desc" selected="selected">Call number (Z-A)</option>
+                                            [% ELSE %]
+                                                <option value="itemcallnumber:desc">Call number (Z-A)</option>
+                                            [% END %]
+                                        </optgroup>
+                                        <optgroup label="Copyright date">
+                                            [% IF sortfield == 'copyrightdate' && direction == 'asc' %]
+                                                <option value="copyrightdate:asc" selected="selected">Copyright date (newest to oldest)</option>
+                                            [% ELSE %]
+                                                <option value="copyrightdate:asc">Copyright date (newest to oldest)</option>
+                                            [% END %]
+                                            [% IF sortfield == 'copyrightdate' && direction == 'desc' %]
+                                                <option value="copyrightdate:desc" selected="selected">Copyright date (oldest to newest)</option>
+                                            [% ELSE %]
+                                                <option value="copyrightdate:desc">Copyright date (oldest to newest)</option>
+                                            [% END %]
+                                        </optgroup>
+                                        <optgroup label="Date added">
+                                            [% IF sortfield == "dateadded" && direction == 'asc' %]
+                                                <option value="dateadded:asc" selected="selected">Date added (newest to oldest)</option>
+                                            [% ELSE %]
+                                                <option value="dateadded:asc">Date added (newest to oldest)</option>
+                                            [% END %]
+                                            [% IF sortfield == "dateadded" && direction == 'desc' %]
+                                                <option value="dateadded:desc" selected="selected">Date added (oldest to newest)</option>
+                                            [% ELSE %]
+                                                <option value="dateadded:desc">Date added (oldest to newest)</option>
+                                            [% END %]
+                                        </optgroup>
                                     </select>
 
                                     <input type="submit" class="btn btn-small" id="sort-submit" value="Resort list" />
@@ -976,6 +992,10 @@ $(function() {
         stickyClass: "floating"
     });
 
+    $("#sortfield").on("change", function(){
+        $('#sorting-form').submit();
+    });
+
 }); // document.ready
 
 function AdjustRemark() {
diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index 802366d994..f671f1f3f1 100755
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -234,9 +234,14 @@ if ( $op eq 'view' ) {
     if ( $shelf ) {
         if ( $shelf->can_be_viewed( $loggedinuser ) ) {
             $category = $shelf->category;
-            my $sortfield = $query->param('sortfield') || $shelf->sortfield;    # Passed in sorting overrides default sorting
+            my( $sortfield, $direction );
+            if( defined( $query->param('sortfield') ) ){ # Passed in sorting overrides default sorting
+                ( $sortfield, $direction ) = split /:/, $query->param('sortfield');
+            } else {
+                $sortfield = $shelf->sortfield;
+                $direction = 'asc';
+            }
             $sortfield = 'title' unless grep $_ eq $sortfield, qw( title author copyrightdate itemcallnumber dateadded );
-            my $direction = $query->param('direction') || 'asc';
             $direction = 'asc' if $direction ne 'asc' and $direction ne 'desc';
             my ( $page, $rows );
             unless ( $query->param('print') or $query->param('rss') ) {
-- 
2.39.2