From 370e4d47de9f37a41e48a4205e950af74bfc4a59 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Mon, 28 Jan 2013 14:37:42 -0500
Subject: [PATCH] Bug 9456 [Alternate] Add callnumber column to the cart -
 Followup - Sort by callnumbers

This patch removes the sub-tables for callnumber/location, and simply
surrounds them with a span tag. Sorting is enabled on the 'Items' column
which uses a custom sorting routine to sort the callnumbers. If the sort
is ascending, each column will be sorted by the highest ordered callnumber
for that row. Likewise, if the sort is descending the table will be sorted
by the lowest valued callnumber for that row.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   67 +++++++++++++-------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index c94d049..90e4acc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -91,18 +91,51 @@ function placeHold () {
         $(".hold").text(_("Place Hold"));
         $("#downloadcartc").empty();
         yuiToolbar();
+
+        /* Define two custom functions (asc and desc) for string sorting */
+        jQuery.fn.dataTableExt.oSort['callnumbers-asc']  = function(x,y) {
+                var x_array = x.split("<span>");
+                var y_array = y.split("<span>");
+
+                /* Pop the first elements, they are empty strings */
+                x_array.shift();
+                y_array.shift();
+
+                x_array.sort();
+                y_array.sort();
+
+                x = x_array.shift();
+                y = y_array.shift();
+
+                return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+        };
+
+        jQuery.fn.dataTableExt.oSort['callnumbers-desc'] = function(x,y) {
+                var x_array = x.split("<span>");
+                var y_array = y.split("<span>");
+
+                /* Pop the first elements, they are empty strings */
+                x_array.shift();
+                y_array.shift();
+
+                x_array.sort();
+                y_array.sort();
+
+                x = x_array.pop();
+                y = y_array.pop();
+
+                return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+        };
+
         $("#itemst").dataTable($.extend(true, {}, dataTablesDefaults, {
             "sDom": 't',
             "aoColumnDefs": [
-                { "aTargets": [ 0,3 ], "bSortable": false, "bSearchable": false },
+                { "aTargets": [ 0 ], "bSortable": false, "bSearchable": false },
+                { "aTargets": [ 3 ], "sType": 'callnumbers' },
             ],
             "aaSorting": [[ 1, "asc" ]],
             "bPaginate": false
         }));
-        $(".itemstable").dataTable($.extend(true, {}, dataTablesDefaults, {
-            "sDom": 't',
-            "bPaginate": false
-        }));
 
 	});
 
@@ -383,26 +416,14 @@ function yuiToolbar() {
 
 						</td>
             <td>[% BIBLIO_RESULT.description %]</td>
-            <td>[% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %]
-                <table class="itemstable">
-                <thead>
-                    <th>Location</th>
-                    <th>Call number</th>
-                </thead>
-                <tbody>
+            <td>
+                [% IF ( BIBLIO_RESULT.ITEM_RESULTS ) %]
                     [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
-                        <tr>
-                            <td>[% ITEM_RESULT.branchname %] <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span></td>
-                            <td>
-                                [% IF ( ITEM_RESULT.itemcallnumber ) %]
-                                    ([% ITEM_RESULT.itemcallnumber %])
-                                [% END %]
-                            </td>
-                        </tr>
+                        <span>[% ITEM_RESULT.itemcallnumber %] [% ITEM_RESULT.branchname %] <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span></span>
                     [% END %]
-                </tbody>
-                </table>
-                [% ELSE %]This record has no items.[% END %]
+                [% ELSE %]
+                    This record has no items.
+                [% END %]
             </td>
             </tr>
         [% END %]
-- 
1.7.10.4