From 66d120bdd8f10ac907a5654f4bf5f18a1d325d82 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 30 Mar 2016 17:25:06 -0400 Subject: [PATCH] LP#1570091: webstaff: make use of ngToast for holdings action notifications Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Signed-off-by: Bill Erickson --- .../src/templates/staff/cat/catalog/index.tt2 | 14 +++++++++++ .../js/ui/default/staff/cat/catalog/app.js | 23 ++++++++++++++++--- 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 index d8a1a53cbf..c2df10ec4a 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 @@ -34,6 +34,20 @@ "[% l('One or more items could not be transferred. Override?') %]"; s.OVERRIDE_TRANSFER_COPIES_TO_MARKED_VOLUME_BODY = "[% l('Reason(s) include: [_1]', '{{evt_desc}}') %]"; + s.VOLS_TRANSFERED = + "[% l('Volume(s) transfered') %]"; + s.ITEMS_TRANSFERED = + "[% l('Item(s) transfered') %]"; + s.HOLD_TRANSFER_DEST_MARKED = + "[% l('Hold Transfer Destination set') %]"; + s.MARK_CONJ_TARGET = + "[% l('Conjoined Item Target set') %]"; + s.MARK_VOL_TARGET = + "[% l('Volume Transfer Target set') %]"; + s.MARK_ITEM_TARGET = + "[% l('Item Transfer Target set') %]"; + s.MARK_OVERLAY_TARGET = + "[% l('Record Overlay Target set') %]"; }]) diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js index e2540b6767..098cabf5a9 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js @@ -7,7 +7,14 @@ * */ -angular.module('egCatalogApp', ['ui.bootstrap','ngRoute','ngLocationUpdate','egCoreMod','egGridMod', 'egMarcMod', 'egUserMod', 'egHoldingsMod']) +angular.module('egCatalogApp', ['ui.bootstrap','ngRoute','ngLocationUpdate','egCoreMod','egGridMod', 'egMarcMod', 'egUserMod', 'egHoldingsMod', 'ngToast']) + +.config(['ngToastProvider', function(ngToastProvider) { + ngToastProvider.configure({ + verticalPosition: 'bottom', + animation: 'fade' + }); +}]) .config(function($routeProvider, $locationProvider, $compileProvider) { $locationProvider.html5Mode(true); @@ -230,9 +237,9 @@ function($scope , $routeParams , $location , $window , $q , egCore) { }]) .controller('CatalogCtrl', - ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog', + ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog','ngToast', 'egGridDataProvider','egHoldGridActions','$timeout','$modal','holdingsSvc','egUser','conjoinedSvc', -function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc, egConfirmDialog, +function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc , egConfirmDialog , ngToast , egGridDataProvider , egHoldGridActions , $timeout , $modal , holdingsSvc , egUser , conjoinedSvc) { var holdingsSvcInst = new holdingsSvc(); @@ -343,9 +350,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e $scope.markConjoined = function () { $scope.current_conjoined_target = $scope.record_id; egCore.hatch.setLocalItem('eg.cat.marked_conjoined_record',$scope.record_id); + ngToast.create(egCore.strings.MARK_CONJ_TARGET); }; $scope.markVolTransfer = function () { + ngToast.create(egCore.strings.MARK_VOL_TARGET); $scope.current_voltransfer_target = $scope.record_id; egCore.hatch.setLocalItem('eg.cat.marked_volume_transfer_record',$scope.record_id); }; @@ -353,6 +362,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e $scope.markOverlay = function () { $scope.current_overlay_target = $scope.record_id; egCore.hatch.setLocalItem('eg.cat.marked_overlay_record',$scope.record_id); + ngToast.create(egCore.strings.MARK_OVERLAY_TARGET); }; $scope.clearRecordMarks = function () { @@ -993,6 +1003,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e 'eg.cat.item_transfer_target', $scope.holdingsGridControls.selectedItems()[0].call_number.id ); + ngToast.create(egCore.strings.MARK_ITEM_TARGET); } } @@ -1026,6 +1037,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e 'eg.cat.volume_transfer_target', $scope.holdingsGridControls.selectedItems()[0].owner_id ); + ngToast.create(egCore.strings.MARK_VOL_TARGET); } $scope.selectedHoldingsItemStatusDetail = function (){ @@ -1068,6 +1080,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e }); $q.all(promises).then(function(success) { if (success) { + ngToast.create(egCore.strings.VOLS_TRANSFERED); holdingsSvcInst.fetchAgain().then(function() { $scope.holdingsGridDataProvider.refresh(); }); @@ -1091,6 +1104,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e } ).then(function(success) { if (success) { + ngToast.create(egCore.strings.VOLS_TRANSFERED); holdingsSvcInst.fetchAgain().then(function() { $scope.holdingsGridDataProvider.refresh(); }); @@ -1155,6 +1169,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e })); }); $q.all(promises).then(function() { + ngToast.create(egCore.strings.ITEMS_TRANSFERED); holdingsSvcInst.fetchAgain().then(function() { $scope.holdingsGridDataProvider.refresh(); }); @@ -1194,6 +1209,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e }); }); } else { + ngToast.create(egCore.strings.ITEMS_TRANSFERED); holdingsSvcInst.fetchAgain().then(function() { $scope.holdingsGridDataProvider.refresh(); }); @@ -1373,6 +1389,7 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e $scope.mark_hold_transfer_dest = function() { egCore.hatch.setLocalItem( 'eg.circ.hold.title_transfer_target', $scope.record_id); + ngToast.create(egCore.strings.HOLD_TRANSFER_DEST_MARKED); } // UI presents this option as "all holds" -- 2.43.2