From 7e2e9075f89501f89571152f43d5ecb2291c9144 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 21 Mar 2019 15:07:40 -0700
Subject: [PATCH] lpxxx Angular holdings maintenance wip

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../holdings/copy-alerts-dialog.component.html     | 85 ++++++++++++----------
 .../share/holdings/copy-alerts-dialog.component.ts | 58 +++++++--------
 2 files changed, 76 insertions(+), 67 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
index 837565262b..4b3c1caab1 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.html
@@ -1,7 +1,5 @@
 <eg-string #successMsg text="Successfully Modified Copy Alerts" i18n-text></eg-string>
 <eg-string #errorMsg text="Failed To Modify Copy Alerts" i18n-text></eg-string>
-<eg-confirm-dialog #confirmDeleteDialog dialogBody="Delete Alert?" 
-  i18n-dialogBody></eg-confirm-dialog>
 
 <ng-template #dialogContent>
   <div class="modal-header">
@@ -19,15 +17,24 @@
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-  <div class="modal-body p-4">
+  <div class="modal-body p-4 form-validated">
     <div class="row mt-2 p-2 rounded border border-success">
+      <div class="col-lg-4">
+        <eg-combobox [entries]="alertTypes" 
+          i18n-placeholder placeholder="New Alert Type..."
+          [required]="true"
+          (onChange)="newAlert.alert_type($event ? $event.id : null)">
+        </eg-combobox>
+      </div>
       <div class="col-lg-5">
+        <textarea class="form-control" rows="2" 
+          i18n-placeholder placeholder="New Alert Note..."
+          (ngModelChange)="newAlert.note($event)" [ngModel]="newAlert.note()">
+        </textarea>
+      </div>
+      <div class="col-lg-3">
         <div class="d-flex flex-column">
-          <eg-combobox [entries]="alertTypes" 
-            i18n-placeholder placeholder="New Alert Type..."
-            (onChange)="newAlert.alert_type($event ? $event.id : null)">
-          </eg-combobox>
-          <div class="form-check pt-2">
+          <div class="form-check">
             <input class="form-check-input" type="checkbox" 
               [ngModel]="newAlert.temp() == 't'" 
               (ngModelChange)="newAlert.temp($event ? 't' : 'f')"
@@ -36,18 +43,12 @@
               Temporary?
             </label>
           </div>
-        </div>
-      </div>
-      <div class="col-lg-5">
-        <textarea class="form-control" rows="2" 
-          i18n-placeholder placeholder="New Alert Note..."
-          (ngModelChange)="newAlert.note($event)" [ngModel]="newAlert.note()">
-        </textarea>
-      </div>
-      <div class="col-lg-2">
-        <button class="btn btn-success" (click)="addNew()" i18n>
-          Add New
-        </button>
+          <div class="pt-2">
+            <button class="btn btn-success" (click)="addNew()" i18n>
+              Add New
+            </button>
+          </div>  
+        </div>  
       </div>
     </div>
     <ng-container *ngIf="mode == 'manage'">
@@ -55,13 +56,26 @@
       <div class="row mt-2" 
         *ngFor="let alert of copy.copy_alerts()">
         <div class="col-lg-12 pb-2"><hr/></div>
+        <div class="col-lg-4">
+          <eg-combobox [entries]="alertTypes" [startId]="alert.alert_type()"
+            i18n-placeholder placeholder="Alert Type..."
+            [required]="true"
+            (onChange)="alert.alert_type($event ? $event.id : null); alert.ischanged(true)">
+          </eg-combobox>
+          <div class="pl-2 pt-2" i18n>
+            Added: {{alert.create_time() | date:'shortDate'}}
+          </div>
+        </div>
         <div class="col-lg-5">
+          <textarea class="form-control" rows="2" 
+            i18n-placeholder placeholder="Alert Note..."
+            (ngModelChange)="alert.note($event); alert.ischanged(true)"
+            [ngModel]="alert.note()">
+          </textarea>
+        </div>
+        <div class="col-lg-3">
           <div class="d-flex flex-column">
-            <eg-combobox [entries]="alertTypes" [startId]="alert.alert_type()"
-              i18n-placeholder placeholder="Alert Type..."
-              (onChange)="alert.alert_type($event ? $event.id : null); alert.ischanged(true)">
-            </eg-combobox>
-            <div class="form-check pt-2">
+            <div class="form-check">
               <input class="form-check-input" type="checkbox" 
                 [ngModel]="alert.temp() == 't'" 
                 (ngModelChange)="alert.temp($event ? 't' : 'f'); alert.ischanged(true)"
@@ -70,20 +84,17 @@
                 Temporary?
               </label>
             </div>
+            <div class="form-check pt-2">
+              <input class="form-check-input" type="checkbox" 
+                [ngModel]="alert.ack_time() != null" 
+                (ngModelChange)="alert.ack_time($event ? 'now' : null); alert.ischanged(true)"
+                id="alert-temporary-{{alert.id()}}">
+              <label class="form-check-label" for="alert-temporary-{{alert.id()}}" i18n>
+                Clear?
+              </label>
+            </div>
           </div>
         </div>
-        <div class="col-lg-5">
-          <textarea class="form-control" rows="2" 
-            i18n-placeholder placeholder="Alert Note..."
-            (ngModelChange)="alert.note($event); alert.ischanged(true)"
-            [ngModel]="alert.note()">
-          </textarea>
-        </div>
-        <div class="col-lg-2">
-          <button class="btn btn-warning" (click)="deleteAlert(alert)" i18n>
-            Delete
-          </button>
-        </div>
       </div>
     </ng-container>
   </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
index 464d11783f..e0ce7637b0 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/copy-alerts-dialog.component.ts
@@ -93,15 +93,18 @@ export class CopyAlertsDialogComponent
             }
         }
 
-        if (!this.alertTypes) {
-            await this.getAlertTypes();
-        }
-
+        await this.getAlertTypes();
         await this.getCopies();
+        if (this.mode === 'manage') {
+            await this.getCopyAlerts();
+        }
         return super.open(args);
     }
 
     async getAlertTypes(): Promise<any> {
+        if (this.alertTypes) {
+            return Promise.resolve();
+        }
         return this.pcrud.retrieveAll('ccat',
         {   active: true,
             scope_org: this.org.ancestors(this.auth.user().ws_ou(), true)
@@ -112,18 +115,34 @@ export class CopyAlertsDialogComponent
     }
 
     async getCopies(): Promise<any> {
-        return this.pcrud.search('acp',
-            {id: this.copyIds},
-            {flesh: 1, flesh_fields: {acp: ['call_number', 'copy_alerts']}},
-            {atomic: true}
-        ).toPromise().then(copies => {
+        return this.pcrud.search('acp', {id: this.copyIds}, {}, {atomic: true})
+        .toPromise().then(copies => {
             this.copies = copies;
+            copies.forEach(c => c.copy_alerts([]));
             if (this.mode === 'manage') {
                 this.copy = copies[0];
             }
         });
     }
 
+    // Copy alerts for the selected copies which have not been
+    // acknowledged by staff and are within org unit range of
+    // the alert type.
+    async getCopyAlerts(): Promise<any> {
+        const copyIds = this.copies.map(c => c.id());
+        const typeIds = this.alertTypes.map(a => a.id);
+
+        return this.pcrud.search('aca',
+            {copy: copyIds, ack_time: null, alert_type: typeIds},
+            {}, {atomic: true})
+        .toPromise().then(alerts => {
+            alerts.forEach(a => {
+                const copy = this.copies.filter(c => c.id() === a.copy())[0];
+                copy.copy_alerts().push(a);
+            });
+        });
+    }
+
     // Add the in-progress new note to all copies.
     addNew() {
         if (!this.newAlert.alert_type()) { return; }
@@ -154,27 +173,6 @@ export class CopyAlertsDialogComponent
         );
     }
 
-    deleteAlert(copyAlert: IdlObject) {
-        this.confirmDeleteDialog.open().then(
-            ok => {
-                this.pcrud.remove(copyAlert).toPromise().then(
-                    ok => {
-                        this.changesMade = true;
-                        this.copy.copy_alerts( // Remove the delete alert
-                            this.copy.copy_alerts()
-                                .filter(a => a.id() !== copyAlert.id())
-                        )
-                        this.successMsg.current().then(msg => this.toast.success(msg));
-                    },
-                    err => {
-                        this.errorMsg.current().then(msg => this.toast.danger(msg))
-                    }
-                );
-            },
-            dismissed => {}
-        );
-    }
-
     applyChanges() {
         const alerts = this.copy.copy_alerts().filter(a => a.ischanged());
         if (alerts.length === 0) { return ;}
-- 
2.11.0