From f897f95f9c5252e151d2fdb66a0a99c5556cdb41 Mon Sep 17 00:00:00 2001
From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Wed, 10 Aug 2011 14:25:58 -0400
Subject: [PATCH] Working bookbag sorting TODO: check anon list
 retrieval/sorting

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 .../perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm  | 14 +++++++++++++-
 Open-ILS/web/templates/default/opac/myopac/lists.tt2 | 20 +++++++++++++++++---
 .../templates/default/opac/parts/advanced/search.tt2 |  2 +-
 .../web/templates/default/opac/parts/filtersort.tt2  |  8 ++++----
 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index c8cf9848ca..adde100312 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1205,6 +1205,9 @@ sub load_myopac_bookbags {
     my $e = $self->editor;
     my $ctx = $self->ctx;
 
+    my $sorter = $self->cgi->param("sort");
+    my $modifier = ($sorter =~ /\.(.+$)/) ? $1 : undef;
+
     $e->xact_begin; # replication...
 
     my $rv = $self->load_mylist;
@@ -1237,7 +1240,10 @@ sub load_myopac_bookbags {
 
     foreach my $bookbag (@{$ctx->{bookbags}}) {
         my $query = sprintf(
-            "container(bre,bookbag,%d,%s)", $bookbag->id, $e->authtoken
+            "container(bre,bookbag,%d,%s)%s%s",
+            $bookbag->id, $e->authtoken,
+            ($sorter ? " sort($sorter)" : ""),
+            ($modifier ? "#$modifier" : "")
         );
         my $results = $U->simplereq(
             "open-ils.search", "open-ils.search.biblio.multiclass.query",
@@ -1247,6 +1253,12 @@ sub load_myopac_bookbags {
         # now we have record ids, but we need the cbrebi objects too
         my $record_id_list = [ map { pop @$_ } @{$results->{ids}} ];
 
+        # We're done with this bookbag if it has no items
+        unless (@$record_id_list) {
+            $bookbag->items([]);
+            next;
+        }
+
         my $items = $e->search_container_biblio_record_entry_bucket_item([
             {
                 "target_biblio_record_entry" => $record_id_list,
diff --git a/Open-ILS/web/templates/default/opac/myopac/lists.tt2 b/Open-ILS/web/templates/default/opac/myopac/lists.tt2
index 303bb1a2cd..3708751fa7 100644
--- a/Open-ILS/web/templates/default/opac/myopac/lists.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/lists.tt2
@@ -61,6 +61,16 @@
         </table>
     </form>
 
+    <h2>[% l("Your existing lists") %]</h2>
+    <p>
+        <form method="GET">
+            <label for="opac.result.sort">[% l("Sort list items by: ") %]</label>
+            [% INCLUDE "default/opac/parts/filtersort.tt2"
+                value=CGI.param('sort') %]
+            <input type="submit" value="[% l('Sort') %]" />
+        </form>
+    </p>
+
     [% INCLUDE "default/opac/parts/anon_list.tt2" %]
     [% IF ctx.bookbags.size %]
     <div id='acct_lists_prime'>
@@ -118,8 +128,12 @@
                                     inputs[i].checked = this.checked;}"/>
 
                         </td>
-                        <td width="49%" style="padding-left: 5px;">[% l('Title') %]</td>
-                        <td width="49%">[% l('Author(s)') %]</td>
+                        <td width="49%" style="padding-left: 5px;">
+                            <a href="[% ctx.opac_root %]/myopac/lists?sort=titlesort">[% l('Title') %]</a>
+                        </td>
+                        <td width="49%">
+                            <a href="[% ctx.opac_root %]/myopac/lists?sort=authorsort">[% l('Author(s)') %]</a>
+                        </td>
                         <td width="1%" class="nowrap">
                             <select class="opac-auto-179" name="action">
                                 <option>[% l('-- Actions for this list --') %]</option>
@@ -149,7 +163,7 @@
                 </tbody>
             </table>
             </form>
-            <br /><br />
+            <hr /><br />
         </div>
         [% END %]
     </div>
diff --git a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
index 5762ead1c8..3da7b46d0d 100644
--- a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2
@@ -66,7 +66,7 @@
                 <tr>
                     <td align='center' width='100%'>
                         [% INCLUDE "default/opac/parts/filtersort.tt2"
-                            value=CGI.param('sort') %]
+                            value=CGI.param('sort') class='results_header_sel' %]
                     </td>
                 </tr>
               </table>
diff --git a/Open-ILS/web/templates/default/opac/parts/filtersort.tt2 b/Open-ILS/web/templates/default/opac/parts/filtersort.tt2
index 428626ce99..491f53261b 100644
--- a/Open-ILS/web/templates/default/opac/parts/filtersort.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/filtersort.tt2
@@ -1,15 +1,15 @@
-<select class="results_header_sel" id='opac.result.sort' name="sort">
+<select [% class ? ('class="' _ class _ '"') : '' %] id="opac.result.sort" name="[% name || 'sort' %]">
     <option value=''>[% l("Sort by Relevance") %]</option>
     <optgroup label='[% l("Sort by Title") %]'>
         <option value='titlesort'[% value == 'titlesort' ? ' selected="selected"' : '' %]>[% l("Title: A to Z") %]</option>
-        <option value='titlesort.desc'[% value == 'titlesort.desc' ? ' selected="selected"' : '' %]>[% l("Title: Z to A") %]</option>
+        <option value='titlesort.descending'[% value == 'titlesort.descending' ? ' selected="selected"' : '' %]>[% l("Title: Z to A") %]</option>
     </optgroup>
     <optgroup label='[% l("Sort by Author") %]'>
         <option value='authorsort'[% value == 'authorsort' ? ' selected="selected"' : '' %]>[% l("Author: A to Z") %]</option>
-        <option value='authorsort.desc'[% value == 'authorsort.desc' ? ' selected="selected"' : '' %]>[% l("Author: Z to A") %]</option>
+        <option value='authorsort.descending'[% value == 'authorsort.descending' ? ' selected="selected"' : '' %]>[% l("Author: Z to A") %]</option>
     </optgroup>
     <optgroup label='[% l("Sort by Publication Date") %]'>
-        <option value='pubdate.desc'[% value == 'pubdate.desc' ? ' selected="selected"' : '' %]>[% l("Date: Newest to Oldest") %]</option>
+        <option value='pubdate.descending'[% value == 'pubdate.descending' ? ' selected="selected"' : '' %]>[% l("Date: Newest to Oldest") %]</option>
         <option value='pubdate'[% value == 'pubdate' ? ' selected="selected"' : '' %]>[% l("Date: Oldest to Newest") %]</option>
     </optgroup>
 </select>
-- 
2.11.0