[open-ils-commits] [GIT] Evergreen ILS branch master updated. b5a9d112692bef30da88cea2d52c76c4d775aa5a
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 23 15:28:44 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via b5a9d112692bef30da88cea2d52c76c4d775aa5a (commit)
from dc6450547ae750ff473e78e86586b17217388f09 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b5a9d112692bef30da88cea2d52c76c4d775aa5a
Author: Jeff Davis <jdavis at sitka.bclibraries.ca>
Date: Wed Jul 12 13:38:13 2017 -0700
LP#1699566: item barcode completion in web client
Signed-off-by: Jeff Davis <jdavis at sitka.bclibraries.ca>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/circ/share/t_barcode_choice_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_barcode_choice_dialog.tt2
new file mode 100644
index 0000000..54d23e0
--- /dev/null
+++ b/Open-ILS/src/templates/staff/circ/share/t_barcode_choice_dialog.tt2
@@ -0,0 +1,22 @@
+<div>
+ <div class="modal-header">
+ <button type="button" class="close" ng-click="cancel()"
+ aria-hidden="true">×</button>
+ <h4 class="modal-title">[% l('Barcode Choice') %]</h4>
+ </div>
+ <div class="modal-body">
+ <div>
+ [% l('After auto completion multiple barcodes may match your input. Please choose the barcode you intended below.') %]
+ </div>
+ </div>
+ <div class="modal-footer">
+ <div ng-repeat="match in matches">
+ <button class="btn" ng-click="ok(match.barcode)">
+ {{match.barcode}} : {{match.title}}[% l(' from ') %]{{match.org_name}} ({{match.org_shortname}})
+ </button>
+ </div>
+ <div>
+ <button class="btn" ng-click="cancel()">[% l('None of the above') %]</button>
+ </div>
+ </div>
+</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 5c6ab73..65737ad 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -91,9 +91,15 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
//Retrieve separate copy, aacs, and accs information
service.getCopy = function(barcode, id) {
- if (barcode) return egCore.pcrud.search(
- 'acp', {barcode : barcode, deleted : 'f'},
- service.flesh).then(function(copy) {return copy});
+ if (barcode) {
+ // handle barcode completion
+ return egCirc.handle_barcode_completion(barcode)
+ .then(function(actual_barcode) {
+ return egCore.pcrud.search(
+ 'acp', {barcode : actual_barcode, deleted : 'f'},
+ service.flesh).then(function(copy) {return copy});
+ });
+ }
return egCore.pcrud.retrieve( 'acp', id, service.flesh)
.then(function(copy) {return copy});
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 0890034..64e5c5e 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -125,40 +125,47 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
console.debug('egCirc.checkout() : '
+ js2JSON(params) + ' : ' + js2JSON(options));
- var promise = options.check_barcode ?
- service.test_barcode(params.copy_barcode) : $q.when();
+ // handle barcode completion
+ return service.handle_barcode_completion(params.copy_barcode)
+ .then(function(barcode) {
+ console.debug('barcode after completion: ' + barcode);
+ params.copy_barcode = barcode;
- // avoid re-check on override, etc.
- delete options.check_barcode;
+ var promise = options.check_barcode ?
+ service.test_barcode(params.copy_barcode) : $q.when();
- return promise.then(function() {
+ // avoid re-check on override, etc.
+ delete options.check_barcode;
- var method = 'open-ils.circ.checkout.full';
- if (options.override) method += '.override';
+ return promise.then(function() {
- return egCore.net.request(
- 'open-ils.circ', method, egCore.auth.token(), params
+ var method = 'open-ils.circ.checkout.full';
+ if (options.override) method += '.override';
- ).then(function(evt) {
+ return egCore.net.request(
+ 'open-ils.circ', method, egCore.auth.token(), params
- if (!angular.isArray(evt)) evt = [evt];
+ ).then(function(evt) {
- if (evt[0].payload && evt[0].payload.auto_renew == 1) {
- // open circulation found with auto-renew toggle on.
- console.debug('Auto-renewing item ' + params.copy_barcode);
- options.auto_renew = true;
- return service.renew(params, options);
- }
+ if (!angular.isArray(evt)) evt = [evt];
- var action = params.noncat ? 'noncat_checkout' : 'checkout';
+ if (evt[0].payload && evt[0].payload.auto_renew == 1) {
+ // open circulation found with auto-renew toggle on.
+ console.debug('Auto-renewing item ' + params.copy_barcode);
+ options.auto_renew = true;
+ return service.renew(params, options);
+ }
- return service.flesh_response_data(action, evt, params, options)
- .then(function() {
- return service.handle_checkout_resp(evt, params, options);
- })
- .then(function(final_resp) {
- return service.munge_resp_data(final_resp,action,method)
- })
+ var action = params.noncat ? 'noncat_checkout' : 'checkout';
+
+ return service.flesh_response_data(action, evt, params, options)
+ .then(function() {
+ return service.handle_checkout_resp(evt, params, options);
+ })
+ .then(function(final_resp) {
+ return service.munge_resp_data(final_resp,action,method)
+ })
+ });
});
});
}
@@ -173,33 +180,39 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
console.debug('egCirc.renew() : '
+ js2JSON(params) + ' : ' + js2JSON(options));
- var promise = options.check_barcode ?
- service.test_barcode(params.copy_barcode) : $q.when();
+ // handle barcode completion
+ return service.handle_barcode_completion(params.copy_barcode)
+ .then(function(barcode) {
+ params.copy_barcode = barcode;
- // avoid re-check on override, etc.
- delete options.check_barcode;
+ var promise = options.check_barcode ?
+ service.test_barcode(params.copy_barcode) : $q.when();
- return promise.then(function() {
+ // avoid re-check on override, etc.
+ delete options.check_barcode;
- var method = 'open-ils.circ.renew';
- if (options.override) method += '.override';
+ return promise.then(function() {
- return egCore.net.request(
- 'open-ils.circ', method, egCore.auth.token(), params
+ var method = 'open-ils.circ.renew';
+ if (options.override) method += '.override';
- ).then(function(evt) {
+ return egCore.net.request(
+ 'open-ils.circ', method, egCore.auth.token(), params
- if (!angular.isArray(evt)) evt = [evt];
+ ).then(function(evt) {
- return service.flesh_response_data(
- 'renew', evt, params, options)
- .then(function() {
- return service.handle_renew_resp(evt, params, options);
- })
- .then(function(final_resp) {
- final_resp.auto_renew = options.auto_renew;
- return service.munge_resp_data(final_resp,'renew',method)
- })
+ if (!angular.isArray(evt)) evt = [evt];
+
+ return service.flesh_response_data(
+ 'renew', evt, params, options)
+ .then(function() {
+ return service.handle_renew_resp(evt, params, options);
+ })
+ .then(function(final_resp) {
+ final_resp.auto_renew = options.auto_renew;
+ return service.munge_resp_data(final_resp,'renew',method)
+ })
+ });
});
});
}
@@ -214,31 +227,37 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
console.debug('egCirc.checkin() : '
+ js2JSON(params) + ' : ' + js2JSON(options));
- var promise = options.check_barcode ?
- service.test_barcode(params.copy_barcode) : $q.when();
+ // handle barcode completion
+ return service.handle_barcode_completion(params.copy_barcode)
+ .then(function(barcode) {
+ params.copy_barcode = barcode;
- // avoid re-check on override, etc.
- delete options.check_barcode;
+ var promise = options.check_barcode ?
+ service.test_barcode(params.copy_barcode) : $q.when();
- return promise.then(function() {
+ // avoid re-check on override, etc.
+ delete options.check_barcode;
- var method = 'open-ils.circ.checkin';
- if (options.override) method += '.override';
+ return promise.then(function() {
- return egCore.net.request(
- 'open-ils.circ', method, egCore.auth.token(), params
+ var method = 'open-ils.circ.checkin';
+ if (options.override) method += '.override';
- ).then(function(evt) {
+ return egCore.net.request(
+ 'open-ils.circ', method, egCore.auth.token(), params
- if (!angular.isArray(evt)) evt = [evt];
- return service.flesh_response_data(
- 'checkin', evt, params, options)
- .then(function() {
- return service.handle_checkin_resp(evt, params, options);
- })
- .then(function(final_resp) {
- return service.munge_resp_data(final_resp,'checkin',method)
- })
+ ).then(function(evt) {
+
+ if (!angular.isArray(evt)) evt = [evt];
+ return service.flesh_response_data(
+ 'checkin', evt, params, options)
+ .then(function() {
+ return service.handle_checkin_resp(evt, params, options);
+ })
+ .then(function(final_resp) {
+ return service.munge_resp_data(final_resp,'checkin',method)
+ })
+ });
});
});
}
@@ -1600,6 +1619,72 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
return check_digit;
}
+ service.handle_barcode_completion = function(barcode) {
+ return egCore.net.request(
+ 'open-ils.actor',
+ 'open-ils.actor.get_barcodes',
+ egCore.auth.token(), egCore.auth.user().ws_ou(),
+ 'asset', barcode)
+
+ .then(function(resp) {
+ // TODO: handle event during barcode lookup
+ if (evt = egCore.evt.parse(resp)) {
+ console.error(evt.toString());
+ return $q.reject();
+ }
+
+ // no matching barcodes: return the barcode as entered
+ // by the user (so that, e.g., checkout can fall back to
+ // precat/noncat handling)
+ if (!resp || !resp[0]) {
+ return barcode;
+ }
+
+ // exactly one matching barcode: return it
+ if (resp.length == 1) {
+ return resp[0].barcode;
+ }
+
+ // multiple matching barcodes: let the user pick one
+ console.debug('multiple matching barcodes');
+ var matches = [];
+ var promises = [];
+ var final_barcode;
+ angular.forEach(resp, function(cp) {
+ promises.push(
+ egCore.net.request(
+ 'open-ils.circ',
+ 'open-ils.circ.copy_details.retrieve',
+ egCore.auth.token(), cp.id
+ ).then(function(r) {
+ matches.push({
+ barcode: r.copy.barcode(),
+ title: r.mvr.title(),
+ org_name: egCore.org.get(r.copy.circ_lib()).name(),
+ org_shortname: egCore.org.get(r.copy.circ_lib()).shortname()
+ });
+ })
+ );
+ });
+ return $q.all(promises)
+ .then(function() {
+ return $uibModal.open({
+ templateUrl: './circ/share/t_barcode_choice_dialog',
+ controller:
+ ['$scope', '$uibModalInstance',
+ function($scope, $uibModalInstance) {
+ $scope.matches = matches;
+ $scope.ok = function(barcode) {
+ $uibModalInstance.close();
+ final_barcode = barcode;
+ }
+ $scope.cancel = function() {$uibModalInstance.dismiss()}
+ }],
+ }).result.then(function() { return final_barcode });
+ })
+ });
+ }
+
service.create_penalty = function(user_id) {
return $uibModal.open({
templateUrl: './circ/share/t_new_message_dialog',
-----------------------------------------------------------------------
Summary of changes:
.../staff/circ/share/t_barcode_choice_dialog.tt2 | 22 ++
Open-ILS/web/js/ui/default/staff/cat/item/app.js | 12 +-
.../web/js/ui/default/staff/circ/services/circ.js | 213 ++++++++++++++------
3 files changed, 180 insertions(+), 67 deletions(-)
create mode 100644 Open-ILS/src/templates/staff/circ/share/t_barcode_choice_dialog.tt2
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list