From 28219c0704fefa7db5248f70df1e7f1901ac0ca1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Oct 2014 17:06:41 -0400 Subject: [PATCH] kmain-315 - Sort patron messages in chronological order. NOTE: This solution uses javascript; kmain-319 asks for sort using fieldmapper. modified: openils/var/web/xul/rel_2_4_1/server/patron/standing_penalties.js (cherry picked from commit bb615f7e3b92df02d7430298f22109257e5cd4e7) Cross-port: e32ac57 --- .../server/patron/standing_penalties.js | 26 ++++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js index 7a1786f08b..15100f9aa8 100644 --- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.js +++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.js @@ -123,6 +123,10 @@ function populate_list() { rows = {}; list.clear(); + xulG.patron.standing_penalties().sort(function(a, b) { + return util.date.db_date2Date(a.set_date()).getTime() - + util.date.db_date2Date(b.set_date()).getTime() + }); for (var i = 0; i < xulG.patron.standing_penalties().length; i++) { var row_params = { 'row' : { @@ -409,6 +413,7 @@ function handle_archive_penalty(ev) { } function handle_retrieve_archived_penalties() { + archived_ausp = []; try { document.getElementById('archived_progress').hidden = false; archived_list.clear(); archived_rows = {}; @@ -432,6 +437,7 @@ function handle_retrieve_archived_penalties() { { async : true, streaming : true, +// order_by : {'ausp':'set date DESC'}, onerror : function(r) { try { var res = openils.Util.readResponse(r,true); @@ -442,20 +448,26 @@ function handle_retrieve_archived_penalties() { }, oncomplete : function() { document.getElementById('archived_progress').hidden = true; - }, - onresponse : function(r) { - try { - var my_ausp = openils.Util.readResponse(r); + archived_ausp.sort(function (a, b) { + return a.set_date() > b.set_date(); + }); + for (var i = 0; i < archived_ausp.length; i++) { var row_params = { 'row' : { 'my' : { - 'ausp' : my_ausp, - 'csp' : my_ausp.standing_penalty(), + 'ausp' : archived_ausp[i], + 'csp' : archived_ausp[i].standing_penalty(), 'au' : xulG.patron, } } }; - archived_rows[ my_ausp.id() ] = archived_list.append( row_params ); + archived_rows[ archived_ausp[i].id() ] = archived_list.append( row_params ); + }; + }, + onresponse : function(r) { + try { + var my_ausp = openils.Util.readResponse(r); + archived_ausp.push(my_ausp); } catch(E) { error.standard_unexpected_error_alert(patronStrings.getString('staff.patron.standing_penalty.retrieve_error'),E); } -- 2.11.0