From 0908391c0f97199fb5012daede82bd5c989c7d20 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 4 Nov 2013 10:53:20 -0500
Subject: [PATCH] ff ui / display more patron info

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2 |  8 ++++----
 Open-ILS/src/templates/staff/fulfillment/t_pending.tt2    |  6 ++++--
 Open-ILS/web/js/ui/default/staff/fulfillment/app.js       | 11 +++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
index 55aef1e6af..a8971c3ed5 100644
--- a/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
@@ -24,8 +24,8 @@
       <th ng-show="tab_onshelf">[% l('Shelf Date') %]</th>
 
       <!-- circ columns -->
-      <th ng-show="tab_circulating">[% l('Patron Name') %]</th>
-      <th ng-show="tab_circulating">[% l('Patron Barcode') %]</th>
+      <th ng-show="tab_circulating || tab_onshelf">[% l('Patron Name') %]</th>
+      <th ng-show="tab_circulating || tab_onshelf">[% l('Patron Barcode') %]</th>
       <th ng-show="tab_circulating">[% l('Checkout Date') %]</th>
       <th ng-show="tab_circulating">[% l('Due Date') %]</th>
       <th ng-show="tab_circulating">[% l('Circulating Library') %]</th>
@@ -48,8 +48,8 @@
       <td ng-show="tab_inbound || tab_outbound">{{item.transit_source}}</td>
       <td ng-show="tab_inbound || tab_outbound">{{item.transit_dest}}</td>
       <td ng-show="tab_onshelf">{{item.hold_shelf_time | date}}</td>
-      <td ng-show="tab_circulating">{{item.circ_usr_name}}</td>
-      <td ng-show="tab_circulating">{{item.circ_usr}}</td>
+      <td ng-show="tab_circulating">{{item.patron_name}}</td>
+      <td ng-show="tab_circulating">{{item.patron_card}}</td>
       <td ng-show="tab_circulating">{{item.circ_xact_start | date}}</td>
       <td ng-show="tab_circulating">{{item.due_date | date}}</td>
       <td ng-show="tab_circulating">{{item.circ_circ_lib}}</td>
diff --git a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
index b42f5eee4f..aa6fca52f1 100644
--- a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
@@ -34,7 +34,8 @@
         <th>[% l('ID') %]</th>
         <th>[% l('Request Date') %]</th>
         <th>[% l('Expire Date') %]</th>
-        <th>[% l('Requesting Patron') %]</th>
+        <th>[% l('Patron Name') %]</th>
+        <th>[% l('Patron Barcode') %]</th>
         <th>[% l('Requesting Library') %]</th>
         <th>[% l('Targeted Copy') %]</th>
         <th>[% l('Copy Library') %]</th>
@@ -47,7 +48,8 @@
         <td>{{item.id}}</td>
         <td>{{item.request_time | date}}</td>
         <td>{{item.expire_time | date}}</td>
-        <td>{{item.user_name}}</td>
+        <td>{{item.patron_name}}</td>
+        <td>{{item.patron_card}}</td>
         <td>{{item.request_lib}}</td>
         <td><a 
           href="./fulfillment/status/{{item.current_copy_enc}}">
diff --git a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
index dfde3efb61..d0f1041e81 100644
--- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
+++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
@@ -269,16 +269,18 @@ function ($scope,  $q,  $compile,  $timeout,  $rootScope, $location,
                 item.circ_circ_lib = egOrg.get(circ.circ_lib()).shortname();
                 item.circ_xact_start = circ.xact_start();
                 item.circ_stop_fines = circ.stop_fines();
-                item.circ_usr = circ.usr().card() ? 
+                // FF patrons will all have cards, but some test logins may not
+                item.patron_card = circ.usr().card() ? 
                     circ.usr().card().barcode() : circ.usr().usrname();
-                item.circ_usr_name = circ.usr().first_given_name() + ' ' + circ.usr().family_name() // i18n
+                item.patron_name = circ.usr().first_given_name() + ' ' + circ.usr().family_name() // i18n
                 item.can_mark_lost = (item.circ && item.copy.status().id() == 1); // checked out
             }
 
             if (hold) {
                 item.hold = hold;
-                item.hold_request_usr = hold.usr().card() ? 
+                item.patron_card = hold.usr().card() ? 
                     hold.usr().card().barcode() : hold.usr().usrname();
+                item.patron_name = hold.usr().first_given_name() + ' ' + hold.usr().family_name() // i18n
                 item.hold_request_lib = egOrg.get(hold.request_lib()).shortname();
                 item.hold_pickup_lib = egOrg.get(hold.pickup_lib()).shortname();
                 item.hold_request_time = hold.request_time();
@@ -754,7 +756,8 @@ function ($scope,  $q,  $route,  egNet,  egAuth,  egPCRUD,  egOrg,  orgSelector)
         var hold = display.hold = hold_blob.hold;
         display.request_time = hold.hold_request_time = hold.request_time();
         display.expire_time = hold.expire_time();
-        display.user_name = display.hold_request_usr = 
+        display.patron_card = hold_blob.patron_barcode;
+        display.patron_name = display.hold_request_usr = 
           (hold_blob.patron_first || '') + 
             ' ' + (hold_blob.patron_last || '');
         display.request_lib = display.hold_request_lib = 
-- 
2.11.0