From 75b5b1920eb23696b00ca2ffa0e0f779e2cca3e0 Mon Sep 17 00:00:00 2001 From: pines Date: Tue, 20 Mar 2007 00:55:48 +0000 Subject: [PATCH] display prefix/suffix with names.. should probably refactor this into some utility code git-svn-id: svn://svn.open-ils.org/ILS/trunk@7083 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/xul/staff_client/server/patron/bill_details.xul | 9 ++++++++- Open-ILS/xul/staff_client/server/patron/bill_history.xul | 9 ++++++++- Open-ILS/xul/staff_client/server/patron/bill_wizard.xul | 9 ++++++++- Open-ILS/xul/staff_client/server/patron/display.js | 7 +++++-- Open-ILS/xul/staff_client/server/patron/hold_notices.xul | 9 ++++++++- Open-ILS/xul/staff_client/server/patron/info_notes.xul | 8 +++++++- Open-ILS/xul/staff_client/server/patron/summary.js | 7 +++++-- 7 files changed, 49 insertions(+), 9 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul index 2938fc06a5..6c452a80da 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul @@ -43,7 +43,14 @@ JSAN.use('patron.util'); g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id ); - $('patron_name').setAttribute('value', g.au_obj.family_name() + ', ' + g.au_obj.first_given_name() + ' : ' + g.au_obj.card().barcode() ); + $('patron_name').setAttribute('value', + ( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + + g.au_obj.family_name() + ', ' + + g.au_obj.first_given_name() + ' ' + + ( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ': '' ) + + ( g.au_obj.suffix() ? g.au_obj.suffix() : '') + + ' : ' + g.au_obj.card().barcode() + ); } } diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul index e609939548..3d70921330 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul @@ -43,7 +43,14 @@ JSAN.use('patron.util'); g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id ); - $('patron_name').setAttribute('value', g.au_obj.family_name() + ', ' + g.au_obj.first_given_name() + ' : ' + g.au_obj.card().barcode() ); + $('patron_name').setAttribute('value', + ( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + + g.au_obj.family_name() + ', ' + + g.au_obj.first_given_name() + ' ' + + ( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ' : '' ) + + ( g.au_obj.suffix() ? g.au_obj.suffix() : '') + + ' : ' + g.au_obj.card().barcode() + ); } } diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul index ead44d6950..df2ca9f498 100644 --- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul +++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul @@ -108,7 +108,14 @@ JSAN.use('patron.util'); g.au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.patron_id ); - $('patron_name').setAttribute('value', g.au_obj.family_name() + ', ' + g.au_obj.first_given_name() + ' : ' + g.au_obj.card().barcode() ); + $('patron_name').setAttribute('value', + ( g.au_obj.prefix() ? g.au_obj.prefix() + ' ' : '') + + g.au_obj.family_name() + ', ' + + g.au_obj.first_given_name() + ' ' + + ( g.au_obj.second_given_name() ? g.au_obj.second_given_name() + ' ' : '' ) + + ( g.au_obj.suffix() ? g.au_obj.suffix() : '') + + ' : ' + g.au_obj.card().barcode() + ); } } diff --git a/Open-ILS/xul/staff_client/server/patron/display.js b/Open-ILS/xul/staff_client/server/patron/display.js index a7fd595f89..7fb7e11c04 100644 --- a/Open-ILS/xul/staff_client/server/patron/display.js +++ b/Open-ILS/xul/staff_client/server/patron/display.js @@ -301,8 +301,11 @@ patron.display.prototype = { function(e) { return function() { e.setAttribute('value', - obj.patron.family_name() + ', ' + obj.patron.first_given_name() + ' ' + - ( obj.patron.second_given_name() ? obj.patron.second_given_name() : '' ) + ( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + + obj.patron.family_name() + ', ' + + obj.patron.first_given_name() + ' ' + + ( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) + + ( obj.patron.suffix() ? obj.patron.suffix() : '') ); JSAN.use('patron.util'); patron.util.set_penalty_css(obj.patron); }; diff --git a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul index 56c1b829eb..d06cc6706a 100644 --- a/Open-ILS/xul/staff_client/server/patron/hold_notices.xul +++ b/Open-ILS/xul/staff_client/server/patron/hold_notices.xul @@ -72,7 +72,14 @@ JSAN.use('patron.util'); var au_obj = patron.util.retrieve_fleshed_au_via_id( ses(), g.ahr.usr() ); - $('patron_name').setAttribute('value', au_obj.family_name() + ', ' + au_obj.first_given_name() + ' : ' + au_obj.card().barcode() ); + $('patron_name').setAttribute('value', + ( au_obj.prefix() ? au_obj.prefix() + ' ' : '') + + au_obj.family_name() + ', ' + + au_obj.first_given_name() + ' ' + + ( au_obj.second_given_name() ? au_obj.second_given_name() + ' ' : '' ) + + ( au_obj.suffix() ? au_obj.suffix() : '') + + ' : ' + au_obj.card().barcode() + ); } } diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul index 20b2723328..285f218b31 100644 --- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul +++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul @@ -136,7 +136,13 @@ JSAN.use('util.print'); var p = new util.print(); p.simple( '
' - + '

Pertaining to ' + patron_obj.family_name() + ', ' + patron_obj.first_given_name() + ' ' + patron_obj.second_given_name() + ' : ' + + '

Pertaining to ' + + ( patron_obj.prefix() ? patron_obj.prefix() + ' ' : '') + + patron_obj.family_name() + ', ' + + patron_obj.first_given_name() + ' ' + + ( patron_obj.second_given_name() ? patron_obj.second_given_name() + ' ' : '' ) + + ( patron_obj.suffix() ? patron_obj.suffix() : '') + + ' : ' + patron_obj.card().barcode() + '

' + '

"' + g.notes[id].title() + '" created on ' + g.notes[id].create_date().toString().substr(0,10) diff --git a/Open-ILS/xul/staff_client/server/patron/summary.js b/Open-ILS/xul/staff_client/server/patron/summary.js index 3329499b65..2b6a5c583b 100644 --- a/Open-ILS/xul/staff_client/server/patron/summary.js +++ b/Open-ILS/xul/staff_client/server/patron/summary.js @@ -587,8 +587,11 @@ patron.summary.prototype = { obj.patron = robj; JSAN.use('patron.util'); document.getElementById('patron_name').setAttribute('value', - obj.patron.family_name() + ', ' + obj.patron.first_given_name() + ' ' + - ( obj.patron.second_given_name() ? obj.patron.second_given_name() : '' ) + ( obj.patron.prefix() ? obj.patron.prefix() + ' ' : '') + + obj.patron.family_name() + ', ' + + obj.patron.first_given_name() + ' ' + + ( obj.patron.second_given_name() ? obj.patron.second_given_name() + ' ' : '' ) + + ( obj.patron.suffix() ? obj.patron.suffix() : '') ); patron.util.set_penalty_css(obj.patron); JSAN.use('OpenILS.data'); var data = new OpenILS.data(); data.init({'via':'stash'}); -- 2.43.2