display prefix/suffix with names.. should probably refactor this into some utility...

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0_3@7083 dcc99617-32d9-48b4-a31d-7c20da2025e4

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 2938fc0..6c452a8 100644 (file)
--- 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 e609939..3d70921 100644 (file)
--- 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 ead44d6..df2ca9f 100644 (file)
--- 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 a7fd595..7fb7e11 100644 (file)
--- 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 56c1b82..d06cc67 100644 (file)
--- 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 20b2723..285f218 100644 (file)
--- 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(
                                                                                '<hr/>'
-                                                                               + '<p>Pertaining to ' + patron_obj.family_name() + ', ' + patron_obj.first_given_name() + ' ' + patron_obj.second_given_name() + ' : ' 
+                                                                               + '<p>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() + '</p>'
                                                                                + '<p><b>"' 
                                                                                + g.notes[id].title() + '"</b> 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 3329499..2b6a5c5 100644 (file)
--- 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'});