From: Bill Erickson Date: Wed, 14 Jul 2021 22:06:01 +0000 (-0400) Subject: LP1936233 Holds/transit tab X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b7203c51ba7e2feb8de2be90c2520926e9774b7d;p=working%2FEvergreen.git LP1936233 Holds/transit tab 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 44d09876e1..5ab74145a8 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 @@ -26,7 +26,7 @@
Check Out Date
- {{circ.xact_start() | formatValue:'timestamp'}} + {{circ.xact_start() | egDateTime}}
Due Date
@@ -34,11 +34,11 @@
Stop Fines Time
- {{circ.stop_fines_time() | formatValue:'timestamp'}} + {{circ.stop_fines_time() | egDateTime}}
Checkin Time
- {{circ.checkin_time() | formatValue:'timestamp'}} + {{circ.checkin_time() | egDateTime}}
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.html new file mode 100644 index 0000000000..44738091df --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.html @@ -0,0 +1,119 @@ + +
+
+
+ Item is not captured for a hold +
+
+

Captured Hold Info

+
+
Patron
+
+ + {{hold.usr().family_name()}}, + {{hold.usr().first_given_name()}}, + {{hold.usr().second_given_name()}} : + {{hold.usr().card().barcode()}} + +
+
+
+
Requestor
+
+ + {{hold.requestor().family_name()}}, + {{hold.requestor().first_given_name()}}, + {{hold.requestor().second_given_name()}} : + {{hold.requestor().card().barcode()}} + +
+
+
+
Pickup Lib
+
{{hold.pickup_lib().shortname()}}
+
+
+
Current Shelf Lib
+
+ + {{hold.current_shelf_lib().shortname()}} + +
+
+
+
Request Date
+
+ {{hold.request_time() | egDateTime}} +
+
+
+
Capture Date
+
+ {{hold.capture_time() | egDateTime}} +
+
+
+
Shelf Time
+
+ {{hold.shelf_time() | egDateTime}} +
+
+
+
Shelf Expire Time
+
+ {{hold.shelf_expire_time() | egDateTime}} +
+
+
+
Hold Expire Time
+
+ {{hold.expire_time() | egDateTime}} +
+
+
+
Behind Desk
+
+ +
+
+
+
+
+
+ Item has not transited +
+
+

Most Recent Transit

+ +
+
Transit Source
+
{{transit.source().shortname()}}
+
+
+
Transit Destination
+
{{transit.dest().shortname()}}
+
+
+
Transit Send Time
+
+ {{transit.source_send_time() | egDateTime}} +
+
+
+
Transit Receive Time
+ {{transit.dest_recv_time() | egDateTime}} +
+
+
+
+
Transit Cancel Time
+
+ {{transit.cancel_time() | egDateTime}} +
+
+
+
+
+ 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 new file mode 100644 index 0000000000..822c714601 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/holds.component.ts @@ -0,0 +1,66 @@ +import {Component, Input, OnInit, AfterViewInit, ViewChild} from '@angular/core'; +import {Router, ActivatedRoute, ParamMap} from '@angular/router'; +import {tap, concatMap} from 'rxjs/operators'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {PcrudService} from '@eg/core/pcrud.service'; +import {AuthService} from '@eg/core/auth.service'; +import {NetService} from '@eg/core/net.service'; +import {OrgService} from '@eg/core/org.service'; +import {EventService} from '@eg/core/event.service'; + +@Component({ + selector: 'eg-item-holds-transits', + templateUrl: 'holds.component.html' +}) + +export class ItemHoldsTransitsComponent implements OnInit { + + @Input() item: IdlObject; + hold: IdlObject; + transit: IdlObject; + loading = true; + + constructor( + private router: Router, + private route: ActivatedRoute, + private net: NetService, + private org: OrgService, + private pcrud: PcrudService, + private auth: AuthService, + private idl: IdlService, + private evt: EventService + ) { } + + ngOnInit() { + this.load(); + } + + load(): Promise { + this.loading = true; + + return this.pcrud.search('ahr', { + current_copy: 2523, + cancel_time: null, + fulfillment_time: null, + capture_time: {'<>': null} + }, { + flesh: 2, + flesh_fields: {ahr: ['requestor', 'usr'], au: ['card']} + }).pipe(concatMap(hold => { + hold.pickup_lib(this.org.get(hold.pickup_lib())); + hold.current_shelf_lib(this.org.get(hold.current_shelf_lib())); + this.hold = hold; + 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())); + transit.dest(this.org.get(transit.dest())); + this.transit = transit; + })) + .toPromise().then(_ => this.loading = false); + } +} + 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 28d527cb92..3204e52a16 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 @@ -12,6 +12,7 @@ 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'; @NgModule({ declarations: [ @@ -19,6 +20,7 @@ import {ItemCircHistoryComponent} from './circ-history.component'; ItemSummaryComponent, ItemStatusComponent, ItemRecentHistoryComponent, + ItemHoldsTransitsComponent, ItemCircHistoryComponent ], imports: [ diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html index 39b30dcb47..d0c2c5848f 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/recent-history.component.html @@ -26,7 +26,7 @@
Checkout Date
- {{circInfo.prevCircSummary.start_time() | formatValue:'timestamp'}} + {{circInfo.prevCircSummary.start_time() | egDateTime}}
@@ -38,7 +38,7 @@
Last Renewed On
- {{circInfo.prevCircSummary.last_renewal_time() | formatValue:'timestamp'}} + {{circInfo.prevCircSummary.last_renewal_time() | egDateTime}}
@@ -55,27 +55,29 @@
Stop Fines Time
- {{circInfo.prevCircSummary.last_stop_fines_time() | formatValue:'timestamp'}} + {{circInfo.prevCircSummary.last_stop_fines_time() | egDateTime}}
Checkin Time
- {{circInfo.prevCircSummary.last_checkin_time() | formatValue:'timestamp'}} + {{circInfo.prevCircSummary.last_checkin_time() | egDateTime}}
Checkin Scan Time
- {{circInfo.prevCircSummary.last_checkin_scan_time() | formatValue:'timestamp'}} + {{circInfo.prevCircSummary.last_checkin_scan_time() | egDateTime}}
Checkin Workstation
-
{{circInfo.prevCircSummary.last_checkin_workstation()}}
+
+ {{circInfo.prevCircSummary.last_checkin_workstation()}} +
@@ -105,7 +107,7 @@
Checkout Date
- {{circInfo.circSummary.start_time() | formatValue:'timestamp'}} + {{circInfo.circSummary.start_time() | egDateTime}}
@@ -117,7 +119,7 @@
Last Renewed On
- {{circInfo.circSummary.last_renewal_time() | formatValue:'timestamp'}} + {{circInfo.circSummary.last_renewal_time() | egDateTime}}
@@ -134,27 +136,31 @@
Stop Fines Time
- {{circInfo.currentCirc.stop_fines_time() | formatValue:'timestamp'}} + {{circInfo.currentCirc.stop_fines_time() | egDateTime}}
Checkin Time
- {{circInfo.currentCirc.checkin_time() | formatValue:'timestamp'}} + {{circInfo.currentCirc.checkin_time() | egDateTime}}
Checkin Scan Time
- {{circInfo.currentCirc.checkin_scan_time() | formatValue:'timestamp'}} + {{circInfo.currentCirc.checkin_scan_time() | egDateTime}}
Checkin Workstation
-
{{circInfo.currentCirc.checkin_workstation()}}
+
+ + {{circInfo.currentCirc.checkin_workstation().name()}} + +
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 6a619b5bd8..f33d454cd1 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 @@ -50,6 +50,12 @@ +
  • + Holds / Transits + + + +
    • diff --git a/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html b/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html index b87b92b7b8..86d90e5a25 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/item/summary.component.html @@ -72,7 +72,7 @@
    Checkout Date
    - {{circInfo.circSummary.start_time() | date:'shortDate'}} + {{circInfo.circSummary.start_time() | egDateTime}}
    @@ -110,7 +110,7 @@
    Date Created
    -
    {{item.create_date() | date:'shortDate'}}
    +
    {{item.create_date() | egDateTime}}
    Fine Level
    Low
    @@ -131,7 +131,7 @@
    Date Active
    -
    {{item.active_date() | date:'shortDate'}}
    +
    {{item.active_date() | egDate}}
    Reference
    @@ -149,7 +149,7 @@
    Status Changed
    -
    {{item.status_changed_time() | date:'shortDate'}}
    +
    {{item.status_changed_time() | egDateTime}}
    OPAC Visible
    @@ -179,7 +179,7 @@
    {{circInfo.currentCirc.checkin_time() || - circInfo.circSummary.last_checkin_time() | date:'shortDate'}} + circInfo.circSummary.last_checkin_time() | egDateTime}}
    @@ -206,7 +206,7 @@
    {{circInfo.currentCirc.checkin_scan_time() || - circInfo.circSummary.last_checkin_scan_time() | date:'shortDate'}} + circInfo.circSummary.last_checkin_scan_time() | egDateTime}}
    @@ -251,7 +251,7 @@
    Inventory Date
    - {{item.latest_inventory().inventory_date() | date:'shortDate'}} + {{item.latest_inventory().inventory_date() | egDateTime}}