ff ui / wording improvements and i18n; show circ patron info

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2
index e5c1d62..f2aa2e9 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2
@@ -35,10 +35,8 @@
         ng-show="tab_inbound">[% l('Receive Item') %]</a></li>
       <li><a href="javascript:;" ng-click="checkin()"
         ng-show="tab_circulating && orientation_borrower">[% l('Check In') %]</a></li>
-      <!-- We need an on-shelf tab for this action to have a home
-      <li><a href="javascript:;"
-        ng-show="">Check Out</a></li>
-      -->
+      <li><a href="javascript:;" ng-click="checkout()"
+        ng-show="tab_onshelf">[% l('Check Out') %]</a></li>
       <li><a href="javascript:;" ng-click="mark_lost()"
         ng-show="tab_circulating && orientation_borrower">[% l('Mark Lost') %]</a></li>
       <li><a href="javascript:;" ng-click="print()">[% l('Print') %]</a></li>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
index f82e649..51c8b7e 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_circulating.tt2
@@ -4,10 +4,10 @@
     <div class="col-lg-6">
       <ul class="nav nav-pills">
         <li ng-class="{active : orientation_borrower}">
-          <a href="./fulfillment/borrower/{{tabname}}">For My Patrons</a>
+          <a href="./fulfillment/borrower/{{tabname}}">[% l('To My Patrons') %]</a>
         </li>
         <li ng-class="{active : orientation_lender}">
-          <a  href="./fulfillment/lender/{{tabname}}">For Other Libraries</a>
+          <a  href="./fulfillment/lender/{{tabname}}">[% l('To Other Libraries') %]</a>
         </li>
       </ul>
     </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
index 6d5e780..93c56cd 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_inbound.tt2
@@ -5,10 +5,10 @@
     <div class="col-lg-6">
       <ul class="nav nav-pills">
         <li ng-class="{active : orientation_borrower}">
-          <a  href="./fulfillment/borrower/{{tabname}}">Items For My Patrons</a>
+          <a  href="./fulfillment/borrower/{{tabname}}">[% l('ILLs For My Patrons') %]</a>
         </li>
         <li ng-class="{active : orientation_lender}">
-          <a  href="./fulfillment/lender/{{tabname}}">My Returns</a>
+          <a  href="./fulfillment/lender/{{tabname}}">[% l('My Returns') %]</a>
         </li>
       </ul>
     </div>

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 098e2a8..55aef1e 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_item_table.tt2
@@ -24,6 +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">[% l('Checkout Date') %]</th>
       <th ng-show="tab_circulating">[% l('Due Date') %]</th>
       <th ng-show="tab_circulating">[% l('Circulating Library') %]</th>
@@ -46,6 +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.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_outbound.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
index 7e61161..61759b9 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_outbound.tt2
@@ -4,10 +4,10 @@
     <div class="col-lg-6">
       <ul class="nav nav-pills">
         <li ng-class="{active : orientation_lender}">
-          <a  href="./fulfillment/lender/{{tabname}}">Items For Other Libraries</a>
+          <a  href="./fulfillment/lender/{{tabname}}">[% l('ILLs to Other Libraries') %]</a>
         </li>
         <li ng-class="{active : orientation_borrower}">
-          <a  href="./fulfillment/borrower/{{tabname}}">Returns to Other Libraries</a>
+          <a  href="./fulfillment/borrower/{{tabname}}">[% l('Returns to Other Libraries') %]</a>
         </li>
       </ul>
     </div>

diff --git a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
index 1dc247e..b42f5ee 100644 (file)
--- a/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
+++ b/Open-ILS/src/templates/staff/fulfillment/t_pending.tt2
@@ -6,10 +6,10 @@
     <div class="col-lg-6">
       <ul class="nav nav-pills">
         <li ng-class="{active : orientation_borrower}">
-          <a href="./fulfillment/borrower/{{tabname}}">[% l('Hold for My Patrons') %]</a>
+          <a href="./fulfillment/borrower/{{tabname}}">[% l('Requests By My Patrons') %]</a>
         </li>
         <li ng-class="{active : orientation_lender}">
-          <a href="./fulfillment/lender/{{tabname}}">[% l('Holds for Other Libraries') %]</a>
+          <a href="./fulfillment/lender/{{tabname}}">[% l('Requests From Other Libraries') %]</a>
         </li>
       </ul>
     </div>
@@ -36,7 +36,7 @@
         <th>[% l('Expire Date') %]</th>
         <th>[% l('Requesting Patron') %]</th>
         <th>[% l('Requesting Library') %]</th>
-        <th>[% l('Current Copy') %]</th>
+        <th>[% l('Targeted Copy') %]</th>
         <th>[% l('Copy Library') %]</th>
         <th>[% l('Title') %]</th>
       </tr>

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 2e9a25f..dfde3ef 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
+++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js
@@ -271,6 +271,7 @@ function ($scope,  $q,  $compile,  $timeout,  $rootScope, $location,
                 item.circ_stop_fines = circ.stop_fines();
                 item.circ_usr = 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.can_mark_lost = (item.circ && item.copy.status().id() == 1); // checked out
             }