From c134e2111c59e386510ca4c72fec8a019bc5a48e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 7 Oct 2014 14:54:04 -0400
Subject: [PATCH] Bug 13039 - Vendor search: sorting of "item count" and
 "biblio count" columns can be incorrect

On the vendor search results page if some cells contain textual data the
"item count" and "biblio count" columns will sort incorrectly. This
patch sets an explicit numeric sort on these columns. In doing so this
patch also changes the existing column sorting configuration to use
table header cell classes instead of sorting based on index.

This patch also corrects two instances of unescaped ampersands.

To test, search for a vendor which has multiple baskets, at least one of
which should contain canceled orders. Confirm that sorting by item
count, biblio count, date, and closed all work correctly.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I have not been able to see the sorting problem, but the
patch causes no regression and everything seems to work nicely.
Passes QA script and tests.

http://bugs.koha-community.org/show_bug.cgi?id=12039
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../prog/en/modules/acqui/booksellers.tt      | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 546f597b44..3db9188b1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -18,10 +18,9 @@ $(document).ready(function() {
         'bFilter': false,
         'bInfo': false,
         "aaSorting": [[ 1, "asc" ]],
-        "aoColumns": [
-            null,null,null,null,null,null,{ "sType": "title-string" },null,{ "sType": "title-string" },null
-        ],
-        'aoColumnDefs': [
+        "aoColumnDefs": [
+            { "sType": "title-string", "aTargets" : [ "title-string" ] },
+            { "sType": "title-numeric", "aTargets" : [ "title-numeric" ] },
             { 'aTargets': [-1], 'bSortable': false }
         ]
     }));
@@ -97,13 +96,13 @@ $(document).ready(function() {
                                 <tr>
                                     <th>No.</th>
                                     <th>Name</th>
-                                    <th>Item count</th>
-                                    <th>Biblio count</th>
+                                    <th class="title-numeric">Item count</th>
+                                    <th class="title-numeric">Biblio count</th>
                                     <th>Items expected</th>
                                     <th>Created by</th>
-                                    <th>Date</th>
+                                    <th class="title-string">Date</th>
                                     <th>Basket group</th>
-                                    <th>Closed</th>
+                                    <th class="title-string">Closed</th>
                                     <th>&nbsp;</th>
                                 </tr>
                             </thead>
@@ -117,16 +116,18 @@ $(document).ready(function() {
                                         <td>[% basket.basketno %]</td>
                                         <td>[% basket.basketname %]</td>
                                         <td>
-                                            [% basket.total_items %]
-                                            [% IF basket.total_items_cancelled %]
-                                                ([% basket.total_items_cancelled %] cancelled)
-                                            [% END %]
+                                            <span title="[% basket.total_items %]">[% basket.total_items %]
+                                                [% IF basket.total_items_cancelled %]
+                                                    ([% basket.total_items_cancelled %] cancelled)
+                                                [% END %]
+                                            </span>
                                         </td>
                                         <td>
-                                            [% basket.total_biblios %]
-                                            [% IF basket.total_biblios_cancelled %]
-                                                ([% basket.total_biblios_cancelled %] cancelled)
-                                            [% END %]
+                                            <span title="[% basket.total_biblios %]">[% basket.total_biblios %]
+                                                [% IF basket.total_biblios_cancelled %]
+                                                    ([% basket.total_biblios_cancelled %] cancelled)
+                                                [% END %]
+                                            </span>
                                         </td>
                                         <td>[% basket.expected_items %]</td>
                                         <td>
@@ -140,7 +141,7 @@ $(document).ready(function() {
                                             [% IF basketgroup.closed %]
                                               [% basketgroup.name %] (closed)
                                             [% ELSE %]
-                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&booksellerid=[% basket.booksellerid %]&basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
+                                              <a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% basket.booksellerid %]&amp;basketgroupid=[% basketgroup.id %]">[% basketgroup.name %]</a>
                                             [% END %]
                                           [% END %]
                                         </td>
-- 
2.39.5