From b804ec50b6baf57b587f2b82a0561a18e1f32e94 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Thu, 13 May 2021 12:36:28 -0400
Subject: [PATCH] LP1928363 Item circ info for Holdings tab

Adds "Total Circ Count" and "Last Circ Date" columns to the staff
catalog Holdings grid.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Chrisy Schroth <chrisy.schroth@kentonlibrary.org>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 Open-ILS/examples/fm_IDL.xml                               | 7 ++++++-
 .../src/app/staff/catalog/record/holdings.component.html   | 6 ++++++
 .../eg2/src/app/staff/catalog/record/holdings.component.ts | 3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 32816d90d9..ee7e69ec7e 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -10878,7 +10878,7 @@ SELECT  usr,
 			<link field="id" reltype="has_a" key="id" map="" class="bre"/>
 		</links>
 	</class>
-	<class id="erfcc" controller="open-ils.reporter-store" oils_obj:fieldmapper="extend_reporter::full_circ_count" oils_persist:tablename="extend_reporter.full_circ_count" reporter:label="Total Circulation Count, Including Legacy">
+	<class id="erfcc" controller="open-ils.reporter-store open-ils.pcrud" oils_obj:fieldmapper="extend_reporter::full_circ_count" oils_persist:tablename="extend_reporter.full_circ_count" reporter:label="Total Circulation Count, Including Legacy">
 		<fields oils_persist:primary="id">
 			<field reporter:label="Copy ID" name="id" reporter:datatype="int" />
 			<field reporter:label="Total Circulation Count" name="circ_count" reporter:datatype="int" />
@@ -10886,6 +10886,11 @@ SELECT  usr,
 		<links>
 			<link field="id" reltype="has_a" key="id" map="" class="acp"/>
 		</links>
+		<permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+			<actions>
+				<retrieve permission="STAFF_LOGIN" context_field="circ_lib"/>
+			</actions>
+		</permacrud>
 	</class>
 	<class id="erccpo" controller="open-ils.reporter-store" oils_obj:fieldmapper="extend_reporter::copy_count_per_org" oils_persist:tablename="extend_reporter.copy_count_per_org" reporter:label="Library Holdings Count with Deleted">
 		<fields oils_persist:primary="bibid">
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
index 72e4df00b2..075163ae18 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.html
@@ -311,6 +311,12 @@
     <eg-grid-column i18n-label label="Active/Create Date" 
       path="copy.active_date" datatype="timestamp">
     </eg-grid-column>
+    <eg-grid-column i18n-label label="Total Circ Count"
+      path="copy.total_circ_count.circ_count">
+    </eg-grid-column>
+    <eg-grid-column i18n-label label="Last Circ Date"
+      path="copy.last_circ.last_circ" datatype="timestamp">
+    </eg-grid-column>
     <eg-grid-column i18n-label label="Age Hold Protection" 
       path="copy.age_protect.name" name="age_protect.name"></eg-grid-column>
     <eg-grid-column i18n-label label="Item Price" 
diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts
index d0273a5c27..07fb393c45 100644
--- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts
@@ -531,7 +531,8 @@ export class HoldingsMaintenanceComponent implements OnInit {
                     flesh: 3,
                     flesh_fields: {
                         acp: ['status', 'location', 'circ_lib', 'parts', 'notes',
-                            'tags', 'age_protect', 'copy_alerts', 'latest_inventory'],
+                            'tags', 'age_protect', 'copy_alerts', 'latest_inventory',
+                            'total_circ_count', 'last_circ'],
                         acn: ['prefix', 'suffix', 'copies'],
                         acli: ['inventory_workstation']
                     }
-- 
2.43.2