From e5164b98987fb59df9891592030d3fac1d3f8ad7 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 22 Sep 2021 10:24:30 -0400
Subject: [PATCH] LP1919465 Avoid dupe Current Item's in pull list

* Show a value for Current Item when a hold is targeted
* Show a value for a new column on Requested Item for copy-level holds.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jennifer Weston <jennifer.weston@equinoxOLI.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 .../eg2/src/app/staff/circ/holds/pull-list.component.html |  2 +-
 .../src/eg2/src/app/staff/share/holds/grid.component.html | 15 +++++++++++----
 .../src/eg2/src/app/staff/share/holds/grid.component.ts   |  4 ++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html b/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
index a881abb9f2..5b019b5685 100644
--- a/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/holds/pull-list.component.html
@@ -4,7 +4,7 @@
 <eg-holds-grid
   persistKey="circ.holds.pull_list"
   printTemplate="hold_pull_list"
-  showFields="acpl_name,cn_full_label,p_label,author,title,cp_barcode,pl_shortname,hold_type,potentials,request_time"
+  showFields="acpl_name,cn_full_label,p_label,author,title,current_item,pl_shortname,hold_type,potentials,request_time"
   [showRecordSummary]="true"
   [enablePreFetch]="true"
   [hidePickupLibFilter]="true"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
index 3b553f1b75..8912709512 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.html
@@ -156,12 +156,20 @@
       <eg-grid-column i18n-label label="Title" [hidden]="true" name='title'
         [cellTemplate]="titleTmpl"></eg-grid-column>
 
-      <ng-template #barcodeTmpl let-hold="row">
+      <ng-template #barcodeTmpl let-hold="row" let-col="col">
         <a href="/eg/staff/cat/item/{{hold.cp_id}}/summary">
-          {{hold.cp_barcode}}
+          <ng-container *ngIf="col.name == 'current_item' && hold.current_copy">
+            {{hold.cp_barcode}}
+          </ng-container>
+          <ng-container *ngIf="col.name == 'requested_item' && isCopyHold(hold)">
+            {{hold.cp_barcode}}
+          </ng-container>
         </a>
       </ng-template>
-      <eg-grid-column i18n-label label="Current Item" name='cp_barcode'
+      <eg-grid-column i18n-label label="Current Item" name='current_item'
+        [cellTemplate]="barcodeTmpl">
+      </eg-grid-column>
+      <eg-grid-column i18n-label label="Requested Item" name='requested_item'
         [cellTemplate]="barcodeTmpl">
       </eg-grid-column>
       <eg-grid-column i18n-label label="Pickup Library" path='pl_shortname'></eg-grid-column>
@@ -260,7 +268,6 @@
       <eg-grid-column i18n-label label="Is Reference" path='cp_ref' datatype="bool" [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Is Holdable" path='cp_holdable' datatype="bool" [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Price" path='cp_price' [hidden]="true"></eg-grid-column>
-      <eg-grid-column i18n-label label="Item Barcode" path='cp_barcode' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Circulation Modifier" path='cp_circ_modifier' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Circulate as MARC Type" path='cp_circ_as_type' [hidden]="true"></eg-grid-column>
       <eg-grid-column i18n-label label="Precat Dummy Title" path='cp_dummy_title' [hidden]="true"></eg-grid-column>
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
index 630f3638b9..4b7b776b04 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/holds/grid.component.ts
@@ -597,6 +597,10 @@ export class HoldsGridComponent implements OnInit {
             }
         });
     }
+
+    isCopyHold(holdData: any): boolean {
+        return holdData.hold_type.match(/C|R|F/) !== null;
+    }
 }
 
 
-- 
2.11.0