From 540618318b6a29dea34d12d9bc9caec4a161d470 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 13 Dec 2013 17:16:06 -0500 Subject: [PATCH] web staff: noncat checkouts Signed-off-by: Bill Erickson --- .../src/templates/staff/circ/patron/t_checkout.tt2 | 6 +- .../staff/circ/patron/t_checkout_table.tt2 | 3 +- .../staff/circ/patron/t_noncat_dialog.tt2 | 26 ++++++++ .../web/js/ui/default/staff/circ/patron/app.js | 76 ++++++++++++++++------ 4 files changed, 86 insertions(+), 25 deletions(-) create mode 100644 Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 index d5d517417c..a11700f7f4 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout.tt2 @@ -12,19 +12,19 @@ diff --git a/Open-ILS/src/templates/staff/circ/patron/t_checkout_table.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_checkout_table.tt2 index 13c84800c9..86ae2ab9db 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_checkout_table.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_checkout_table.tt2 @@ -11,7 +11,8 @@ COLUMNS = [ {label => l('Title'), name => 'payload.record.title', display => 1}, {label => l('Author'), name => 'payload.record.author', display => 1}, {label => l('Call Number'),name => 'payload.copy.call_number.label', display => 1}, -{label => l('Alert Msg'), name => 'payload.copy.alert_message' display => 1}, +{label => l('Alert Msg'), name => 'payload.copy.alert_message', display => 1}, +{label => l('Noncat #'), name => 'noncat_count' display => 1}, ] %] diff --git a/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 new file mode 100644 index 0000000000..98bd96687e --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/patron/t_noncat_dialog.tt2 @@ -0,0 +1,26 @@ + +
+
+
+
+ +

+ [% l('Enter the number of {{type.name()}} circulating') %] +

+
+
+
+ + +
+
+ + +
+
+
+ diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js index 0cf69e2ad5..006e25e3f5 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js @@ -451,23 +451,19 @@ function($scope, $q, egNet, egAuth, egEvent, patronSvc) { * Manages checkout */ .controller('PatronCheckoutCtrl', - ['$scope','$q','$modal','$routeParams','egNet','egAuth','egUser','patronSvc','egEnv','egPCRUD','egOrg', -function($scope, $q, $modal, $routeParams, egNet, egAuth, egUser, patronSvc, egEnv, egPCRUD, egOrg) { + ['$scope','$q','$modal','$routeParams','egNet','egAuth','egUser', + 'egIDL','patronSvc','egEnv','egPCRUD','egOrg', +function($scope, $q, $modal, $routeParams, egNet, egAuth, egUser, + egIDL, patronSvc, egEnv, egPCRUD, egOrg) { $scope.initTab('checkout', $routeParams.id); $scope.focusMe = true; $scope.checkouts = patronSvc.checkouts; - $scope.checkoutArgs = {type : 'barcode'}; + $scope.checkoutArgs = {noncat_type : 'barcode'}; $scope.selectedNcType = function() { - var type; - if ($scope.nonCatTypes) { - type = $scope.nonCatTypes.filter( - function(t) { - return t.id() == $scope.checkoutArgs.type; - } - )[0]; - } + if (!egEnv.cnct) return null; // too soon + var type = egEnv.cnct.map[$scope.checkoutArgs.noncat_type]; return type ? type.name() : null; } @@ -491,15 +487,17 @@ function($scope, $q, $modal, $routeParams, egNet, egAuth, egUser, patronS var type = args.type; var coArgs = angular.copy(args); - if (!args.copy_barcode) return; + if (coArgs.noncat_type == 'barcode') { - args.copy_barcode = ''; // reset for UI - delete coArgs.type; // not a valid API arg + if (!args.copy_barcode) return; + args.copy_barcode = ''; // reset UI - if (type == 'barcode') { + delete coArgs.noncat_type; performCheckout(coArgs); + } else { - // noncat checkout + console.log('noncat..'); + openNoncatDialog(coArgs); } $scope.focusMe; // return focus to barcode input @@ -533,11 +531,20 @@ function($scope, $q, $modal, $routeParams, egNet, egAuth, egUser, patronS function handleCheckoutResponse(evt, args, override) { - if (args.precat && evt.payload) { - evt.payload.record = { - title : args.dummy_title, - author : args.dummy_author, - isbn : args.dummy_isbn + if (evt.payload) { + if (args.precat) { + evt.payload.record = { + title : args.dummy_title, + author : args.dummy_author, + isbn : args.dummy_isbn + }; + } else if (args.noncat) { + evt.payload.record = { + title : egEnv.cnct.map[args.noncat_type].name() + }; + evt.noncat_count = args.noncat_count; + evt.payload.circ = new egIDL.circ(); + evt.payload.circ.due_date(evt.payload.noncat_circ.duedate()); } } @@ -596,6 +603,33 @@ function($scope, $q, $modal, $routeParams, egNet, egAuth, egUser, patronS // define our modal dialogs + function openNoncatDialog(coArgs) { + coArgs.noncat = true; + var type = egEnv.cnct.map[coArgs.noncat_type]; + + $modal.open({ + templateUrl: './circ/patron/t_noncat_dialog', + controller: + ['$scope', '$modalInstance', + function($scope, $modalInstance) { + $scope.focusMe = true; + $scope.type = type; + $scope.count = 1; + $scope.ok = function(count) { $modalInstance.close(count) } + $scope.cancel = function () { $modalInstance.dismiss() } + }], + }).result.then( + function(count) { + $scope.focusMe = true; // main barcode input + if (count) { + // TODO: sanity check + coArgs.noncat_count = count; + performCheckout(coArgs); + } + } + ); + } + function openPrecatDialog(copy_barcode) { $modal.open({ templateUrl: './circ/patron/t_precat_dialog', -- 2.11.0