From 0c3586ebc14fdce9ca39d82eec75ae467e75fada Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Thu, 30 Oct 2014 09:57:11 -0400
Subject: [PATCH] Add patron barcode and alias to hold lists where appropriate

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2      |  3 +++
 Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 |  4 ++++
 Open-ILS/web/js/ui/default/staff/circ/services/holds.js   | 10 ++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
index 62af9180d0..b21146d9ea 100644
--- a/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
+++ b/Open-ILS/src/templates/staff/cat/catalog/t_holds.tt2
@@ -59,6 +59,8 @@
       </a>
     </eg-grid-field>
 
+    <eg-grid-field label="[% l('Patron Barcode') %]">{{item.patron_barcode}}</eg-grid-field>
+    <eg-grid-field label="[% l('Patron alias') %]">{{item.patron_alias}}</eg-grid-field>
     <eg-grid-field label="[% l('Request Date') %]" path='hold.request_time'></eg-grid-field>
     <eg-grid-field label="[% l('Capture Date') %]" path='hold.capture_time'></eg-grid-field>
     <eg-grid-field label="[% l('Available Date') %]" path='hold.shelf_time'></eg-grid-field>
@@ -78,6 +80,7 @@
     <eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
     <eg-grid-field path='hold.*' parent-idl-class="ahr" hidden></eg-grid-field>
     <eg-grid-field path='copy.*' parent-idl-class="acp" hidden></eg-grid-field>
+    <eg-grid-field path='hold.usr.*' parent-idl-class="acp" hidden></eg-grid-field>
     <eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
     <eg-grid-field path='mvr.*' parent-idl-class="mvr" hidden></eg-grid-field>
   </eg-grid>
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
index df026fa945..6a61744849 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_holds_list.tt2
@@ -48,6 +48,8 @@
     </a>
   </eg-grid-field>
 
+  <eg-grid-field label="[% l('Patron Barcode') %]" hidden>{{item.patron_barcode}}</eg-grid-field>
+  <eg-grid-field label="[% l('Patron alias') %]" hidden>{{item.patron_alias}}</eg-grid-field>
   <eg-grid-field label="[% l('Request Date') %]" path='hold.request_time'></eg-grid-field>
   <eg-grid-field label="[% l('Capture Date') %]" path='hold.capture_time'></eg-grid-field>
   <eg-grid-field label="[% l('Available Date') %]" path='hold.shelf_time'></eg-grid-field>
@@ -67,6 +69,8 @@
   <eg-grid-field label="[% l('Queue Position') %]" path='queue_position' hidden></eg-grid-field>
   <eg-grid-field path='hold.*' parent-idl-class="ahr" hidden></eg-grid-field>
   <eg-grid-field path='copy.*' parent-idl-class="acp" hidden></eg-grid-field>
+  <eg-grid-field path='hold.usr.*' parent-idl-class="au" hidden></eg-grid-field>
+  <eg-grid-field path='hold.usr.card.*' parent-idl-class="ac" hidden></eg-grid-field>
   <eg-grid-field path='volume.*' parent-idl-class="acn" hidden></eg-grid-field>
   <eg-grid-field path='mvr.*' parent-idl-class="mvr" hidden></eg-grid-field>
 </eg-grid>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
index 161722c6a7..a22201818c 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js
@@ -6,8 +6,8 @@ angular.module('egCoreMod')
 
 .factory('egHolds',
 
-       ['$modal','$q','egCore','egAlertDialog','egConfirmDialog','egAlertDialog',
-function($modal , $q , egCore , egAlertDialog , egConfirmDialog , egAlertDialog) {
+       ['$modal','$q','egCore','egUser','egConfirmDialog','egAlertDialog',
+function($modal , $q , egCore , egUser , egConfirmDialog , egAlertDialog) {
 
     var service = {};
 
@@ -366,6 +366,12 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog , egAlertDialog)
         hold.current_shelf_lib(egCore.org.get(hold.current_shelf_lib()));
         hold_data.id = hold.id();
 
+        if (hold.requestor() && typeof hold.requestor() != 'object')
+            hold.requestor(egUser.get(hold.requestor()));
+
+        if (hold.usr() && typeof hold.usr() != 'object')
+            hold.usr(egUser.get(hold.usr()));
+
         // current_copy is not always fleshed in the API
         if (hold.current_copy() && typeof hold.current_copy() != 'object')
             hold.current_copy(hold_data.copy);
-- 
2.11.0