From 0212ebd2f0ee1178038222687dafeb30d31c9c1e Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 21 Mar 2019 09:14:30 -0700 Subject: [PATCH] lpxxx Angular holdings maintenance wip Signed-off-by: Bill Erickson --- .../src/app/share/combobox/combobox.component.ts | 2 +- .../staff/catalog/record/holdings.component.html | 9 +- .../app/staff/catalog/record/holdings.component.ts | 8 +- .../holdings/copy-alerts-dialog.component.html | 92 ++++++++++++++++++--- .../share/holdings/copy-alerts-dialog.component.ts | 95 ++++++++++++++++++++-- 5 files changed, 182 insertions(+), 24 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts index 323623c3a0..02c54c1c54 100644 --- a/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts +++ b/Open-ILS/src/eg2/src/app/share/combobox/combobox.component.ts @@ -79,7 +79,7 @@ export class ComboboxComponent implements OnInit { // Useful for massaging the match string prior to comparison // and display. Default version trims leading/trailing spaces. - formatDisplayString: (ComboboxEntry) => string; + formatDisplayString: (e: ComboboxEntry) => string; constructor( private elm: ElementRef, diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html index 808f24706d..b7cfc57c92 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html @@ -96,9 +96,16 @@ + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts index c47d7a67fd..707944d1d8 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts @@ -192,7 +192,11 @@ export class HoldingsMaintenanceComponent implements OnInit { 'cat.holdings_show_vols' ]); - this.volsCheckbox.checked(settings['cat.holdings_show_vols']); + // Show volumes by default when no preference is set. + let showVols = settings['cat.holdings_show_vols']; + if (showVols === null) { showVols = true; } + + this.volsCheckbox.checked(showVols); this.copiesCheckbox.checked(settings['cat.holdings_show_copies']); this.emptyVolsCheckbox.checked(settings['cat.holdings_show_empty']); this.emptyLibsCheckbox.checked(settings['cat.holdings_show_empty_org']); @@ -733,7 +737,7 @@ export class HoldingsMaintenanceComponent implements OnInit { this.copyAlertsDialog.copyIds = copyIds; this.copyAlertsDialog.mode = mode; - this.copyAlertsDialog.open({}).then( + this.copyAlertsDialog.open({size: 'lg'}).then( modified => { if (modified) { this.hardRefresh(); 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 f76e9fd20c..837565262b 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,28 +1,98 @@ + -
+

- Manage Copy Alerts + + Adding alerts for {{copies.length}} item(s). + + + Managing alerts for item {{copies[0].barcode()}} + +

-
- - Adding alerts for {{copies.length}} item(s). - +
+
+
+
+ + +
+ + +
+
+
+
+ +
+
+ +
+
- Managing alerts for item {{copies[0].barcode()}} + +
+
+
+
+ + +
+ + +
+
+
+
+ +
+
+ +
+
- - + + + +
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 72ec0c560e..464d11783f 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 @@ -1,6 +1,6 @@ import {Component, OnInit, Input, ViewChild} from '@angular/core'; import {NetService} from '@eg/core/net.service'; -import {IdlObject} from '@eg/core/idl.service'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; import {EventService} from '@eg/core/event.service'; import {ToastService} from '@eg/share/toast/toast.service'; import {AuthService} from '@eg/core/auth.service'; @@ -10,6 +10,7 @@ import {StringComponent} from '@eg/share/string/string.component'; import {DialogComponent} from '@eg/share/dialog/dialog.component'; import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; /** * Dialog for managing copy alerts. @@ -31,7 +32,7 @@ export class CopyAlertsDialogComponent return this._copyIds; } - _mode: string; + _mode: string; // create | manage @Input() set mode(m: string) { this._mode = m; } @@ -39,17 +40,24 @@ export class CopyAlertsDialogComponent return this._mode; } + // In 'create' mode, we may be adding notes to multiple copies. copies: IdlObject[]; - alertTypes: IdlObject[]; + // In 'manage' mode we only handle a single copy. + copy: IdlObject; + alertTypes: ComboboxEntry[]; + newAlert: IdlObject; + changesMade: boolean; @ViewChild('successMsg') private successMsg: StringComponent; @ViewChild('errorMsg') private errorMsg: StringComponent; + @ViewChild('confirmDeleteDialog') + private confirmDeleteDialog: ConfirmDialogComponent; constructor( private modal: NgbModal, // required for passing to parent private toast: ToastService, private net: NetService, - private evt: EventService, + private idl: IdlService, private pcrud: PcrudService, private org: OrgService, private auth: AuthService) { @@ -66,7 +74,10 @@ export class CopyAlertsDialogComponent * the mark-damanged action occured or was dismissed. */ async open(args: NgbModalOptions): Promise { + this.copy = null; this.copies = []; + this.newAlert = this.idl.create('aca'); + this.newAlert.create_staff(this.auth.user().id()); if (this.copyIds.length === 0) { return Promise.reject('copy ID required'); @@ -91,8 +102,13 @@ export class CopyAlertsDialogComponent } async getAlertTypes(): Promise { - return this.pcrud.retrieveAll('aca', {}, {atomic: true}) - .toPromise().then(alerts => this.alertTypes = alerts); + return this.pcrud.retrieveAll('ccat', + { active: true, + scope_org: this.org.ancestors(this.auth.user().ws_ou(), true) + }, {atomic: true} + ).toPromise().then(alerts => { + this.alertTypes = alerts.map(a => ({id: a.id(), label: a.name()})); + }); } async getCopies(): Promise { @@ -100,11 +116,72 @@ export class CopyAlertsDialogComponent {id: this.copyIds}, {flesh: 1, flesh_fields: {acp: ['call_number', 'copy_alerts']}}, {atomic: true} - ).toPromise().then(copies => this.copies = copies); + ).toPromise().then(copies => { + this.copies = copies; + if (this.mode === 'manage') { + this.copy = copies[0]; + } + }); + } + + // Add the in-progress new note to all copies. + addNew() { + if (!this.newAlert.alert_type()) { return; } + + const alerts: IdlObject[] = []; + this.copies.forEach(c => { + const a = this.idl.clone(this.newAlert); + a.copy(c.id()); + alerts.push(a); + }); + + this.pcrud.create(alerts).toPromise().then( + newAlert => { + this.successMsg.current().then(msg => this.toast.success(msg)); + this.changesMade = true; + if (this.mode === 'create') { + // In create mode, we assume the user wants to create + // a single alert and be done with it. + this.close(this.changesMade); + } else { + // Otherwise, add the alert to the copy + this.copy.copy_alerts().push(newAlert); + } + }, + err => { + this.errorMsg.current().then(msg => this.toast.danger(msg)) + } + ); + } + + 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 => {} + ); } - save() { - this.close(false); + applyChanges() { + const alerts = this.copy.copy_alerts().filter(a => a.ischanged()); + if (alerts.length === 0) { return ;} + this.pcrud.update(alerts).toPromise().then( + ok => this.successMsg.current().then(msg => this.toast.success(msg)), + err => this.errorMsg.current().then(msg => this.toast.danger(msg)) + ) } } -- 2.11.0