From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 2 Sep 2016 21:01:35 +0000 (-0400)
Subject: LP#1565009 Webstaff patron search progress bar
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4b0a1aadc0780d10f58906939912d59a7ed77c56;p=working%2FEvergreen.git

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@gmail.com>
---

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 d301695df2..f7378f72bb 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 687dd3c1a8..3da96cd3d4 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
@@ -930,6 +930,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',
@@ -944,9 +947,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);