From: Bill Erickson Date: Fri, 26 Feb 2021 16:53:11 +0000 (-0500) Subject: LP1904036 Claims returned; circ notices X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4f810a0990fb6dfe300702dbaf485625746cee06;p=Evergreen.git LP1904036 Claims returned; circ notices 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 714cf654bd..e9b10509ca 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 @@ -5,12 +5,14 @@ import {CircService} from './circ.service'; import {CircGridComponent} from './grid.component'; import {DueDateDialogComponent} from './due-date-dialog.component'; import {PrecatCheckoutDialogComponent} from './precat-dialog.component'; +import {ClaimsReturnedDialogComponent} from './claims-returned-dialog.component'; @NgModule({ declarations: [ CircGridComponent, DueDateDialogComponent, - PrecatCheckoutDialogComponent + PrecatCheckoutDialogComponent, + ClaimsReturnedDialogComponent ], imports: [ StaffCommonModule, diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html new file mode 100644 index 0000000000..4f43fd1f35 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.html @@ -0,0 +1,41 @@ + + + + + +
+

+ Mark Claims Returned +

+ +
+
+
Marking Claims Returned for {{barcodes.length}} Item(s)
+
+
Enter Claims Returned Date
+
+ + +
+
+
+
+ Patron exceeds claims returned count. Force this action? +
+
+ +
+
+
+
+ + +
+ diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.ts new file mode 100644 index 0000000000..be32a103b6 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/claims-returned-dialog.component.ts @@ -0,0 +1,30 @@ +import {Component, OnInit, Output, Input, ViewChild, EventEmitter} from '@angular/core'; +import {Observable, empty, of, from} from 'rxjs'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; + +@Component({ + templateUrl: 'claims-returned-dialog.component.html', + selector: 'eg-claims-returned-dialog' +}) +export class ClaimsReturnedDialogComponent + extends DialogComponent implements OnInit { + + barcodes: string[]; + returnDate: string; + patronExceeds: boolean; + + ngOnInit() { + this.onOpen$.subscribe(_ => { + this.returnDate = new Date().toISOString() + this.patronExceeds = false; + }); + } + + modifyBatch() { + } + + confirmExceeds() { + } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html index f47258f6c2..b991ef76bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/circ/due-date-dialog.component.html @@ -2,49 +2,49 @@ -
-

- Modify Due Date -

- -
-
-
Modifying Due Date For {{circs.length}} Circulation(s)
+
+

+ Modify Due Date +

+ +
+
+
Modifying Due Date For {{circs.length}} Circulation(s)
-
-
New Date
-
- - -
+
+
New Date
+
+ +
+
-
-
- Selected due date is not valid. -
+
+
+ Selected due date is not valid.
+
-
-
- {{numSucceeded}} Due Date(s) Successfully Modified -
+
+
+ {{numSucceeded}} Due Date(s) Successfully Modified
-
-
-
- {{numFailed}} Due Date(s) Failed to Modify -
+
+
+
+
+ {{numFailed}} Due Date(s) Failed to Modify
-
- - -
- +
+
+ + +
+ 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 18b0ec6a3a..4cd4d90277 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 @@ -6,12 +6,14 @@ + + {{r.title}} @@ -48,14 +50,18 @@ + (onClick)="markDamaged($event)"> + (onClick)="markMissing($event)"> + + @@ -81,10 +87,29 @@ + + + + + + + + + + + + + + + [hidden]="true" i18n-label> 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 0282e39150..519c29a7b2 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 @@ -1,7 +1,7 @@ import {Component, OnInit, Output, Input, ViewChild, EventEmitter} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Observable, empty, of, from} from 'rxjs'; -import {map, tap, switchMap, concatMap} from 'rxjs/operators'; +import {map, concat, ignoreElements, last, tap, mergeMap, switchMap, concatMap} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; import {OrgService} from '@eg/core/org.service'; import {NetService} from '@eg/core/net.service'; @@ -29,6 +29,7 @@ import {MarkDamagedDialogComponent } from '@eg/staff/share/holdings/mark-damaged-dialog.component'; import {MarkMissingDialogComponent } from '@eg/staff/share/holdings/mark-missing-dialog.component'; +import {ClaimsReturnedDialogComponent} from './claims-returned-dialog.component'; export interface CircGridEntry { index: string; // class + id -- row index @@ -42,6 +43,8 @@ export interface CircGridEntry { dueDate?: string; copyAlertCount?: number; nonCatCount?: number; + noticeCount?: number; + lastNotice?: string; // iso date // useful for reporting precaculated values and avoiding // repetitive date creation on grid render. @@ -50,7 +53,7 @@ export interface CircGridEntry { const CIRC_FLESH_DEPTH = 4; const CIRC_FLESH_FIELDS = { - circ: ['target_copy', 'workstation', 'checkin_workstation'], + circ: ['target_copy', 'workstation', 'checkin_workstation', 'circ_lib'], acp: [ 'call_number', 'holds_count', @@ -100,8 +103,12 @@ export class CircGridComponent implements OnInit { private markMissingDialog: MarkMissingDialogComponent; @ViewChild('itemsOutConfirm') private itemsOutConfirm: ConfirmDialogComponent; + @ViewChild('claimsReturnedConfirm') + private claimsReturnedConfirm: ConfirmDialogComponent; @ViewChild('progressDialog') private progressDialog: ProgressDialogComponent; + @ViewChild('claimsReturnedDialog') + private claimsReturnedDialog: ClaimsReturnedDialogComponent; constructor( private org: OrgService, @@ -163,6 +170,14 @@ export class CircGridComponent implements OnInit { this.entries = []; + // fetchCircs and fetchNotices both return observable of grid entries. + // ignore the entries from fetchCircs so they are not duplicated. + return this.fetchCircs(circIds) + .pipe(ignoreElements(), concat(this.fetchNotices(circIds))); + } + + fetchCircs(circIds: number[]): Observable { + return this.pcrud.search('circ', {id: circIds}, { flesh: CIRC_FLESH_DEPTH, flesh_fields: CIRC_FLESH_FIELDS, @@ -181,6 +196,21 @@ export class CircGridComponent implements OnInit { })); } + fetchNotices(circIds: number[]): Observable { + return this.net.request( + 'open-ils.actor', + 'open-ils.actor.user.itemsout.notices', + this.auth.token(), circIds + ).pipe(tap(notice => { + + const entry = this.entries.filter( + e => e.circ.id() === Number(notice.circ_id))[0]; + + entry.noticeCount = notice.numNotices; + entry.lastNotice = notice.lastDt; + return entry; + })); + } // Also useful for manually appending circ-like things (e.g. noncat // circs) that can be massaged into CircGridEntry structs. @@ -317,7 +347,7 @@ export class CircGridComponent implements OnInit { return row.overdue; } - showMarkDamagedDialog(rows: CircGridEntry[]) { + markDamaged(rows: CircGridEntry[]) { const copyIds = this.getCopyIds(rows, 14 /* ignore damaged */); if (copyIds.length === 0) { return; } @@ -345,7 +375,7 @@ export class CircGridComponent implements OnInit { }); } - showMarkMissingDialog(rows: CircGridEntry[]) { + markMissing(rows: CircGridEntry[]) { const copyIds = this.getCopyIds(rows, 4 /* ignore missing */); if (copyIds.length === 0) { return; } @@ -413,5 +443,18 @@ export class CircGridComponent implements OnInit { } ); } + + claimsReturned(rows: CircGridEntry[]) { + this.claimsReturnedDialog.barcodes = + this.getCopies(rows).map(c => c.barcode()); + + this.claimsReturnedDialog.open().subscribe( + rowsModified => { + if (rowsModified) { + this.emitReloadRequest(); + } + } + ); + } }