From deb937bc82fa72272be333b1691700279a6e9116 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Tue, 24 Oct 2017 18:12:31 +0000
Subject: [PATCH] LP#1708489 Hold Shelf Print Template Additions

- Add Hold Status and Shelf Expiry Date to Hold Shelf Print
Template

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
	modified:   Open-ILS/web/js/ui/default/staff/admin/workstation/app.js

Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../share/print_templates/t_hold_shelf_list.tt2      |  6 ++++++
 .../web/js/ui/default/staff/admin/workstation/app.js | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
index 375e9b90c5..a92f45c704 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
@@ -11,6 +11,8 @@ Template for printing a list of items on the hold shelf. Fields include:
   * author
   * volume.label
   * copy.barcode
+  * status_string
+  * hold.shelf_expire_time
 
 -->
 <table id='shelf-list-template-table'>
@@ -29,6 +31,8 @@ Template for printing a list of items on the hold shelf. Fields include:
       <th>[% l('Author') %]</th>
       <th>[% l('Call Number') %]</th>
       <th>[% l('Barcode/Part') %]</th>
+      <th>[% l('Status') %]</th>
+      <th>[% l('Shelf Expire Time') %]</th>
     </tr>
   </thead>
   <tbody>
@@ -47,6 +51,8 @@ Template for printing a list of items on the hold shelf. Fields include:
       <td>{{hold_data.author}}</td>
       <td>{{hold_data.volume.label}}</td>
       <td>{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
+      <td>{{hold_data.status_string}}</td>
+      <td>{{hold_data.hold.shelf_expire_time | date:'yyyy-MM-dd HH:mm:ss'}}</td>
     </tr>
   </tbody>
 </table>
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 11510f4258..135b97bd48 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -397,7 +397,8 @@ function($scope , $q , egCore , ngToast) {
         sms_notify : '111-222-3333',
         email_notify : 'user@example.org',
         request_time : new Date().toISOString(),
-        hold_type : 'T'
+        hold_type : 'T',
+        shelf_expire_time : new Date().toISOString()
     }
 
     var seed_transit = {
@@ -517,21 +518,24 @@ function($scope , $q , egCore , ngToast) {
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'Ready for Pickup'
             },
             {
                 hold : one_hold, title : 'Some Title 2', author : 'Some Author 2',
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'Ready for Pickup'
             },
             {
                 hold : one_hold, title : 'Some Title 3', author : 'Some Author 3',
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'In Transit'
             }
         ]
     }
-- 
2.43.2