From 19d66fb1cb3920db8642d5034dcda7568d20e483 Mon Sep 17 00:00:00 2001 From: phasefx Date: Mon, 31 Jul 2006 16:28:38 +0000 Subject: [PATCH] async printing git-svn-id: svn://svn.open-ils.org/ILS/trunk@5185 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/holds.js | 106 ++++++++++++----------- Open-ILS/xul/staff_client/server/patron/items.js | 41 +++++---- 2 files changed, 81 insertions(+), 66 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js index 21e2b68c55..16c8a95269 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.js +++ b/Open-ILS/xul/staff_client/server/patron/holds.js @@ -5,7 +5,7 @@ patron.holds = function (params) { JSAN.use('util.error'); this.error = new util.error(); JSAN.use('util.network'); this.network = new util.network(); - this.OpenILS = {}; JSAN.use('OpenILS.data'); this.OpenILS.data = new OpenILS.data(); this.OpenILS.data.init({'via':'stash'}); + JSAN.use('OpenILS.data'); this.data = new OpenILS.data(); this.data.init({'via':'stash'}); } patron.holds.prototype = { @@ -113,27 +113,33 @@ patron.holds.prototype = { 'cmd_holds_print' : [ ['command'], function() { - dump(js2JSON(obj.list.dump()) + '\n'); try { - JSAN.use('patron.util'); - var params = { - 'patron' : patron.util.retrieve_au_via_id(ses(),obj.patron_id), - 'lib' : obj.OpenILS.data.hash.aou[ obj.OpenILS.data.list.au[0].ws_ou() ], - 'staff' : obj.OpenILS.data.list.au[0], - 'header' : obj.OpenILS.data.print_list_templates.holds.header, - 'line_item' : obj.OpenILS.data.print_list_templates.holds.line_item, - 'footer' : obj.OpenILS.data.print_list_templates.holds.footer, - 'type' : obj.OpenILS.data.print_list_templates.holds.type, - 'list' : obj.list.dump(), - }; - JSAN.use('util.print'); var print = new util.print(); - print.tree_list( params ); + dump(js2JSON(obj.list.dump()) + '\n'); + function flesh_callback() { + try { + JSAN.use('patron.util'); + var params = { + 'patron' : patron.util.retrieve_au_via_id(ses(),obj.patron_id), + 'lib' : obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ], + 'staff' : obj.data.list.au[0], + 'header' : obj.data.print_list_templates.holds.header, + 'line_item' : obj.data.print_list_templates.holds.line_item, + 'footer' : obj.data.print_list_templates.holds.footer, + 'type' : obj.data.print_list_templates.holds.type, + 'list' : obj.list.dump(), + }; + JSAN.use('util.print'); var print = new util.print(); + print.tree_list( params ); + setTimeout(function(){obj.list.on_all_fleshed = null;},0); + } catch(E) { + obj.error.standard_unexpected_error_alert('print 2',E); + } + } + obj.list.on_all_fleshed = flesh_callback; + obj.list.full_retrieve(); } catch(E) { - this.error.sdump('D_ERROR','preview: ' + E); - alert('preview: ' + E); + obj.error.standard_unexpected_error_alert('print 1',E); } - - } ], 'cmd_show_notifications' : [ @@ -160,10 +166,10 @@ patron.holds.prototype = { function() { try { JSAN.use('util.widgets'); JSAN.use('util.functional'); - var ws_type = obj.OpenILS.data.hash.aout[ obj.OpenILS.data.hash.aou[ obj.OpenILS.data.list.au[0].ws_ou() ].ou_type() ]; + var ws_type = obj.data.hash.aout[ obj.data.hash.aou[ obj.data.list.au[0].ws_ou() ].ou_type() ]; var list = util.functional.map_list( util.functional.filter_list( - obj.OpenILS.data.list.aout, + obj.data.list.aout, function(o) { if (o.depth() > ws_type.depth()) return false; if (o.depth() < ws_type.depth()) return true; @@ -179,7 +185,7 @@ patron.holds.prototype = { ]; } ); - ml = util.widgets.make_menulist( list, obj.OpenILS.data.list.au[0].ws_ou() ); + ml = util.widgets.make_menulist( list, obj.data.list.au[0].ws_ou() ); ml.setAttribute('id','selection'); ml.setAttribute('name','fancy_data'); var xml = ''; @@ -190,8 +196,8 @@ patron.holds.prototype = { bot_xml += '