From 6bea3b47313a0200086b6fdfd33df5a9af7864f1 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 14 Jul 2021 12:08:19 -0400 Subject: [PATCH] LP1936233 Circ Groups tab continued Signed-off-by: Bill Erickson --- .../staff/cat/item/recent-history.component.html | 124 ++++++++++++++++++--- .../src/app/staff/cat/item/summary.component.html | 2 +- .../eg2/src/app/staff/share/circ/circ.service.ts | 5 +- 3 files changed, 113 insertions(+), 18 deletions(-) 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 b089e5799d..e794e3a98e 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 @@ -5,6 +5,78 @@ No Previous Circ Group
+

Previous Circ Group

+
+
Patron
+
+ + {{circInfo.prevCircUser.family_name()}}, + {{circInfo.prevCircUser.first_given_name()}}, + {{circInfo.prevCircUser.second_given_name()}} + +
+
+ +
+
Total Circs
+
{{circInfo.prevCircSummary.num_circs()}}
+
+ +
+
Checkout Date
+
+ {{circInfo.prevCircSummary.start_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkout Workstation
+
{{circInfo.prevCircSummary.checkout_workstation()}}
+
+ +
+
Last Renewed On
+
+ {{circInfo.prevCircSummary.last_renewal_time() | formatValue:'timestamp'}} +
+
+ +
+
Renewal Workstation
+
{{circInfo.prevCircSummary.last_renewal_workstation()}}
+
+ +
+
Stop Fines Reason
+
{{circInfo.prevCircSummary.last_stop_fines()}}
+
+ +
+
Stop Fines Time
+
+ {{circInfo.prevCircSummary.last_stop_fines_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkin Time
+
+ {{circInfo.prevCircSummary.last_checkin_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkin Scan Time
+
+ {{circInfo.prevCircSummary.last_checkin_scan_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkin Workstation
+
{{circInfo.prevCircSummary.last_checkin_workstation()}}
+
@@ -12,11 +84,12 @@ No Recent Circ Group
+

Most Recent Circ Group

Patron
-
+
+ routerLink="/staff/circ/patron/{{circInfo.currentCirc.usr().id()}}"> {{circInfo.currentCirc.usr().family_name()}}, {{circInfo.currentCirc.usr().first_given_name()}}, {{circInfo.currentCirc.usr().second_given_name()}} @@ -32,39 +105,58 @@
Checkout Date
- - {{circInfo.circSummary.start_time() | date:format.dateTimeFormat}} - + {{circInfo.circSummary.start_time() | formatValue:'timestamp'}}
Checkout Workstation
-
- - {{circInfo.circSummary.checkout_workstation()}} - -
+
{{circInfo.circSummary.checkout_workstation()}}
Last Renewed On
- - {{circInfo.circSummary.last_renewal_time() | date:format.dateTimeFormat}} - + {{circInfo.circSummary.last_renewal_time() | formatValue:'timestamp'}}
Renewal Workstation
+
{{circInfo.circSummary.last_renewal_workstation()}}
+
+ +
+
Stop Fines Reason
+
{{circInfo.currentCirc.stop_fines()}}
+
+ +
+
Stop Fines Time
+
+ {{circInfo.currentCirc.stop_fines_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkin Time
- - {{circInfo.circSummary.last_renewal_workstation()}} - + {{circInfo.currentCirc.checkin_time() | formatValue:'timestamp'}}
+
+
Checkin Scan Time
+
+ {{circInfo.currentCirc.checkin_scan_time() | formatValue:'timestamp'}} +
+
+ +
+
Checkin Workstation
+
{{circInfo.currentCirc.checkin_workstation()}}
+
+
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 4d9065f3c0..b87b92b7b8 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 @@ -48,7 +48,7 @@
Due Date
- {{circInfo.currentCirc | egDueDatePipe}} + {{circInfo.currentCirc | egDueDate}}
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 314c748a5d..6a996850f4 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 @@ -1443,7 +1443,10 @@ export class CircService { return this.pcrud.retrieve('au', prevSummary.usr, {flesh : 1, flesh_fields : {au : ['card']}}) - .toPromise().then(user => response.prevCircUser = user); + .toPromise().then(user => { + response.prevCircUser = user; + return response; + }); } }); }); -- 2.11.0