From 4da9abaf2108dbf1d6c7201c1d71852704ac063b Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 15 Jun 2020 11:48:11 -0400
Subject: [PATCH] LP#1879983: each tab now has a Items for Pickup / Items
 Checked Out column

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../src/templates/staff/circ/curbside/t_arrived_manager.tt2 |  3 +++
 .../templates/staff/circ/curbside/t_delivered_manager.tt2   | 13 ++++++++-----
 .../src/templates/staff/circ/curbside/t_staged_manager.tt2  |  3 +++
 .../staff/circ/curbside/t_to_be_staged_manager.tt2          |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/curbside/t_arrived_manager.tt2 b/Open-ILS/src/templates/staff/circ/curbside/t_arrived_manager.tt2
index bdc350bdb1..aeb415213f 100644
--- a/Open-ILS/src/templates/staff/circ/curbside/t_arrived_manager.tt2
+++ b/Open-ILS/src/templates/staff/circ/curbside/t_arrived_manager.tt2
@@ -27,6 +27,9 @@
       </div>
     </eg-grid-field>
     <eg-grid-field label="[% l('Appointment ID') %]" path="slot.id"></eg-grid-field>
+    <eg-grid-field label="[% l('Items for Pickup') %]" path="holds" compiled>
+      <eg-curbside-holds-list holds="item.holds" bib-data="item.bib_data_by_hold" slot="item.slot"></eg-curbside-holds-list>
+    </eg-grid-field>
     <eg-grid-field label="[% l('Action') %]" handlers="gridCellHandlers" compiled>
       <button class="btn btn-sm btn-primary"
         ng-disabled="col.handlers.wasHandled(item['slot_id']) || col.handlers.patronIsBlocked(item['slot'].patron())"
diff --git a/Open-ILS/src/templates/staff/circ/curbside/t_delivered_manager.tt2 b/Open-ILS/src/templates/staff/circ/curbside/t_delivered_manager.tt2
index 340cd7c768..2b1e00b5de 100644
--- a/Open-ILS/src/templates/staff/circ/curbside/t_delivered_manager.tt2
+++ b/Open-ILS/src/templates/staff/circ/curbside/t_delivered_manager.tt2
@@ -12,17 +12,20 @@
     <eg-grid-menu-item handler="refresh_delivered" standalone="true"
         label="[% l('Refresh List')%]"></eg-grid-menu-item>
 
-    <eg-grid-field label="[% l('Delivery Date/Time') %]" path="delivered" datatype="timestamp"></eg-grid-field>
-    <eg-grid-field label="[% l('Patron') %]" path="patron" compiled>
-      <a href="./circ/patron/{{item.patron().id()}}/holds" target="_blank">
-        {{item.patron().family_name()}} / {{item.patron().card().barcode()}}
+    <eg-grid-field label="[% l('Delivery Date/Time') %]" path="slot.delivered" datatype="timestamp"></eg-grid-field>
+    <eg-grid-field label="[% l('Patron') %]" path="slot.patron" compiled>
+      <a href="./circ/patron/{{item.slot.patron().id()}}/holds" target="_blank">
+        {{item.slot.patron().family_name()}} / {{item.slot.patron().card().barcode()}}
         <span class="glyphicon glyphicon-new-window"></span>
       </a>
       <br>
-      <span ng-show="item.notes()">
+      <span ng-show="item.slot.notes()">
         <strong>[% l('Notes:') %]</strong> {{item.notes()}}
       </span>
     </eg-grid-field>
     <eg-grid-field label="[% l('Appointment ID') %]" path="id"></eg-grid-field>
+    <eg-grid-field label="[% l('Items Checked Out') %]" path="holds" compiled>
+      <eg-curbside-holds-list holds="item.holds" bib-data="item.bib_data_by_hold" slot="item.slot"></eg-curbside-holds-list>
+    </eg-grid-field>
   </eg-grid>
 </div>
diff --git a/Open-ILS/src/templates/staff/circ/curbside/t_staged_manager.tt2 b/Open-ILS/src/templates/staff/circ/curbside/t_staged_manager.tt2
index 9d3c580bdd..1615553c0f 100644
--- a/Open-ILS/src/templates/staff/circ/curbside/t_staged_manager.tt2
+++ b/Open-ILS/src/templates/staff/circ/curbside/t_staged_manager.tt2
@@ -27,6 +27,9 @@
       </div>
     </eg-grid-field>
     <eg-grid-field label="[% l('Appointment ID') %]" path="slot.id"></eg-grid-field>
+    <eg-grid-field label="[% l('Items for Pickup') %]" path="holds" compiled>
+      <eg-curbside-holds-list holds="item.holds" bib-data="item.bib_data_by_hold" slot="item.slot"></eg-curbside-holds-list>
+    </eg-grid-field>
     <eg-grid-field label="[% l('Action') %]" handlers="gridCellHandlers" compiled>
       <div class="row">
         <div class="col-xs-12">
diff --git a/Open-ILS/src/templates/staff/circ/curbside/t_to_be_staged_manager.tt2 b/Open-ILS/src/templates/staff/circ/curbside/t_to_be_staged_manager.tt2
index 9fd0acbf77..d0bd9da77a 100644
--- a/Open-ILS/src/templates/staff/circ/curbside/t_to_be_staged_manager.tt2
+++ b/Open-ILS/src/templates/staff/circ/curbside/t_to_be_staged_manager.tt2
@@ -28,7 +28,7 @@
     </eg-grid-field>
     <eg-grid-field label="[% l('Appointment ID') %]" path="slot.id"></eg-grid-field>
     <eg-grid-field label="[% l('Items for Pickup') %]" path="holds" compiled>
-      <eg-curbside-holds-list holds="item.holds" bib-data="item.bib_data_by_hold"></eg-curbside-holds-list>
+      <eg-curbside-holds-list holds="item.holds" bib-data="item.bib_data_by_hold" slot="item.slot"></eg-curbside-holds-list>
     </eg-grid-field>
     <eg-grid-field label="[% l('Staging Staff') %]" path="slot.stage_staff" handlers="gridCellHandlers" compiled>
       {{item.slot.stage_staff().usrname()}}
-- 
2.11.0