From 10131e379f5ef46d8172d1b03b9fc85ab5ad3821 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 19 Feb 2019 14:10:57 -0500 Subject: [PATCH] LP1806087 Catalog holds display WIP (detail page) Signed-off-by: Bill Erickson --- .../share/holds-grid/hold-detail.component.html | 154 ++++++++++++--------- .../share/holds-grid/hold-detail.component.ts | 11 +- .../share/holds-grid/holds-grid.component.html | 3 +- 3 files changed, 100 insertions(+), 68 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.html index 1bee0eb9b5..daeeb8957c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.html @@ -2,74 +2,98 @@ -
-
Request Date
-
{{hold.request_time | formatValue:'timestamp'}}
-
Capture Date
-
{{hold.capture_time | formatValue:'timestamp'}}
-
Available On
-
{{hold.shelf_time | formatValue:'timestamp'}}
+
+
+ +
-
-
hold Type
-
- {{hold.hold_type}} - + +
+
+
Request Date
+
{{hold.request_time | formatValue:'timestamp'}}
+
Capture Date
+
{{hold.capture_time | formatValue:'timestamp'}}
+
Available On
+
{{hold.shelf_time | formatValue:'timestamp'}}
-
Current Item
-
- {{hold.cp_barcode}} +
+
hold Type
+
+ {{hold.hold_type}} + +
+
Current Item
+
+ {{hold.cp_barcode}} +
+
Call Number
+
{{hold.cn_full_label}}
-
Call Number
-
{{hold.cn_full_label}}
-
-
-
Pickup Lib
-
{{getOrgName(hold.pickup_lib)}}
-
Status
-
- -
Unknown Error
-
Waiting for Item
-
Waiting for Capture
-
In Transit
-
Ready for Pickup
-
Hold Shelf Delay
-
Canceled
-
Suspended
-
Wrong Shelf
-
Fulfilled
- +
+
Pickup Lib
+
{{hold.pl_shortname}}
+
Status
+
+ +
Unknown Error
+
Waiting for Item
+
Waiting for Capture
+
In Transit
+
Ready for Pickup
+
Hold Shelf Delay
+
Canceled
+
Suspended
+
Wrong Shelf
+
Fulfilled
+ +
+
Behind Desk
+
{{hold.behind_desk == '1'}}
+
+
+
Current Shelf Lib
+
{{getOrgName(hold.current_shelf_lib)}}
+
Current Shelving Location
+
{{hold.acpl_name}}
+
Force Item Quality
+
{{hold.mint_condition == '1'}}
+
+
+
Email Notify
+
{{hold.email_notify == '1'}}
+
Phone Notify
+
{{hold.phone_notify}}
+
SMS Notify
+
{{hold.sms_notify}}
+
+
+
Cancel Cause
+
{{hold.cancel_cause}}
+
Cancel Time
+
{{hold.cancel_time | formatValue:'timestamp'}}
+
Cancel Note
+
{{hold.cancel_note}}
+
+
+
Patron Name
+
+ + {{hold.usr_display_name}} + +
+ +
Patron Barcode
+
+ + {{hold.ucard_barcode}} + +
+ +
+
-
Behind Desk
-
{{hold.behind_desk == '1'}}
-
- diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.ts index 0bb25a9c69..ea5d171687 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/hold-detail.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, Input, ViewChild} from '@angular/core'; +import {Component, OnInit, Input, Output, ViewChild, EventEmitter} from '@angular/core'; import {Observable, Observer, of} from 'rxjs'; import {map, filter} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; @@ -27,12 +27,15 @@ export class HoldDetailComponent implements OnInit { } initDone: boolean; + @Output() onShowList: EventEmitter; constructor( private net: NetService, private org: OrgService, private auth: AuthService, - ) {} + ) { + this.onShowList = new EventEmitter(); + } ngOnInit() { this.initDone = true; @@ -56,6 +59,10 @@ export class HoldDetailComponent implements OnInit { return this.org.get(id).shortname(); } } + + showListView() { + this.onShowList.emit(); + } } diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/holds-grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/holds-grid.component.html index 79d2b015ec..d52bd0855f 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/holds-grid/holds-grid.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/holds-grid/holds-grid.component.html @@ -5,7 +5,8 @@
- + + -- 2.11.0