From 2571c8a1596d07e2ad34342ea519d7f782ec3538 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Wed, 19 Jan 2022 21:25:03 +0000
Subject: [PATCH] lp1904036-patron-edit-angular-screenreader-tweaks

- Add additional screen-reader only toolbar to bottom of Patron Edit page

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
---
 .../src/app/staff/circ/patron/edit-toolbar.component.html  | 14 +++++++-------
 .../src/app/staff/circ/patron/edit-toolbar.component.ts    |  3 ++-
 .../eg2/src/app/staff/circ/patron/patron.component.html    |  6 ++++++
 .../eg2/src/app/staff/circ/patron/register.component.html  |  2 ++
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.html
index 3afbadab58..dee0859458 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.html
@@ -1,6 +1,6 @@
 <div class="row pb-2 pt-2">
 
-  <div class="col-lg-6">
+  <div class="col-lg-6" *ngIf="!screenReaderMode">
     <span class="font-weight-bold" i18n>Show:</span>
     <button class="btn btn-sm btn-outline-dark ml-2" 
       [disabled]="visibilityLevel == 2"
@@ -13,19 +13,19 @@
       (click)="changeFields(0)" i18n>All Fields</button>
   </div>
 
-  <div class="col-lg-6 d-flex">
+  <div class="col-lg-6 d-flex" [ngClass]="{'sr-only': screenReaderMode}">
     <div class="ml-auto">
-      <button class="btn btn-outline-dark"
+      <button class="btn btn-outline-dark" aria-label="Print"
         (click)="printClicked.emit()" i18n>Print</button>
       <button class="btn btn-outline-dark ml-2" [disabled]="disableSave"
-        (click)="saveClicked.emit()" i18n>Save</button>
+        (click)="saveClicked.emit()" aria-label="Save" i18n>Save</button>
       <button class="btn btn-outline-dark ml-2" [disabled]="disableSave"
-        (click)="saveCloneClicked.emit()" i18n>Save &amp; Clone</button>
+        (click)="saveCloneClicked.emit()" aria-label="Save and Clone" i18n>Save &amp; Clone</button>
     </div>
   </div>
 </div>
 
-<div class="row pb-1 pt-1" *ngIf="addressAlerts.length > 0">
+<div class="row pb-1 pt-1" *ngIf="addressAlerts.length > 0 && !screenReaderMode">
   <div class="col-lg-12 d-flex">
     <div class="ml-auto mr-2">
       <div *ngFor="let alert of addressAlerts"
@@ -36,7 +36,7 @@
   </div>
 </div>
 
-<div class="row pb-1 pt-1" *ngIf="dupesFound().length > 0">
+<div class="row pb-1 pt-1" *ngIf="dupesFound().length > 0 && !screenReaderMode">
   <div class="col-lg-12 d-flex">
     <div class="ml-auto mr-2">
       <div *ngFor="let dupe of dupesFound()"
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
index a72cf7d68c..87c27fe794 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit-toolbar.component.ts
@@ -30,6 +30,7 @@ interface DupeSearch {
 export class EditToolbarComponent implements OnInit {
 
     @Input() patronId: number;
+    @Input() screenReaderMode: boolean = false
 
     disableSave = false;
     visibilityLevel: VisibilityLevel = VisibilityLevel.ALL_FIELDS;
@@ -42,7 +43,7 @@ export class EditToolbarComponent implements OnInit {
 
     searches: {[category: string]: DupeSearch} = {};
     addressAlerts: IdlObject[] = [];
-
+    
     constructor(
         private org: OrgService,
         private idl: IdlService,
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 823af65181..60fc5ec0c0 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
@@ -149,6 +149,11 @@
           <ng-template ngbNavContent>
             <eg-patron-edit #patronEditor [patronId]="patronId" [toolbar]="editorToolbar">
             </eg-patron-edit> 
+            
+            <ng-container *ngIf="patronTab === 'edit'">
+              <eg-patron-edit-toolbar #srToolbar [patronId]="patronId" [screenReaderMode]="true" >
+              </eg-patron-edit-toolbar>
+            </ng-container>
           </ng-template>
         </li>
 
@@ -248,6 +253,7 @@
     <div *ngIf="!loading" class="pt-3">
       <div [ngbNavOutlet]="patronNav"></div>
     </div>
+    
   </div>
 </div>
 
diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/register.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/register.component.html
index 57f3229157..0d1effbf25 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/register.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/register.component.html
@@ -11,3 +11,5 @@
   [cloneId]="cloneId" [toolbar]="editorToolbar">
 </eg-patron-edit>
 
+<eg-patron-edit-toolbar #srToolbar [screenReaderMode]="true" >
+</eg-patron-edit-toolbar>
\ No newline at end of file
-- 
2.11.0