From ad9bd74dc0d0ff367c78af1ef77bc1a6630a2be4 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 27 Nov 2013 09:36:21 -0500 Subject: [PATCH] web staff: checkin continued Signed-off-by: Bill Erickson --- .../src/templates/staff/circ/checkin/index.tt2 | 9 +++++- .../staff/circ/checkin/t_checkin_table.tt2 | 2 +- .../staff/circ/patron/t_event_override_dialog.tt2 | 2 +- .../src/templates/staff/parts/alert_dialog.tt2 | 19 ++++++++++++ .../src/templates/staff/parts/confirm_dialog.tt2 | 25 ++++++++++++++++ .../web/js/ui/default/staff/circ/checkin/app.js | 34 +++++++++++++++++----- Open-ILS/web/js/ui/default/staff/services/ui.js | 23 +++++++++++++++ 7 files changed, 104 insertions(+), 10 deletions(-) create mode 100644 Open-ILS/src/templates/staff/parts/alert_dialog.tt2 create mode 100644 Open-ILS/src/templates/staff/parts/confirm_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 b/Open-ILS/src/templates/staff/circ/checkin/index.tt2 index 135a96eead..08095e530f 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/index.tt2 @@ -24,7 +24,8 @@
- @@ -40,5 +41,11 @@ [% INCLUDE 'staff/circ/checkin/t_checkin_table.tt2' %] + + + [% END %] diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 index 37c31f7f91..ad6a2272b0 100644 --- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 +++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 @@ -24,7 +24,7 @@ checkins.setColumns([ ])">
-
+
diff --git a/Open-ILS/src/templates/staff/circ/patron/t_event_override_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_event_override_dialog.tt2 index c2f25698d6..7ff0a79ad2 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_event_override_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_event_override_dialog.tt2 @@ -17,7 +17,7 @@
[% |l %] If overridden, subsequent checkouts during this patron's session will -auto-override this event[% END %] +auto-override this event[% END %]

diff --git a/Open-ILS/src/templates/staff/parts/alert_dialog.tt2 b/Open-ILS/src/templates/staff/parts/alert_dialog.tt2 new file mode 100644 index 0000000000..ffb1a9f4f9 --- /dev/null +++ b/Open-ILS/src/templates/staff/parts/alert_dialog.tt2 @@ -0,0 +1,19 @@ + +
+
+
+ +

[% l('Alert') %]

+
+
[% dialog_body %]
+
+ [% dialog_footer %] + +
+
+
diff --git a/Open-ILS/src/templates/staff/parts/confirm_dialog.tt2 b/Open-ILS/src/templates/staff/parts/confirm_dialog.tt2 new file mode 100644 index 0000000000..9502c73c78 --- /dev/null +++ b/Open-ILS/src/templates/staff/parts/confirm_dialog.tt2 @@ -0,0 +1,25 @@ + + +
+
+
+ + [% IF dialog_title %] +

[% dialog_title %]

+ [% END %] +
+ [% IF dialog_body %] +
[% dialog_body %]
+ [% END %] +
+ [% dialog_footer %] + + +
+
+
+ diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js index c319f88693..dd57d367ea 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js @@ -20,10 +20,10 @@ function($q, egList, egNet, egAuth, egUser, egEnv, egOrg, egList) { /** * Manages checkin - * */ + */ .controller('CheckinCtrl', - ['$scope','egStartup','checkinSvc','egNet','egAuth', -function($scope, egStartup, checkinSvc, egNet, egAuth) { + ['$scope','$modal','egStartup','checkinSvc','egNet','egAuth', +function($scope, $modal, egStartup, checkinSvc, egNet, egAuth) { // run egStartup here since it's not handled via resolver egStartup.go().then( @@ -36,8 +36,12 @@ function($scope, egStartup, checkinSvc, egNet, egAuth) { $scope.checkins = checkinSvc.checkins; $scope.checkin = function(args) { - performCheckin(angular.copy(args)); - args.copy_barcode = ''; // reset UI + if (args && args.copy_barcode) { + performCheckin(angular.copy(args)); + args.copy_barcode = ''; // reset UI + } + + $scope.focusMe = true; } function performCheckin(args, override) { @@ -60,13 +64,14 @@ function($scope, egStartup, checkinSvc, egNet, egAuth) { } function handleCheckinResponse(evt, args, override) { - switch (evt.textcode) { case 'SUCCESS': case 'ROUTE_ITEM': - case 'ASSET_COPY_NOT_FOUND': checkinSvc.checkins.items.push(evt); break; + case 'ASSET_COPY_NOT_FOUND': + openAlertDialog('uncat_alert_dialog', evt, args); + break; default: console.warn('unhandled checkin response : ' + evt.textcode); console.debug('checkin: ' + js2JSON(evt)); @@ -75,5 +80,20 @@ function($scope, egStartup, checkinSvc, egNet, egAuth) { $scope.checkins.items.push(evt); } } + + function openAlertDialog(id, evt, args) { + // avoid unintended checkins while the dialog is open + $scope.blurMe = true; + $modal.open({ + templateUrl: id, + controller: + ['$scope', '$modalInstance', + function($scope, $modalInstance) { + $scope.args = args; + $scope.ok = function() {$modalInstance.close()} + }] + }).result.then(function() {$scope.focusMe = true}); + } + }]) diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js index 786750f44f..4a9d892e6d 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -25,6 +25,29 @@ function($timeout, $parse) { }; }]) +/** + * + * $scope.pleaseBlurMe = true + * Useful for de-focusing when no other obvious focus target exists + */ +.directive('blurMe', +['$timeout', '$parse', +function($timeout, $parse) { + return { + link: function(scope, element, attrs) { + var model = $parse(attrs.blurMe); + scope.$watch(model, function(value) { + if(value === true) + $timeout(function() {element[0].blur()}); + }); + element.bind('focus', function() { + scope.$apply(model.assign(scope, false)); + }) + } + }; +}]) + + // // $scope.iWantToBeSelected = true; .directive('selectMe', -- 2.11.0