From 84ec8ba23f8b8960b1acf63dd09ba35da383813f Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 17 Aug 2021 16:56:14 -0400
Subject: [PATCH] LP1904036 Patron UI shows pref name for summary/banner

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../src/eg2/src/app/staff/circ/patron/edit.component.ts    |  4 +++-
 .../eg2/src/app/staff/circ/patron/patron.component.html    |  6 +++---
 .../eg2/src/app/staff/share/patron/summary.component.html  | 14 --------------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
index 64c25313f7..c95260d707 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.ts
@@ -813,7 +813,9 @@ export class EditComponent implements OnInit, AfterViewInit {
                 && !this.groupEditForbidden()
             );
 
-            this.toolbar.disableSaveStateChanged.emit(!canSave);
+            if (this.toolbar) {
+                this.toolbar.disableSaveStateChanged.emit(!canSave);
+            }
         });
     }
 
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
index 9dfc6b3ef0..823af65181 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/patron.component.html
@@ -43,9 +43,9 @@
 
 <ng-container *ngIf="context.summary">
   <eg-staff-banner i18n-bannerText bannerText="Patron: 
-    {{context.summary.patron.family_name()}}, 
-    {{context.summary.patron.first_given_name()}} 
-    {{context.summary.patron.second_given_name()}}">
+    {{patronService.namePart(context.summary.patron, 'family_name')}}, 
+    {{patronService.namePart(context.summary.patron, 'first_given_name')}} 
+    {{patronService.namePart(context.summary.patron, 'second_given_name')}}">
   </eg-staff-banner>
 </ng-container>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html
index e127bc260b..3746f9f610 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.html
@@ -4,25 +4,11 @@
   <div class="row d-flex patron-status-color rounded {{patronStatusColor()}}">
     <div class="flex-1 pt-1 {{patronStatusColor()}}">
       <h4 class="font-weight-bold" i18n>
-        {{p().family_name()}}, 
-        {{p().first_given_name()}} 
-        {{p().second_given_name()}}
-      </h4>
-    </div>
-    <ng-container *ngIf="hasPrefName()">
-      <div class="mr-2 ml-2 text-info font-italic" i18n>account</div>
-    </ng-container>
-  </div>
-
-  <div class="row d-flex border-top" *ngIf="hasPrefName()">
-    <div class="flex-1 pt-1">
-      <h4 class="font-weight-bold" i18n>
         {{patronService.namePart(p(), 'family_name')}}, 
         {{patronService.namePart(p(), 'first_given_name')}} 
         {{patronService.namePart(p(), 'second_given_name')}}
       </h4>
     </div>
-    <div class="mr-2 ml-2 text-info font-italic" i18n>preferred</div>
   </div>
 
   <div class="row mb-1 alert alert-danger p-0" 
-- 
2.11.0