From 8327cddb02972dfbfaaf105b6d9f0a91590fa3a3 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Sat, 5 Feb 2022 17:51:48 -0500 Subject: [PATCH] LP#1929749: receiving from LI search results now checks LI alerts Signed-off-by: Galen Charlton --- .../acq/search/lineitem-results.component.html | 1 + .../staff/acq/search/lineitem-results.component.ts | 23 +++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html index bf9cd85bb2..334d357ee5 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html @@ -8,6 +8,7 @@ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts index c170e50443..6a30b788d8 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts @@ -21,6 +21,7 @@ import {CancelDialogComponent} from '../lineitem/cancel-dialog.component'; import {AddToPoDialogComponent} from '../lineitem/add-to-po-dialog.component'; import {DeleteLineitemsDialogComponent} from '../lineitem/delete-lineitems-dialog.component'; import {LinkInvoiceDialogComponent} from '../lineitem/link-invoice-dialog.component'; +import {LineitemAlertDialogComponent} from '../lineitem/lineitem-alert-dialog.component'; @Component({ selector: 'eg-lineitem-results', @@ -49,6 +50,7 @@ export class LineitemResultsComponent implements OnInit { @ViewChild('noActionableLIs', { static: true }) private noActionableLIs: AlertDialogComponent; @ViewChild('selectorReadyConfirmDialog', { static: true }) selectorReadyConfirmDialog: ConfirmDialogComponent; @ViewChild('orderReadyConfirmDialog', { static: true }) orderReadyConfirmDialog: ConfirmDialogComponent; + @ViewChild('confirmAlertsDialog') confirmAlertsDialog: LineitemAlertDialogComponent; noSelectedRows: (rows: IdlObject[]) => boolean; @@ -355,15 +357,18 @@ export class LineitemResultsComponent implements OnInit { } const ids = lis.map(x => Number(x.id())); - this.net.request( - 'open-ils.acq', - 'open-ils.acq.lineitem.receive.batch', - this.auth.token(), ids - ).toPromise().then(resp => { - this.lineItemsReceivedString.current() - .then(str => this.toast.success(str)); - this.lineitemResultsGrid.reload(); - }); + + this.liService.checkLiAlerts(lis, this.confirmAlertsDialog).then(ok => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.receive.batch', + this.auth.token(), ids + ).toPromise().then(resp => { + this.lineItemsReceivedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + }, err => {}); // avoid console errors } markUnReceived(rows: IdlObject[]) { -- 2.11.0