From ef374fdb71829eac7ebb3aa2b66bb1a593b14655 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 29 May 2020 15:43:02 -0400 Subject: [PATCH] work on mark delivered - add progress bar - implement it on the staged tab Signed-off-by: Galen Charlton --- .../circ/curbside/directives/arrived_manager.js | 6 +++-- .../circ/curbside/directives/staged_manager.js | 30 ++++++++++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/arrived_manager.js b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/arrived_manager.js index 77d940e730..5c24ff4dfb 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/arrived_manager.js +++ b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/arrived_manager.js @@ -7,9 +7,9 @@ angular.module('egCurbsideAppDep') scope: { }, templateUrl: './circ/curbside/t_arrived_manager', controller: - ['$scope','$q','egCurbsideCoreSvc','egCore','egGridDataProvider', + ['$scope','$q','egCurbsideCoreSvc','egCore','egGridDataProvider','egProgressDialog', '$uibModal','$timeout','$location','egConfirmDialog','ngToast','$interval', -function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , +function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , egProgressDialog , $uibModal , $timeout , $location , egConfirmDialog , ngToast , $interval) { $scope.gridControls = {}; @@ -62,7 +62,9 @@ function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , $scope.gridCellHandlers = { }; $scope.gridCellHandlers.mark_delivered = function(id) { + egProgressDialog.open(); egCurbsideCoreSvc.mark_delivered(id).then(function(resp) { + egProgressDialog.close(); if (evt = egCore.evt.parse(resp)) { ngToast.danger(egCore.strings.$replace( egCore.strings.FAILED_CURBSIDE_MARK_DELIVERED, diff --git a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/staged_manager.js b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/staged_manager.js index db5d9881be..ac6fa90a29 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/staged_manager.js +++ b/Open-ILS/web/js/ui/default/staff/circ/curbside/directives/staged_manager.js @@ -7,9 +7,9 @@ angular.module('egCurbsideAppDep') scope: { }, templateUrl: './circ/curbside/t_staged_manager', controller: - ['$scope','$q','egCurbsideCoreSvc','egCore','egGridDataProvider', + ['$scope','$q','egCurbsideCoreSvc','egCore','egGridDataProvider','egProgressDialog', '$uibModal','$timeout','$location','egConfirmDialog','ngToast','$interval', -function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , +function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , egProgressDialog , $uibModal , $timeout , $location , egConfirmDialog , ngToast , $interval) { $scope.gridControls = {}; @@ -85,6 +85,32 @@ function($scope , $q , egCurbsideCoreSvc , egCore , egGridDataProvider , $timeout(function() { $scope.refresh_staged() }, 500); }); } + $scope.gridCellHandlers.mark_delivered = function(id) { + egProgressDialog.open(); + egCurbsideCoreSvc.mark_delivered(id).then(function(resp) { + egProgressDialog.close(); + if (evt = egCore.evt.parse(resp)) { + ngToast.danger(egCore.strings.$replace( + egCore.strings.FAILED_CURBSIDE_MARK_DELIVERED, + { slot_id : id, evt_code : evt.code } + )); + return; + } + if (!angular.isDefined(resp)) { + ngToast.warning(egCore.strings.$replace( + egCore.strings.NOTFOUND_CURBSIDE_MARK_DELIVERED, + { slot_id : id } + )); + return; + } + ngToast.success(egCore.strings.$replace( + egCore.strings.SUCCESS_CURBSIDE_MARK_DELIVERED, + { slot_id : id } + )); + $scope.wasHandled[id] = true; + $timeout(function() { $scope.refresh_staged() }, 500); + }); + } $scope.gridCellHandlers.wasHandled = function(id) { return $scope.wasHandled[id]; } -- 2.11.0