LP1913604: Alert staff when associating item with course at a different library

1) Create a new course at a branch that can have items (BR3, for
   example).
2) Add an item with the circ_lib of BR3. Note that the item is
   added to the grid.
3) Add an item with a different circ_lib. Note that you get an
   alert showing that the item is not at the course's owning library.
4) Push the Cancel button.  Notice that the item is not added to the
   course.
5) Repeat step 3 and push the Confirm button.  Notice that the item is
   added to the course this time.

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Signed-off-by: Michele Morgan <mmorgan@noblenet.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
index f70f231..ecfcef5 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.html
@@ -6,7 +6,12 @@
 </eg-string>
 <eg-string #materialEditSuccessString i18n-text text="Update of Course Material succeeded"></eg-string>
 <eg-string #materialEditFailedString i18n-text text="Update of Course Material failed or was not allowed"></eg-string>
-<eg-string #materialAddDifferentLibraryString i18n-text text="Material exists at a different library"></eg-string>
+
+<eg-confirm-dialog #confirmOtherLibraryDialog
+  i18n-dialogTitle i18n-dialogBody
+  dialogTitle="Material from a different library"
+  dialogBody="This material has {{itemCircLib}} as its circulation library. Are you sure you want to add it to {{currentCourse.course_number()}}?">
+</eg-confirm-dialog>
 
 <ng-template #dialogContent>
   <div class="modal-header bg-info" [ngClass]="isDialog() ? 'modal-header' : 'alert mt-3'">

diff --git a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
index 8534d21..590360d 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/admin/local/course-reserves/course-associate-material.component.ts
@@ -1,17 +1,15 @@
-import {Component, Input, ViewChild, OnInit, TemplateRef} from '@angular/core';
-import {ActivatedRoute} from '@angular/router';
-import {from, merge, Observable} from 'rxjs';
+import {Component, Input, ViewChild, OnInit} from '@angular/core';
+import {Observable, merge, of, EMPTY} from 'rxjs';
+import {switchMap} from 'rxjs/operators';
 import {DialogComponent} from '@eg/share/dialog/dialog.component';
 import {AuthService} from '@eg/core/auth.service';
 import {NetService} from '@eg/core/net.service';
-import {EventService} from '@eg/core/event.service';
-import {OrgService} from '@eg/core/org.service';
 import {PcrudService} from '@eg/core/pcrud.service';
 import {Pager} from '@eg/share/util/pager';
-import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap';
+import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
 import {GridDataSource} from '@eg/share/grid/grid';
 import {GridComponent} from '@eg/share/grid/grid.component';
-import {IdlObject, IdlService} from '@eg/core/idl.service';
+import {IdlObject} from '@eg/core/idl.service';
 import {StringComponent} from '@eg/share/string/string.component';
 import {FmRecordEditorComponent} from '@eg/share/fm-editor/fm-editor.component';
 import {ToastService} from '@eg/share/toast/toast.service';
@@ -44,6 +42,7 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements
         materialEditFailedString: StringComponent;
     @ViewChild('materialAddDifferentLibraryString', { static: true })
         materialAddDifferentLibraryString: StringComponent;
+    @ViewChild('confirmOtherLibraryDialog') confirmOtherLibraryDialog: DialogComponent;
     materialsDataSource: GridDataSource;
     @Input() barcodeInput: string;
     @Input() relationshipInput: string;
@@ -56,6 +55,7 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements
     @Input() isModifyingCallNumber: boolean;
     @Input() isModifyingLocation: boolean;
     bibId: number;
+    itemCircLib: string;
 
     associateBriefRecord: (newRecord: string) => void;
     associateElectronicBibRecord: () => void;
@@ -63,12 +63,8 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements
     constructor(
         private auth: AuthService,
         private course: CourseService,
-        private event: EventService,
-        private idl: IdlService,
         private net: NetService,
-        private org: OrgService,
         private pcrud: PcrudService,
-        private route: ActivatedRoute,
         private toast: ToastService,
         private modal: NgbModal
     ) {
@@ -176,24 +172,20 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements
             this.barcodeInput = null;
 
             this.pcrud.search('acp', {barcode: args.barcode}, {
-                flesh: 3, flesh_fields: {acp: ['call_number']}
-            }).subscribe(item => {
-                const associatedMaterial = this.course.associateMaterials(item, args);
+                flesh: 3, flesh_fields: {acp: ['call_number', 'circ_lib']}
+            }).pipe(switchMap(item => this.handleItemAtDifferentLibrary$(item)))
+            .subscribe((originalItem) => {
+                const associatedMaterial = this.course.associateMaterials(originalItem, args);
                 associatedMaterial.material.then(res => {
-                    item = associatedMaterial.item;
+                    const item = associatedMaterial.item;
                     let new_cn = item.call_number().label();
                     if (this.tempCallNumber) { new_cn = this.tempCallNumber; }
                     this.course.updateItem(item, this.currentCourse.owning_lib(),
                         new_cn, args.isModifyingCallNumber
                     ).then(resp => {
                         this.materialsGrid.reload();
-                        if (item.circ_lib() !== this.currentCourse.owning_lib()) {
-                            this.materialAddDifferentLibraryString.current()
-                            .then(str => this.toast.warning(str));
-                        } else {
-                            this.materialAddSuccessString.current()
-                            .then(str => this.toast.success(str));
-                        }
+                        this.materialAddSuccessString.current()
+                        .then(str => this.toast.success(str));
                     });
                 }, err => {
                     this.materialAddFailedString.current()
@@ -217,4 +209,16 @@ export class CourseAssociateMaterialComponent extends DialogComponent implements
             this.materialsGrid.reload();
         });
     }
+
+    handleItemAtDifferentLibrary$(item: IdlObject): Observable<any> {
+        this.itemCircLib = item.circ_lib().shortname();
+        if (item.circ_lib().id() !== this.currentCourse.owning_lib().id()) {
+            return this.confirmOtherLibraryDialog.open()
+            .pipe(switchMap(confirmed => {
+                if (!confirmed) { return EMPTY; }
+                return of(item);
+            }));
+        }
+        return of(item);
+    }
 }