From 26905b5dfa0e44c9d5ae2fe4b227767a6720e3cd Mon Sep 17 00:00:00 2001
From: Jeff Davis <jdavis@sitka.bclibraries.ca>
Date: Tue, 27 Apr 2021 11:25:50 -0700
Subject: [PATCH] LP#1924185: use preferred name before legal name in My
 Account

Signed-off-by: Jeff Davis <jdavis@sitka.bclibraries.ca>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
---
 .../templates-bootstrap/opac/myopac/prefs.tt2 | 28 +++++++++---------
 .../opac/parts/topnav_links.tt2               |  2 +-
 Open-ILS/src/templates/opac/myopac/prefs.tt2  | 29 ++++++++++---------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
index d0aa7645ef..bf9f1169a7 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/prefs.tt2
@@ -7,36 +7,36 @@
 <div id="acct_info_main">
     <table title="[% l('Account preference') %]" class='light_border table table-hover'>
         <tbody id='myopac_summary_tbody'>
+            [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
             <tr>
-                <td class='color_4 light_border'>[% l("Name") %]</td>
+                <td class='color_4 light_border'>[% l("Preferred Name") %]</td>
 
                 <td class='light_border'>[% l(
                     HUMAN_NAME_FORMAT,
-                    ctx.user.prefix,
-                    ctx.user.first_given_name,
-                    ctx.user.second_given_name,
-                    ctx.user.family_name,
-                    ctx.user.suffix
+                    ctx.user.pref_prefix,
+                    (ctx.user.pref_first_given_name || ctx.user.first_given_name),
+                    ctx.user.pref_second_given_name,
+                    (ctx.user.pref_family_name || ctx.user.family_name),
+                    ctx.user.pref_suffix
                 ) | html %]</td>
 
                 <td></td>
             </tr>
-             [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
+            [%  END %]
             <tr>
-                <td class='color_4 light_border'>[% l("Preferred Name") %]</td>
+                <td class='color_4 light_border'>[% l("Legal Name") %]</td>
 
                 <td class='light_border'>[% l(
                     HUMAN_NAME_FORMAT,
-                    ctx.user.pref_prefix,
-                    (ctx.user.pref_first_given_name || ctx.user.first_given_name),
-                    ctx.user.pref_second_given_name,
-                    (ctx.user.pref_family_name || ctx.user.family_name),
-                    ctx.user.pref_suffix
+                    ctx.user.prefix,
+                    ctx.user.first_given_name,
+                    ctx.user.second_given_name,
+                    ctx.user.family_name,
+                    ctx.user.suffix
                 ) | html %]</td>
 
                 <td></td>
             </tr>
-            [%  END %]
 
             <tr>
                 <td class='color_4 light_border'>[% l("Day Phone") %]</td>
diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
index 7d8745cd70..a33dd15d67 100755
--- a/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/parts/topnav_links.tt2
@@ -41,7 +41,7 @@
     <li><div class="dropdown-divider"></div></li>
      	<!--User-->
       	<li class="nav-item">
-        	<a class="nav-link disabled active mx-2" href="#">Hello, [%  l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) | html %]</a>
+        	<a class="nav-link disabled active mx-2" href="#">Hello, [%  l('[_1] [_2]', ctx.user.pref_first_given_name || ctx.user.first_given_name, ctx.user.pref_family_name || ctx.user.family_name) | html %]</a>
       	</li>
     	<!--Messages with sup tag for # of messages-->
       	<li class="nav-item">
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 94d93efaeb..683d36ca89 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -10,40 +10,41 @@
     <table width='70%' title="[% l('Account preference') %]"
         class='light_border data_grid'>
         <tbody id='myopac_summary_tbody'>
+            [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
             <tr>
                 <td width='30%'
-                    class='color_4 light_border'>[% l("Name") %]</td>
+                    class='color_4 light_border'>[% l("Preferred Name") %]</td>
 
                 <td class='light_border'>[% l(
                     HUMAN_NAME_FORMAT,
-                    ctx.user.prefix, 
-                    ctx.user.first_given_name,
-                    ctx.user.second_given_name, 
-                    ctx.user.family_name,
-                    ctx.user.suffix
+                    ctx.user.pref_prefix,
+                    (ctx.user.pref_first_given_name || ctx.user.first_given_name),
+                    ctx.user.pref_second_given_name,
+                    (ctx.user.pref_family_name || ctx.user.family_name),
+                    ctx.user.pref_suffix
                 ) | html %]</td>
 
                 <td></td>
                 <td></td>
             </tr>
-            [% IF ctx.user.pref_first_given_name || ctx.user.pref_second_given_name || ctx.user.pref_family_name %]
+            [%  END %]
+
             <tr>
                 <td width='30%'
-                    class='color_4 light_border'>[% l("Preferred Name") %]</td>
+                    class='color_4 light_border'>[% l("Legal Name") %]</td>
 
                 <td class='light_border'>[% l(
                     HUMAN_NAME_FORMAT,
-                    ctx.user.pref_prefix, 
-                    (ctx.user.pref_first_given_name || ctx.user.first_given_name),
-                    ctx.user.pref_second_given_name, 
-                    (ctx.user.pref_family_name || ctx.user.family_name),
-                    ctx.user.pref_suffix
+                    ctx.user.prefix,
+                    ctx.user.first_given_name,
+                    ctx.user.second_given_name,
+                    ctx.user.family_name,
+                    ctx.user.suffix
                 ) | html %]</td>
 
                 <td></td>
                 <td></td>
             </tr>
-            [%  END %]
 
             <tr>
                 <td class='color_4 light_border'>[% l("Day Phone") %]</td>
-- 
2.43.2