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

[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  cfb37554f48e5dcf011f1003d7792a41ef890469 (commit)
      from  7f06a7b62bdef153ceb9edf6dfddb992169d6a5a (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 cfb37554f48e5dcf011f1003d7792a41ef890469
Author: Bill Erickson <berickxx at gmail.com>
Date:   Fri Sep 2 17:01:35 2016 -0400

    LP#1565009 Webstaff patron search progress bar
    
    Displays a progress bar while waiting for results from a patron search
    in the browser client.  Bar only displays when a server-side search is
    required.  (It's not displayed for cached searches, etc.).  Results grid
    is hidden while the progress bar is visible and vice versa.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jeanette Lundgren <jlundgren at cwmars.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
index d301695..f7378f7 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_search_results.tt2
@@ -1,4 +1,19 @@
+
+<!-- patron search progress bar -->
+<div class="row" ng-show="show_search_progress">
+  <div class="col-md-6">
+    <div class="progress progress-striped active">
+      <div class="progress-bar" role="progressbar" aria-valuenow="100"
+        aria-valuemin="0" aria-valuemax="100" style="width: 100%">
+        <span class="sr-only">[% l('Loading...') %]</span>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- patron search results grid -->
 <eg-grid
+  ng-hide="show_search_progress"
   idl-class="au" id-field="id"
   features="-sort,-display,-multisort"
   main-label="[% l('Patron Search Results') %]"
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index c860364..350a48a 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -935,6 +935,9 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
             return deferred.promise;
         }
 
+        // Dispay the search progress bar to indicate a search is in progress
+        $scope.show_search_progress = true;
+
         patronSvc.patrons = [];
         egCore.net.request(
             'open-ils.actor',
@@ -949,9 +952,15 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
             fullSearch.offset
 
         ).then(
-            function() { deferred.resolve() },
+            function() {
+                // hide progress bar on 0-hits searches
+                $scope.show_search_progress = false;
+                deferred.resolve();
+            },
             null, // onerror
             function(user) {
+                // hide progress bar as soon as the first result appears.
+                $scope.show_search_progress = false;
                 patronSvc.localFlesh(user); // inline
                 patronSvc.patrons.push(user);
                 deferred.notify(user);

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

Summary of changes:
 .../staff/circ/patron/t_search_results.tt2         |   15 +++++++++++++++
 .../web/js/ui/default/staff/circ/patron/app.js     |   11 ++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS