From 8d12a5adbfcb7a7be1bdf8bde714ec383b5caa83 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 24 Feb 2017 12:12:21 -0500
Subject: [PATCH] LP#1522638 Patron search uses progress modal

Use the progress modal dialog in the web staff patron search UI for
consistency / code re-use.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../staff/circ/patron/t_search_results.tt2    | 13 -------------
 .../js/ui/default/staff/circ/patron/app.js    | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 21 deletions(-)

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 a5a58af774..cec4dd7085 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,19 +1,6 @@
 
-<!-- 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 c00d5a5b5c..8a8e326b68 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
@@ -816,10 +816,10 @@ function($scope , $location , egCore , egConfirmDialog , egUser , patronSvc) {
 .controller('PatronSearchCtrl',
        ['$scope','$q','$routeParams','$timeout','$window','$location','egCore',
        '$filter','egUser', 'patronSvc','egGridDataProvider','$document',
-       'egPatronMerge',
+       'egPatronMerge','egProgressDialog',
 function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
         $filter,  egUser,  patronSvc , egGridDataProvider , $document,
-        egPatronMerge) {
+        egPatronMerge , egProgressDialog) {
 
     $scope.initTab('search');
     $scope.focusMe = true;
@@ -980,8 +980,13 @@ 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;
+        if (!Object.keys(fullSearch.search).length) {
+            // Empty searches are rejected by the server.  Avoid 
+            // running the the empty search that runs on page load. 
+            return $q.when();
+        }
+
+        egProgressDialog.open(); // Indeterminate
 
         patronSvc.patrons = [];
         egCore.net.request(
@@ -998,19 +1003,17 @@ function($scope,  $q,  $routeParams,  $timeout,  $window,  $location,  egCore,
 
         ).then(
             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;
+                egProgressDialog.close();
                 patronSvc.localFlesh(user); // inline
                 patronSvc.patrons.push(user);
                 deferred.notify(user);
             }
-        );
+        )['finally'](egProgressDialog.close); // close on 0-hits or error
 
         return deferred.promise;
     };
-- 
2.43.2