From: Bill Erickson Date: Fri, 26 Feb 2021 23:17:06 +0000 (-0500) Subject: LP1904036 Renew all; initial events override dialog X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=902b38c242015c85703561d2535f44788d33aaa3;p=working%2FEvergreen.git LP1904036 Renew all; initial events override dialog Signed-off-by: Bill Erickson Signed-off-by: Jane Sandberg Signed-off-by: Galen Charlton --- diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.module.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.module.ts index caaebbcc7d..a0675888d5 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.module.ts @@ -7,6 +7,7 @@ import {DueDateDialogComponent} from './due-date-dialog.component'; import {PrecatCheckoutDialogComponent} from './precat-dialog.component'; import {ClaimsReturnedDialogComponent} from './claims-returned-dialog.component'; import {CircComponentsComponent} from './components.component'; +import {CircEventsComponent} from './events-dialog.component'; @NgModule({ declarations: [ @@ -14,7 +15,8 @@ import {CircComponentsComponent} from './components.component'; CircComponentsComponent, DueDateDialogComponent, PrecatCheckoutDialogComponent, - ClaimsReturnedDialogComponent + ClaimsReturnedDialogComponent, + CircEventsComponent ], imports: [ StaffCommonModule, diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts index f1e7530da7..1146029e73 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/circ.service.ts @@ -9,8 +9,91 @@ import {EventService, EgEvent} from '@eg/core/event.service'; import {AuthService} from '@eg/core/auth.service'; import {BibRecordService, BibRecordSummary} from '@eg/share/catalog/bib-record.service'; import {AudioService} from '@eg/share/util/audio.service'; -import {PrecatCheckoutDialogComponent - } from '@eg/staff/share/circ/precat-dialog.component'; +import {CircEventsComponent} from './events-dialog.component'; +import {CircComponentsComponent} from './components.component'; + + +const CAN_OVERRIDE_CHECKOUT_EVENTS = [ + 'PATRON_EXCEEDS_OVERDUE_COUNT', + 'PATRON_EXCEEDS_CHECKOUT_COUNT', + 'PATRON_EXCEEDS_FINES', + 'PATRON_EXCEEDS_LONGOVERDUE_COUNT', + 'PATRON_BARRED', + 'CIRC_EXCEEDS_COPY_RANGE', + 'ITEM_DEPOSIT_REQUIRED', + 'ITEM_RENTAL_FEE_REQUIRED', + 'PATRON_EXCEEDS_LOST_COUNT', + 'COPY_CIRC_NOT_ALLOWED', + 'COPY_NOT_AVAILABLE', + 'COPY_IS_REFERENCE', + 'COPY_ALERT_MESSAGE', + 'ITEM_ON_HOLDS_SHELF', + 'STAFF_C', + 'STAFF_CH', + 'STAFF_CHR', + 'STAFF_CR', + 'STAFF_H', + 'STAFF_HR', + 'STAFF_R' +]; + +const CHECKOUT_OVERRIDE_AFTER_FIRST = [ + 'PATRON_EXCEEDS_OVERDUE_COUNT', + 'PATRON_BARRED', + 'PATRON_EXCEEDS_LOST_COUNT', + 'PATRON_EXCEEDS_CHECKOUT_COUNT', + 'PATRON_EXCEEDS_FINES', + 'PATRON_EXCEEDS_LONGOVERDUE_COUNT' +]; + +const CAN_OVERRIDE_RENEW_EVENTS = [ + 'PATRON_EXCEEDS_OVERDUE_COUNT', + 'PATRON_EXCEEDS_LOST_COUNT', + 'PATRON_EXCEEDS_CHECKOUT_COUNT', + 'PATRON_EXCEEDS_FINES', + 'PATRON_EXCEEDS_LONGOVERDUE_COUNT', + 'CIRC_EXCEEDS_COPY_RANGE', + 'ITEM_DEPOSIT_REQUIRED', + 'ITEM_RENTAL_FEE_REQUIRED', + 'ITEM_DEPOSIT_PAID', + 'COPY_CIRC_NOT_ALLOWED', + 'COPY_NOT_AVAILABLE', + 'COPY_IS_REFERENCE', + 'COPY_ALERT_MESSAGE', + 'COPY_NEEDED_FOR_HOLD', + 'MAX_RENEWALS_REACHED', + 'CIRC_CLAIMS_RETURNED', + 'STAFF_C', + 'STAFF_CH', + 'STAFF_CHR', + 'STAFF_CR', + 'STAFF_H', + 'STAFF_HR', + 'STAFF_R' +] + +// These checkin events do not produce alerts when +// options.suppress_alerts is in effect. +const CAN_SUPPRESS_CHECKIN_ALERTS = [ + 'COPY_BAD_STATUS', + 'PATRON_BARRED', + 'PATRON_INACTIVE', + 'PATRON_ACCOUNT_EXPIRED', + 'ITEM_DEPOSIT_PAID', + 'CIRC_CLAIMS_RETURNED', + 'COPY_ALERT_MESSAGE', + 'COPY_STATUS_LOST', + 'COPY_STATUS_LOST_AND_PAID', + 'COPY_STATUS_LONG_OVERDUE', + 'COPY_STATUS_MISSING', + 'PATRON_EXCEEDS_FINES' +]; + +const CAN_OVERRIDE_CHECKIN_ALERTS = [ + // not technically overridable, but special prompt and param + 'HOLD_CAPTURE_DELAYED', + 'TRANSIT_CHECKIN_INTERVAL_BLOCK' +].concat(CAN_SUPPRESS_CHECKIN_ALERTS); // API parameter options @@ -63,8 +146,8 @@ export interface CheckinResult { export class CircService { static resultIndex = 0; + components: CircComponentsComponent; nonCatTypes: IdlObject[] = null; - precatDialog: PrecatCheckoutDialogComponent; constructor( private audio: AudioService, @@ -150,9 +233,9 @@ export class CircService { } handlePrecat(result: CheckoutResult): Promise { - this.precatDialog.barcode = result.params.copy_barcode; + this.components.precatDialog.barcode = result.params.copy_barcode; - return this.precatDialog.open().toPromise().then(values => { + return this.components.precatDialog.open().toPromise().then(values => { if (values && values.dummy_title) { const params = result.params; diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.html index 06641e303a..1ec9fa4325 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.html @@ -1,4 +1,4 @@ - + diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.ts index 0568025869..1d8cc153a8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/components.component.ts @@ -1,7 +1,7 @@ -import {Component, AfterViewInit, Output, Input, ViewChild, EventEmitter} from '@angular/core'; +import {Component, OnInit, Output, Input, ViewChild, EventEmitter} from '@angular/core'; import {CircService} from './circ.service'; -import {PrecatCheckoutDialogComponent - } from '@eg/staff/share/circ/precat-dialog.component'; +import {PrecatCheckoutDialogComponent} from './precat-dialog.component'; +import {CircEventsComponent} from './events-dialog.component'; /* Container component for sub-components used by circulation actions. * @@ -14,15 +14,13 @@ import {PrecatCheckoutDialogComponent templateUrl: 'components.component.html', selector: 'eg-circ-components' }) -export class CircComponentsComponent implements AfterViewInit { +export class CircComponentsComponent { - @ViewChild('precatDialog') - private precatDialog: PrecatCheckoutDialogComponent; + @ViewChild('precatDialog') precatDialog: PrecatCheckoutDialogComponent; + @ViewChild('circEventsDialog') circEventsDialog: CircEventsComponent; - constructor(private circ: CircService) {} - - ngAfterViewInit() { - this.circ.precatDialog = this.precatDialog; + constructor(private circ: CircService) { + this.circ.components = this; } } diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html new file mode 100644 index 0000000000..19a4ba2ac8 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.html @@ -0,0 +1,31 @@ + + + + + + +
+

+ Action Blocked +

+ +
+
+
Exceptions occurred during {{modeLabel}}.
+ +
+
{{evt.textcode}}
+
{{evt.desc}}
+
+ +
+
+ + +
+ diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.ts new file mode 100644 index 0000000000..006b06b2d2 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/events-dialog.component.ts @@ -0,0 +1,34 @@ +import {Component, OnInit, Output, Input, ViewChild, EventEmitter} from '@angular/core'; +import {CircService} from './circ.service'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {EgEvent} from '@eg/core/event.service'; +import {StringService} from '@eg/share/string/string.service'; + +/* + * Prompt to confirm overriding circulation events. + */ + +@Component({ + templateUrl: 'events-dialog.component.html', + selector: 'eg-circ-events-dialog' +}) +export class CircEventsComponent extends DialogComponent implements OnInit { + + @Input() events: EgEvent[] = []; + @Input() mode: 'checkout' | 'renew' | 'checkin'; + modeLabel: string; + + constructor( + private modal: NgbModal, + private strings: StringService + ) { super(modal); } + + ngOnInit() { + this.onOpen$.subscribe(_ => { + this.strings.interpolate('circ.events.mode.' + this.mode) + .then(str => this.modeLabel = str); + }); + } +} + diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html index ab596df19e..ea9561830e 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.html @@ -83,6 +83,10 @@ i18n-label label="Renew" (onClick)="renew($event)"> + + + diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts index b2a5ab2e3b..dba0088c58 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/grid.component.ts @@ -410,6 +410,11 @@ export class CircGridComponent implements OnInit { return this.progressDialog; } + + renewAll() { + this.renew(this.entries); + } + renew(rows: CircGridEntry[]) { const dialog = this.openProgressDialog(rows);