From: Bill Erickson Date: Thu, 15 Jul 2021 16:04:44 +0000 (-0400) Subject: LP1936233 Item status actions menu X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=698d205593128e3c379bf3b770c7e08ed4b7544b;p=working%2FEvergreen.git LP1936233 Item status actions menu Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/circ-history.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/circ-history.component.html index 5ab74145a8..f1f0b181c5 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/circ-history.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/circ-history.component.html @@ -4,7 +4,7 @@ -
+
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.ts index 822c714601..2344b18875 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.ts @@ -53,7 +53,7 @@ export class ItemHoldsTransitsComponent implements OnInit { return this.pcrud.search('atc', {target_copy: this.item.id()}, {order_by: {atc: 'source_send_time DESC'}, limit: 1} - ) + ); })) .pipe(tap(transit => { transit.source(this.org.get(transit.source())); diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/item.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/item/item.module.ts index 3204e52a16..fcb84ea10c 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/item.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/item.module.ts @@ -8,11 +8,13 @@ import {BillingModule} from '@eg/staff/share/billing/billing.module'; import {MarkItemMissingPiecesComponent} from './missing-pieces.component'; import {ItemStatusComponent} from './status.component'; import {BarcodesModule} from '@eg/staff/share/barcodes/barcodes.module'; +import {BookingModule} from '@eg/staff/share/booking/booking.module'; import {CircModule} from '@eg/staff/share/circ/circ.module'; import {ItemSummaryComponent} from './summary.component'; import {ItemRecentHistoryComponent} from './recent-history.component'; import {ItemCircHistoryComponent} from './circ-history.component'; import {ItemHoldsTransitsComponent} from './holds.component'; +import {GroupedMenuModule} from '@eg/share/grouped-menu/grouped-menu.module'; @NgModule({ declarations: [ @@ -30,8 +32,10 @@ import {ItemHoldsTransitsComponent} from './holds.component'; HoldingsModule, BarcodesModule, CircModule, + BookingModule, PatronModule, - BillingModule + BillingModule, + GroupedMenuModule ], providers: [ ] diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.html index f33d454cd1..1efc194d99 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.html @@ -3,10 +3,24 @@ + + + + + + + + + + +
-
+
Barcode @@ -16,8 +30,28 @@ (keyup.enter)="getItemByBarcode()" [(ngModel)]="itemBarcode" aria-describedby="barcode-label"/>
- + + + +
+ + + + + + + + + + + +
@@ -56,6 +90,13 @@ +
  • + Cataloging Info + + + + +
  • diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.ts index 7764ba1179..bb846666f5 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/status.component.ts @@ -13,8 +13,25 @@ import {CatalogService} from '@eg/share/catalog/catalog.service'; import {NgbNav, NgbNavChangeEvent} from '@ng-bootstrap/ng-bootstrap'; import {CopyAlertsDialogComponent } from '@eg/staff/share/holdings/copy-alerts-dialog.component'; +import {ReplaceBarcodeDialogComponent + } from '@eg/staff/share/holdings/replace-barcode-dialog.component'; +import {DeleteHoldingDialogComponent + } from '@eg/staff/share/holdings/delete-volcopy-dialog.component'; import {BucketDialogComponent } from '@eg/staff/share/buckets/bucket-dialog.component'; +import {ConjoinedItemsDialogComponent + } from '@eg/staff/share/holdings/conjoined-items-dialog.component'; +import {MakeBookableDialogComponent + } from '@eg/staff/share/booking/make-bookable-dialog.component'; +import {TransferItemsComponent + } from '@eg/staff/share/holdings/transfer-items.component'; +import {TransferHoldingsComponent + } from '@eg/staff/share/holdings/transfer-holdings.component'; +import {AlertDialogComponent} from '@eg/share/dialog/alert.component'; +import {MarkDamagedDialogComponent + } from '@eg/staff/share/holdings/mark-damaged-dialog.component'; +import {MarkMissingDialogComponent + } from '@eg/staff/share/holdings/mark-missing-dialog.component'; @Component({ templateUrl: 'status.component.html' @@ -29,7 +46,29 @@ export class ItemStatusComponent implements OnInit, AfterViewInit { tab: string; @ViewChild('barcodeSelect') private barcodeSelect: BarcodeSelectComponent; - @ViewChild('bucketDialog') private bucketDialog: BucketDialogComponent; + + @ViewChild('markDamagedDialog') + private markDamagedDialog: MarkDamagedDialogComponent; + @ViewChild('markMissingDialog') + private markMissingDialog: MarkMissingDialogComponent; + @ViewChild('copyAlertsDialog') + private copyAlertsDialog: CopyAlertsDialogComponent; + @ViewChild('replaceBarcode') + private replaceBarcode: ReplaceBarcodeDialogComponent; + @ViewChild('deleteHolding') + private deleteHolding: DeleteHoldingDialogComponent; + @ViewChild('bucketDialog') + private bucketDialog: BucketDialogComponent; + @ViewChild('conjoinedDialog') + private conjoinedDialog: ConjoinedItemsDialogComponent; + @ViewChild('makeBookableDialog') + private makeBookableDialog: MakeBookableDialogComponent; + @ViewChild('transferItems') + private transferItems: TransferItemsComponent; + @ViewChild('transferHoldings') + private transferHoldings: TransferHoldingsComponent; + @ViewChild('transferAlert') + private transferAlert: AlertDialogComponent; constructor( private router: Router, @@ -155,6 +194,12 @@ export class ItemStatusComponent implements OnInit, AfterViewInit { this.selectInput(); }); } + + addToBucket() { + this.bucketDialog.bucketClass = 'copy'; + this.bucketDialog.itemIds = [this.item.id()]; + this.bucketDialog.open({size: 'lg'}); + } } 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 1bd5f2418a..4f730678bf 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 @@ -1375,11 +1375,11 @@ export class CircService { ops.order_by = {aacs: 'xact_start desc'}; - let promise = count ? + const promise = count ? Promise.resolve(count) : this.getMaxCircDisplayCount(item); - return promise.then(count => { - ops.limit = count; + return promise.then(limit => { + ops.limit = limit; return this.pcrud.search('aacs', {target_copy : item.id()}, ops, {atomic: true}).toPromise(); });