From 078ebc27653e9f283e42f083347e9b7c82273d4d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 17 Jun 2014 12:52:16 -0400 Subject: [PATCH] checkout responses Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 2 + .../src/templates/staff/circ/patron/t_checkout.tt2 | 13 +- .../templates/staff/circ/share/circ_strings.tt2 | 16 +++ .../staff/circ/share/t_copy_not_avail_dialog.tt2 | 20 +++ .../staff/circ/share/t_event_override_dialog.tt2 | 2 +- .../js/ui/default/staff/circ/patron/checkout.js | 17 ++- .../web/js/ui/default/staff/circ/services/circ.js | 153 +++++++++++++++------ Open-ILS/web/js/ui/default/staff/services/ui.js | 2 +- 8 files changed, 175 insertions(+), 50 deletions(-) create mode 100644 Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 create mode 100644 Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index 65dbfd7c6a..2102e778f9 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -11,6 +11,7 @@ +[% INCLUDE 'staff/circ/share/circ_strings.tt2' %] @@ -29,6 +30,7 @@ + + diff --git a/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2 new file mode 100644 index 0000000000..711e777d84 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/share/t_copy_not_avail_dialog.tt2 @@ -0,0 +1,20 @@ +
+
+ +

+ [% l('Copy Not Available.') %] +

+
+
+
+ [% l('Copy Status: [_1]', '{{copyStatus.name()}}') %] +
+
+
+ + +
+
diff --git a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 index 78f33f39a7..219848c1fc 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_event_override_dialog.tt2 @@ -13,7 +13,7 @@
- [% |l %]If overridden, subsequent checkouts during this patron's + [% |l %]If overridden, subsequent checkouts during this patron's session will auto-override this event[% END %]

-1) + return service.handle_overridable_checkout_event(evt, params, options); + + // Other events switch (evt.textcode) { case 'SUCCESS': return $q.when(final_resp); @@ -109,57 +173,30 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { case 'ITEM_NOT_CATALOGED': return service.precat_dialog(params, options); - case 'PATRON_EXCEEDS_OVERDUE_COUNT': - case 'PATRON_EXCEEDS_FINES': - case 'PATRON_EXCEEDS_CHECKOUT_COUNT': - case 'PATRON_EXCEEDS_LOST_COUNT': - if (options.override) { - // NOTE: I don't think we'll ever get here, since the - // override attempt should produce a perm failure... - console.debug('override failed: ' + evt.textcode); - - } else { - if (service.checkout_overrides[evt.textcode]) { - // user has already opted to override this type - // of event. Re-run the checkout w/ override. - options.override = true; - return service.checkout(params, options); - } else { - // ask the user if they would like to override this - // event type. - return service.override_dialog(evt, params, options); - } - } - break; - case 'OPEN_CIRCULATION_EXISTS': return service.circ_exists_dialog(evt, params, options); case 'COPY_IN_TRANSIT': return service.copy_in_transit_dialog(evt, params, options); - /* stuff to consider + case 'PATRON_CARD_INACTIVE': + case 'PATRON_INACTIVE': + case 'PATRON_ACCOUNT_EXPIRED': + return service.exit_alert(egCore.strings[evt.textcode]); + + /* stuff yet to consider PERM_FAILURE - PATRON_BARRED - CIRC_EXCEEDS_COPY_RANGE - PATRON_ACCOUNT_EXPIRED - ITEM_DEPOSIT_REQUIRED - ITEM_RENTAL_FEE_REQUIRED - ITEM_DEPOSIT_PAID - ACTION_CIRCULATION_NOT_FOUND - PATRON_EXCEEDS_CHECKOUT_COUNT - COPY_CIRC_NOT_ALLOWED - COPY_NOT_AVAILABLE - COPY_IS_REFERENCE - COPY_NEEDED_FOR_HOLD - MAX_RENEWALS_REACHED CIRC_CLAIMS_RETURNED COPY_ALERT_MESSAGE */ default: - console.warn('unhandled circ response : ' + evt.textcode); - return $q.when(final_resp); + return service.exit_alert( + egCore.strings.CHECKOUT_FAILED_GENERIC, { + barcode : params.copy_barcode, + textcode : evt.textcode + } + ); } } @@ -207,6 +244,11 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { }); } + service.exit_alert = function(msg, scope) { + return egAlertDialog.open(msg, scope).result.then( + function() {return $q.reject()}); + } + // opens a dialog asking the user if they would like to override // the returned event. service.override_dialog = function(evt, params, options) { @@ -216,6 +258,8 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { ['$scope', '$modalInstance', function($scope, $modalInstance) { $scope.evt = evt; + $scope.auto_override = + service.auto_override_after_first.indexOf(evt.textcode) > -1; $scope.ok = function() { $modalInstance.close() } $scope.cancel = function ($event) { $modalInstance.dismiss(); @@ -224,7 +268,32 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { }] }).result.then( function() { - service.checkout_overrides[evt.textcode] = true; + if (service.auto_override_after_first.indexOf(evt.textcode) > -1) + service.auto_override_checkout_events[evt.textcode] = true; + options.override = true; + return service.checkout(params, options); + } + ); + } + + service.copy_not_avail_dialog = function(evt, params, options) { + return $modal.open({ + templateUrl: './circ/share/t_copy_not_avail_dialog', + controller: + ['$scope','$modalInstance','copyStatus', + function($scope , $modalInstance , copyStatus) { + $scope.copyStatus = copyStatus; + $scope.ok = function() {$modalInstance.close()} + $scope.cancel = function() {$modalInstance.dismiss()} + }], + resolve : { + copyStatus : function() { + return egCore.pcrud.retrieve( + 'ccs', evt.payload.status()); + } + } + }).result.then( + function() { options.override = true; return service.checkout(params, options); } 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 6278f98026..6770fdc438 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -96,7 +96,7 @@ function($modal , $interpolate) { function($scope, $modalInstance) { $scope.message = $interpolate(message)(msg_scope); $scope.ok = function() { - if (msg_scope.ok) msg_scope.ok(); + if (msg_scope && msg_scope.ok) msg_scope.ok(); $modalInstance.close() } } -- 2.11.0