LP1904036 Remove refs to deprecated alert_message field

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/alerts.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/alerts.component.html
index 6c88fba..559a310 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/alerts.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/alerts.component.html
@@ -31,16 +31,6 @@
     Patron account has invalid addresses.
   </div>
 
-  <!-- alert message -->
-  <div class="row" *ngIf="alerts().alertMessage">
-    <div class="col-lg-6 offset-lg-3">
-      <div class="card">
-        <div class="card-header" i18n>Alert Message</div>
-        <div class="card-body">{{alerts().alertMessage}}</div>
-      </div>
-    </div>
-  </div>
-
   <!-- penalties -->
   <div class="row" *ngIf="alerts().alertPenalties.length">
     <div class="col-lg-12">

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
index a557004..ef3af6b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/edit.component.html
@@ -473,24 +473,6 @@
     {args: {template: fieldInput, field: 'claims_never_checked_out_count', type: 'number'}}">
   </ng-container>
 
-  <div class="row pt-1 pb-1 mt-1" *ngIf="showField('au.alert_message')">
-    <ng-container 
-      *ngTemplateOutlet="fieldLabel; context: {args: {field: 'alert_message'}}">
-    </ng-container>
-    <div class="col-lg-3">
-      <textarea
-        class="form-control" 
-        name="au-alert_message-input"
-        id="au-alert_message-input"
-        [ngModel]="objectFromPath(null, null)['alert_message']()"
-        (ngModelChange)="fieldValueChange(null, null, 'alert_message', $event)"
-        (change)="afterFieldChange(null, null, 'alert_message')"
-        [required]="fieldRequired('au.alert_message')"
-        [pattern]="fieldPattern('au', 'alert_message')">
-      </textarea>
-    </div>
-  </div>
-
   <div class="alert alert-success pt-2 pb-2 mt-3 mb-3 d-flex">
     <div class="m-auto font-weight-bold" i18n>User Settings</div>
   </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts
index 26d3d13..7846f9e 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/patron.service.ts
@@ -40,7 +40,6 @@ export class PatronAlerts {
     patronInactive = false;
     retrievedWithInactive = false;
     invalidAddress = false;
-    alertMessage: string = null;
     alertPenalties: IdlObject[] = [];
 
     hasAlerts(): boolean {
@@ -52,7 +51,6 @@ export class PatronAlerts {
             this.patronInactive ||
             this.retrievedWithInactive ||
             this.invalidAddress ||
-            this.alertMessage !== null ||
             this.alertPenalties.length > 0
         );
     }
@@ -339,7 +337,6 @@ export class PatronService {
         alerts.patronInactive = patron.active() === 'f';
         alerts.invalidAddress = patron.addresses()
             .filter(a => a.valid() === 'f').length > 0;
-        alerts.alertMessage = patron.alert_message();
         alerts.alertPenalties = patron.standing_penalties()
             .filter(p => p.standing_penalty().staff_alert() === 't');
 

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
index 52500e1..45a4f9d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/search.component.html
@@ -183,7 +183,8 @@
 </div>
 
 <ng-template #barcodeTemplate let-r="row">
-  <a routerLink="/staff/circ/patron/{{r.id()}}/checkout">{{r.card().barcode()}}</a>
+  <a *ngIf="r.card()"
+    routerLink="/staff/circ/patron/{{r.id()}}/checkout">{{r.card().barcode()}}</a>
 </ng-template>
 <ng-template #familyNameTemplate let-r="row">
   <a routerLink="/staff/circ/patron/{{r.id()}}/checkout">{{r.family_name()}}</a>

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 de65732..238c688 100644 (file)
--- 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
@@ -24,10 +24,6 @@
     </div>
   </div>
 
-  <div class="row mb-1 alert alert-danger p-0" *ngIf="p().alert_message()">
-    <div class="col-lg-12" i18n>{{p().alert_message()}}</div>
-  </div>
-
   <div class="row mb-1 alert alert-danger p-0" 
     *ngFor="let pen of summary.alerts.alertPenalties">
     <div class="col-lg-9"

diff --git a/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts
index 242c000..48cad1c 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/patron/summary.component.ts
@@ -138,10 +138,6 @@ export class PatronSummaryComponent implements OnInit {
             return 'MULTIPLE_PENALTIES';
         }
 
-        if (patron.alert_message()) {
-            return 'PATRON_HAS_ALERT';
-        }
-
         if (patron.juvenile() === 't') {
             return 'PATRON_JUVENILE';
         }