[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0dc43cfbc5f245272ae4b689eaeae1c94b01edca

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  0dc43cfbc5f245272ae4b689eaeae1c94b01edca (commit)
      from  0f507bd002605883c347cb0e235d3837c491edb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0dc43cfbc5f245272ae4b689eaeae1c94b01edca
Author: Terran McCanna <tmccanna at georgialibraries.org>
Date:   Tue Mar 5 12:34:49 2019 -0500

    LP#1818576 Offline Noncataloged Checkout Preview
    
    This adds the noncataloged type and number to the right-hand
    preview when doing an offline checkout. (Prior to this, the
    display was blank if there was no barcode.)
    
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Garry Collum <gcollum at gmail.com>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/templates/staff/offline-interface.tt2 b/Open-ILS/src/templates/staff/offline-interface.tt2
index fafc74e12b..dc7b56ba9b 100644
--- a/Open-ILS/src/templates/staff/offline-interface.tt2
+++ b/Open-ILS/src/templates/staff/offline-interface.tt2
@@ -358,7 +358,10 @@
               <tbody>
                 <tr ng-repeat="xact in xact_page.checkout track by $index">
                   <td>{{xact.patron_barcode}}</td>
-                  <td>{{xact.barcode}}</td>
+                  <td>
+                      <div ng-if="xact.barcode">{{xact.barcode}}</div>
+                      <div ng-if="!xact.barcode">{{lookupNoncatTypeName(xact.noncat_type)}} ({{xact.noncat_count}})</div>
+                  </td>
                   <td>{{xact.due_date | date:'shortDate'}}</td>
                 </tr>
               </tbody>
diff --git a/Open-ILS/web/js/ui/default/staff/offline.js b/Open-ILS/web/js/ui/default/staff/offline.js
index 7ab361f34b..7d80de6d5f 100644
--- a/Open-ILS/web/js/ui/default/staff/offline.js
+++ b/Open-ILS/web/js/ui/default/staff/offline.js
@@ -330,6 +330,12 @@ function($routeProvider , $locationProvider , $compileProvider) {
             egCore.hatch.setItem('eg.offline.print_receipt', $scope.do_print)
         }
 
+        $scope.lookupNoncatTypeName = function (type) {
+            var nc =  $scope.noncats.filter(function(n){ return n.id() == type })[0];
+            if (nc) return nc.name();
+            return '';
+        }
+
         $scope.logged_in = egCore.auth.token() ? true : false;
 
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/staff/offline-interface.tt2 | 5 ++++-
 Open-ILS/web/js/ui/default/staff/offline.js        | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evergreen ILS