From 6893f0c1835d467b68fede3d9339265324f2d28b Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Tue, 7 May 2019 20:57:50 -0400
Subject: [PATCH] LP1821969 Patron Prefix and Suffix Display in Summary

Adds support for displaying the patron prefix, suffix, preferred prefix, and preferred suffix in the patron summary sidebar.

To test:
  1. Add a combination of prefixes, suffixes, preferred prefixes, and preferred suffixes to several patrons.
  2. Also add some other preferred information to some of these patrons.
  3. In the sidebar notice the lack of prefix information in both the patron's main heading and in the preferred name information.
  4. Apply the patch.
  5. In the sidebar the prefixes and suffixes are now displayed.

Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates/staff/circ/patron/index.tt2     | 6 ++++--
 Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index 259dae7019..6c0e794a8e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -98,10 +98,12 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
         <div class="flex-row">
           <div class="flex-cell"
           ng-class="{'patron-summary-alert' : hasAlerts()}">
-            [% l('[_1], [_2] [_3]', 
+            [% l('[_1] [_2], [_3] [_4] [_5]', 
+                '{{patron().prefix()}}',
                 '{{patron().family_name()}}',
                 '{{patron().first_given_name()}}',
-                '{{patron().second_given_name()}}') %]
+                '{{patron().second_given_name()}}',
+                '{{patron().suffix()}}') %]
                <span ng-if="patron().name_keywords()"> <a title="[% l('Name keywords: ') %]{{patron().name_keywords()}}" class="glyphicon glyphicon-tags"></a>
           </div>
 
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index 2ca150a112..8b39fe30fd 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -2,12 +2,14 @@
 <div ng-cloak class="patron-summary-grid-wrapper">
   <div ng-show="patron()" id="patron-summary-grid">
     <div class="row patron-summary-pref-name"
-      ng-if="patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name()">
+      ng-if="patron().pref_prefix() || patron().pref_family_name() || patron().pref_first_given_name() || patron().pref_second_given_name() || patron().pref_suffix()">
       <div class="col-md-12">
-        [% l('[_1], [_2] [_3] (Preferred)', 
+        [% l('[_1] [_2], [_3] [_4] [_5] (Preferred)', 
+          '{{patron().pref_prefix() || patron().prefix()}}',
           '{{patron().pref_family_name() || patron().family_name()}}',
           '{{patron().pref_first_given_name() || patron().first_given_name()}}',
-          '{{patron().pref_second_given_name()}}') 
+          '{{patron().pref_second_given_name()}}',
+          '{{patron().pref_suffix() || patron().suffix()}}')
         %]
       </div>
     </div>
-- 
2.11.0