From f6a83ecfc6b89abd7fc99d60a262c0cc2308f5a4 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 7 Mar 2017 12:44:37 -0500
Subject: [PATCH] LP#1670427 Patron edit uses progress dialog

Replace ad-hoc loading progress indicator with egProgressDialog.
Similarly, display a egProgressDialog-based indicator during patron
load.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2    | 12 ------------
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js | 12 ++++++++----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 69da8b6464..f5ccf4dc38 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -121,18 +121,6 @@ MACRO draw_form_input(cls, field, path, type, disable) BLOCK;
   </span>
 [% END %]
 
-<!-- progress dialog displayed as we await all data to finish loading -->
-<div class="row" ng-show="!page_data_loaded">
-  <div class="col-md-6 pad-vert">
-    <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>
-
 <!--  
 MAIN FORM
 This div wraps the entire form so we can hide it until all needed data
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index f0a45cddb3..8479548bef 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -1091,12 +1091,14 @@ angular.module('egCoreMod')
 .controller('PatronRegCtrl',
        ['$scope','$routeParams','$q','$uibModal','$window','egCore',
         'patronSvc','patronRegSvc','egUnloadPrompt','egAlertDialog',
-        'egWorkLog',
+        'egWorkLog','egProgressDialog',
 function($scope , $routeParams , $q , $uibModal , $window , egCore ,
          patronSvc , patronRegSvc , egUnloadPrompt, egAlertDialog ,
-         egWorkLog) {
+         egWorkLog , egProgressDialog) {
 
+    egProgressDialog.open();
     $scope.page_data_loaded = false;
+
     $scope.clone_id = patronRegSvc.clone_id = $routeParams.clone_id;
     $scope.stage_username = 
         patronRegSvc.stage_username = $routeParams.stage_username;
@@ -1216,7 +1218,8 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
         if ($scope.patron.isnew) 
             set_new_patron_defaults(prs);
 
-        $scope.page_data_loaded = true;
+        $scope.page_data_loaded = true; // show reg form
+        egProgressDialog.close();
 
         prs.set_field_patterns(field_patterns);
         apply_username_regex();
@@ -1794,6 +1797,7 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
 
         // remove page unload warning prompt
         egUnloadPrompt.clear();
+        egProgressDialog.open();
 
         // toss the deleted addresses back into the patron's list of
         // addresses so it's included in the update
@@ -1864,6 +1868,6 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
                 // reload the current page
                 $window.location.href = location.href;
             }
-        });
+        }).finally(egProgressDialog.close);
     }
 }])
-- 
2.11.0