From 3e26abc9cd4fbfbc6e827e2d0656f92c1f00334d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Sat, 12 Feb 2011 20:55:09 -0500
Subject: [PATCH] Follow-up fix for Bug 5760 - Add the jquery table sorter to
 reading record

- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../prog/en/css/staff-global.css              |  2 +-
 .../prog/en/modules/members/readingrec.tmpl   | 40 +++++++------------
 members/readingrec.pl                         | 16 ++------
 3 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 7586185c5b..66b092c2e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -304,7 +304,7 @@ tr.onissue td {
 	background-color: #FFFFCC;
 }
 
-tr.highlight.onissue td {
+tr.odd.onissue td {
 	background-color: #FFFFE1;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index 682eaa9bd0..6d6506381f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -4,8 +4,16 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
 <script type="text/javascript" id="js">$(document).ready(function() {
+	$.tablesorter.addParser({
+		id: 'articles',
+		is: function(s) {return false;  },
+		format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+		type: 'text'
+	});
+	$.tablesorter.defaults.widgets = ['zebra'];
 	$("#table_readingrec").tablesorter({
-		sortList: [[1,0]],
+		sortList: [[8,1]],
+		headers: { 1: { sorter: 'articles' }}
 	}).tablesorterPager({container: $("#pagertable_readingrec"),positionFixed: false,size: 20});
 }); </script>
 </head>
@@ -23,9 +31,7 @@
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 <h1>Reading Record</h1>
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form>
-<p><!-- TMPL_IF NAME="showfulllink" -->Showing All Items |
-	<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=50">Show Last 50 Items Only</a> <!-- TMPL_ELSE -->	Showing Last 50 Items | 
-	<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show All Items</a><!-- /TMPL_IF --></p>
+
 <span id="pagertable_readingrec" class="pager">
 	<form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
 		<img src="<!-- TMPL_VAR name="interface" -->/prog/img/first.png" class="first"/>
@@ -46,39 +52,23 @@
 </span>
 <table id="table_readingrec">
 <thead>
-    <th>
-        <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=issuestimestamp&amp;limit=<!-- TMPL_VAR name="limit" -->">Date</a>
-    </th>
-	<th>
-		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=title&amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
-	</th>
-	<th>
-		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
-	</th>
+    <th>Date</th>
+	<th>Title</th>
+	<th>Author</th>
 	<th>Call No.</th>
 	<th>Barcode</th>
 	<th>Number of Renewals</th>
 	<th>Checked out on</th>
 	<th>Checked out from</th>
 	<th>Date Due</th>
-	<th>
-		<a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=returndate%20DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
-	</th>
+	<th>Return Date</th>
 </thead>
 <!-- TMPL_LOOP name="loop_reading" -->
-<!-- TMPL_UNLESS NAME="__odd__" -->
-    <!-- TMPL_IF NAME="returndate" --><tr class="highlight"><!-- TMPL_ELSE --><tr class="highlight onissue"><!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="returndate" --><tr><!-- TMPL_ELSE --><tr class="onissue"><!-- /TMPL_IF -->
-<!-- /TMPL_UNLESS -->
         <td>
             <!-- TMPL_VAR name="issuestimestamp" -->
         </td>
-        <td>
-            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                <!-- TMPL_VAR name="title" escape="html" -->
-            </a>
-        </td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" escape="html" --></a></td>
 
         <td><!-- TMPL_VAR name="author" --></td>
 
diff --git a/members/readingrec.pl b/members/readingrec.pl
index bd6ca82309..f7631db806 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -50,21 +50,11 @@ if ($input->param('borrowernumber')) {
     $data = GetMember(borrowernumber => $borrowernumber);
 }
 
-my $order=$input->param('order') || 'date_due desc';
-my $limit=$input->param('limit');
-
-if ($limit){
-    if ($limit eq 'full'){
-		$limit=0;
-    }
-}
-else {
-  $limit=50;
-}
+my $order = 'date_due desc';
+my $limit = 0;
 my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/readingrec.tmpl",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
-- 
2.39.5