From bbd9afc9d8dcacdd89a529fd9adfe077946e02f7 Mon Sep 17 00:00:00 2001 From: phasefx Date: Tue, 15 Aug 2006 19:55:28 +0000 Subject: [PATCH] layout tweaks git-svn-id: svn://svn.open-ils.org/ILS/trunk@5524 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../xul/staff_client/server/cat/copy_summary.xul | 123 +++++---------------- .../xul/staff_client/server/circ/copy_details.xul | 28 +++-- 2 files changed, 46 insertions(+), 105 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul index 6d6caaddbd..a77271cddc 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul +++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul @@ -58,47 +58,38 @@ $('caption').setAttribute('tooltiptext','Copy ID = ' + (copy_id || copy.id() ) ); + JSAN.use('circ.util'); + var columns = circ.util.columns( + { + 'barcode' : { 'hidden' : false }, + 'location' : { 'hidden' : false }, + 'owning_lib' : { 'hidden' : false }, + 'circ_lib' : { 'hidden' : false }, + 'call_number' : { 'hidden' : false }, + 'status' : { 'hidden' : false }, + 'alert_message' : { 'hidden' : false }, + } + ).concat( + { + 'id' : 'total_circs', 'label' : 'Total Circs', 'flex' : 1, + 'primary' : false, 'hidden' : false, 'persist' : 'hidden width ordinal', + 'render' : 'obj.network.simple_request("FM_CIRC_COUNT_RETRIEVE_VIA_COPY",[ my.acp.id() ]).total.count' + } + ); + + JSAN.use('util.list'); g.list = new util.list('item_summary_list'); + g.list.init( + { + 'columns' : columns, + 'map_row_to_column' : circ.util.std_map_row_to_column(), + } + ); + function acp_callback(req) { try { var copy = req.getResultObject(); if (typeof copy.ilsevent != 'undefined') throw(copy); - g.network.simple_request( - 'FM_ACN_RETRIEVE', - [ copy.call_number() ], - function (rreq) { - try { - $w('barcode',copy.barcode()); - $w('ref',get_bool(copy.ref()) ? 'Yes' : 'No'); - $w('opac_visible',get_bool(copy.opac_visible()) ? 'Yes' : 'No'); - $w('circulate',get_bool(copy.circulate()) ? 'Yes' : 'No'); - $w('holdable',get_bool(copy.holdable()) ? 'Yes' : 'No'); - $w('age_protect',copy.age_protect() == null ? '' : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) ); - $w('location',typeof copy.location() == 'object' ? copy.location().name() : g.data.lookup('acpl',copy.location()).name() ); - $w('create_date',util.date.formatted_date(copy.create_date(),'%F')); - $w('edit_date',util.date.formatted_date(copy.edit_date(),'%F')); - $w('status',typeof copy.status() == 'object' ? copy.status().name() : g.data.hash.ccs[ copy.status() ].name() ); - } catch(E) { - g.error.standard_unexpected_error_alert('rendering copy',E); - } - try { - var cn = rreq.getResultObject(); - if (typeof cn.ilsevent != 'undefined') { - switch(cn.ilsevent) { - case 1508 /* ASSET_CALL_NUMBER_NOT_FOUND */ : - $w('callnumber','Not Cataloged'); - break; - default: - throw(cn); - break; - } - } else { - $w('callnumber',cn.label()); - } - } catch(E) { - g.error.standard_unexpected_error_alert('retrieving volume',E); - } - } - ); + g.list.append({'row':{'my':{'acp':copy}}}); } catch(E) { g.error.standard_unexpected_error_alert('retrieving copy',E); } @@ -108,19 +99,8 @@ g.network.simple_request( 'FM_ACP_RETRIEVE', [ copy_id ], acp_callback); } else { acp_callback( { 'getResultObject' : function() { return copy; } } ); - copy_id = copy.id(); } - g.network.simple_request('FM_CIRC_COUNT_RETRIEVE_VIA_COPY',[ copy_id ],function(req) { - try { - var robj = req.getResultObject(); - if (typeof robj.ilsevent != 'undefined') throw(robj); - $w('total_circs',robj.total.count); - } catch(E) { - g.error.standard_unexpected_error_alert('retrieving circ total',E); - } - }); - } catch(E) { var err_msg = "!! This software has encountered an error. Please tell your friendly " + "system administrator or software developer the following:\ncat/copy_summary.xul\n" + E + '\n'; @@ -132,52 +112,9 @@ ]]> - + - - - - - - - - - - - - - - - - - - - - + diff --git a/Open-ILS/xul/staff_client/server/circ/copy_details.xul b/Open-ILS/xul/staff_client/server/circ/copy_details.xul index 2e6b68e3f8..9b30f53305 100644 --- a/Open-ILS/xul/staff_client/server/circ/copy_details.xul +++ b/Open-ILS/xul/staff_client/server/circ/copy_details.xul @@ -66,7 +66,7 @@ if (typeof g.callnumber.ilsevent != 'undefined') throw(g.callnumber); $('top').setAttribute('src',urls.XUL_BIB_BRIEF + '?docid=' + g.callnumber.record()); - g.data.temp_copy = g.copy; g.data.stash('temp_copy'); $('mid').setAttribute('src',urls.XUL_COPY_SUMMARY); + g.data.temp_copy = g.copy; g.data.stash('temp_copy'); $('item_summary').setAttribute('src',urls.XUL_COPY_SUMMARY); $('r_last').disabled = true; if (g.circ) { @@ -155,25 +155,29 @@ -