From 4b2d4cbda2bc0de6f3b9ea8f0f867b55fd8a410a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 11 Feb 2014 15:11:26 -0500 Subject: [PATCH] FF staff support display/toggle of holds suspend / activate Signed-off-by: Bill Erickson --- .../src/templates/staff/fulfillment/t_actions.tt2 | 4 ++++ .../templates/staff/fulfillment/t_item_table.tt2 | 2 +- .../web/js/ui/default/staff/fulfillment/app.js | 28 ++++++++++++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2 b/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2 index a5224096a7..af46878de8 100644 --- a/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2 +++ b/Open-ILS/src/templates/staff/fulfillment/t_actions.tt2 @@ -27,6 +27,10 @@ ng-show="tab_pending && orientation_lender">[% l('Capture Item') %]
  • [% l('Retarget Request') %]
  • +
  • [% l('Activate Request') %]
  • +
  • [% l('Suspend Request') %]
  • [% l('Cancel Request') %]
  • {{item.copy_barcode}} [% ELSIF col.name == 'frozen' %] - {{!item.frozen}} + {{item.frozen == 'f'}} [% ELSE %] {{item.[% col.name %][% col.extra IF col.extra %]}} [% END %] diff --git a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js index e784c78741..2be5a75ee4 100644 --- a/Open-ILS/web/js/ui/default/staff/fulfillment/app.js +++ b/Open-ILS/web/js/ui/default/staff/fulfillment/app.js @@ -164,6 +164,7 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location, id : 'id', hold_id : 'id', request_time : 'request_time', + frozen : 'frozen', expire_time : 'expire_time', patron_id : 'usr.id', patron_barcode : 'usr.card.barcode', @@ -369,6 +370,30 @@ function ($scope, $q, $compile, $timeout, $rootScope, $location, return deferred.promise; } + function toggleHoldActive(item, frozen) { + if (item.frozen == frozen) return $q.when(); + var deferred = $q.defer(); + $scope.action_pending = true; + egNet.request( + 'open-ils.circ', + 'open-ils.circ.hold.update.batch', + egAuth.token(), null, + [{id : item.hold_id, frozen : frozen}] + ).then(function() { + $scope.action_pending = false; + deferred.resolve(); + }); + return deferred.promise; + } + + $scope.actions.activate_hold = function(item) { + return toggleHoldActive(item, 'f'); + } + + $scope.actions.suspend_hold = function(item) { + return toggleHoldActive(item, 't'); + } + $scope.actions.abort_transit = function(item) { var deferred = $q.defer(); $scope.action_pending = true; @@ -495,8 +520,7 @@ function ($scope, $q, $route, egNet, egAuth, egPCRUD, egOrg, orgSelector) var query = { capture_time : null, - cancel_time : null, - frozen : 'f' + cancel_time : null }; if ($scope.orientation_borrower) { -- 2.11.0