From 8c05c619a79bdcbf29d461c0ae890f22f268b856 Mon Sep 17 00:00:00 2001 From: pines Date: Sat, 2 Sep 2006 18:54:26 +0000 Subject: [PATCH] trim the columns for copy status git-svn-id: svn://svn.open-ils.org/ILS/trunk@5865 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../staff_client/server/circ/copy_status.js | 10 ++- Open-ILS/xul/staff_client/server/circ/util.js | 87 +++++++++++++++++-- 2 files changed, 86 insertions(+), 11 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.js b/Open-ILS/xul/staff_client/server/circ/copy_status.js index 7291cb0945..e894fbdc6c 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_status.js +++ b/Open-ILS/xul/staff_client/server/circ/copy_status.js @@ -20,12 +20,18 @@ circ.copy_status.prototype = { var columns = circ.util.columns( { 'barcode' : { 'hidden' : false }, - 'title' : { 'hidden' : false }, + //'title' : { 'hidden' : false }, 'location' : { 'hidden' : false }, 'call_number' : { 'hidden' : false }, 'status' : { 'hidden' : false }, 'alert_message' : { 'hidden' : false }, - } + 'due_date' : { 'hidden' : false }, + }, + { + 'except_these' : [ + 'checkin_time', 'checkin_time_full', 'route_to', 'message', 'uses', 'xact_finish', + ], + } ); JSAN.use('util.list'); obj.list = new util.list('copy_status_list'); diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 6e43c7eec2..c39df4253c 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -183,8 +183,18 @@ circ.util.offline_checkout_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; + } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } @@ -232,8 +242,18 @@ circ.util.offline_checkin_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; + } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } @@ -293,8 +313,18 @@ circ.util.offline_renew_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; + } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } @@ -348,8 +378,18 @@ circ.util.offline_inhouse_use_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; + } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } @@ -456,7 +496,7 @@ circ.util.columns = function(modify,params) { }, { 'persist' : 'hidden width ordinal', 'id' : 'checkin_time_full', 'label' : 'Checkin Timestamp', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.circ.checkin_time()' + 'primary' : false, 'hidden' : true, 'render' : 'my.circ ? my.circ.checkin_time() : (my.acp.circulations() ? my.acp.circulations()[0].checkin_time() : "")' }, { 'persist' : 'hidden width ordinal', 'id' : 'xact_start', 'label' : 'Checkout Date', 'flex' : 1, @@ -464,7 +504,7 @@ circ.util.columns = function(modify,params) { }, { 'persist' : 'hidden width ordinal', 'id' : 'checkin_time', 'label' : 'Checkin Date', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.circ.checkin_time().substr(0,10)' + 'primary' : false, 'hidden' : true, 'render' : 'my.circ ? my.circ.checkin_time().substr(0,10) : (my.acp.circulations() ? my.acp.circulations()[0].checkin_time().substr(0,10) : "")' }, { @@ -559,7 +599,16 @@ circ.util.columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; + } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; } } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); @@ -628,8 +677,18 @@ circ.util.transit_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; + } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } @@ -806,8 +865,18 @@ circ.util.hold_columns = function(modify,params) { var x = util.functional.find_list(c,function(d){return(d.id==params.just_these[i]);}); new_c.push( function(y){ return y; }( x ) ); } - return new_c; + c = new_c; + } + if (params.except_these) { + JSAN.use('util.functional'); + var new_c = []; + for (var i = 0; i < c.length; i++) { + var x = util.functional.find_list(params.except_these,function(d){return(d==c[i].id);}); + if (!x) new_c.push(c[i]); + } + c = new_c; } + } return c.sort( function(a,b) { if (a.label < b.label) return -1; if (a.label > b.label) return 1; return 0; } ); } -- 2.43.2