From aa0024c205a26b2fa726cff1175332e7e819acc6 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Tue, 23 May 2017 10:48:37 -0400 Subject: [PATCH] webstaff: Default receiving callnumber to last created; UI cleanup Signed-off-by: Mike Rylander --- .../templates/staff/serials/t_batch_receive.tt2 | 16 +-- .../staff/serials/directives/view-items-grid.js | 139 ++++++++++++--------- .../js/ui/default/staff/serials/services/core.js | 13 ++ 3 files changed, 100 insertions(+), 68 deletions(-) diff --git a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 index 3f78a0cf2b..9beaf9c089 100644 --- a/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_batch_receive.tt2 @@ -2,18 +2,12 @@
-

{{ title || "[% l('Construct new holding code') %]" }}

+

{{ title || "[% l('Receive items') %]" }}

- [% l('Receive date') %] -
-
- -
-
@@ -38,6 +32,9 @@
[% l('Library : Distribution/Stream') %]
+
+ [% l('Issuance') %] +
[% l('Copy location') %]
@@ -50,7 +47,7 @@
-
+
0); - } - - $scope.focus_next_barcode = function (index) { - index++; - $('#item_barcode_'+index).focus().select(); - } - - $scope.$watch('auto_barcodes', function (n) { - var bc = '@@AUTO'; - if (!n) bc = ''; - - angular.forEach($scope.items, function (i) { - var _barcode = i._barcode; - i._barcode = bc || i._old_barcode; - i._old_barcode = _barcode; - }); - }); - - $scope.apply_template_overrides = function (e) { - if ($scope.selected_call_number) { - angular.forEach($scope.items, function (i) { - i._call_number = $scope.selected_call_number; - }); - } - if ($scope.selected_circ_mod) { - angular.forEach($scope.items, function (i) { - i._circ_mod = $scope.selected_circ_mod; - }); - } - if ($scope.selected_copy_location) { - angular.forEach($scope.items, function (i) { - i._copy_location = $scope.selected_copy_location; - }); - } - } - var pile_o_promises = [$q.when()]; // let's gather what we need... angular.forEach(list, function (i) { - if (i.stream().distribution()[mode + '_call_number']()) - i._call_number = i.stream().distribution()[mode + '_call_number']().label(); + if (i.unit()) { + i._barcode = i.unit().barcode(); + pile_o_promises.push( + egCore.pcrud.retrieve( + 'acn', i.unit().call_number() + ).then(function(cn){ i._call_number = cn.label() }) + ); + } else { + if (i.stream().distribution()[mode + '_call_number']()) { + i._call_number = i.stream().distribution()[mode + '_call_number']().label(); + } else { + pile_o_promises.push( + egSerialsCoreSvc.fetchLastCallnumber( + i.stream().distribution().holding_lib().id() + ).then(function(cn){ i._call_number = cn.label() }) + ); + } + } if (i.stream().distribution()[mode + '_unit_template']()) { i._copy_location = i.stream().distribution()[mode + '_unit_template']().location(); @@ -389,6 +347,56 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider , console.log('receive data collected'); }); + $scope.bind_or_none = function (index) { + return !$scope.barcode_items || ($scope.bind && index > 0); + } + + $scope.focus_next_barcode = function (index) { + index++; + $('#item_barcode_'+index).focus().select(); + } + + $scope.apply_template_overrides = function (e) { + if ($scope.selected_call_number) { + angular.forEach($scope.items, function (i) { + i._call_number = $scope.selected_call_number; + }); + } + if ($scope.selected_circ_mod) { + angular.forEach($scope.items, function (i) { + i._circ_mod = $scope.selected_circ_mod; + }); + } + if ($scope.selected_copy_location) { + angular.forEach($scope.items, function (i) { + i._copy_location = $scope.selected_copy_location; + }); + } + } + + $scope.$watch('barcode_items', function (n,o) { + if (n === undefined || n == o) return; + do_barcode = n; + }); + + $scope.$watch('bind', function (n,o) { + if (n === undefined || n == o) return; + bind = n; + }); + + $scope.$watch('auto_barcodes', function (n,o) { + if (n === undefined || n == o) return; + + var bc = '@@AUTO'; + if (!n) bc = ''; + + angular.forEach($scope.items, function (i) { + var _barcode = i._barcode; + i._barcode = bc || i._old_barcode; + i._old_barcode = _barcode; + }); + }); + $scope.ok = function(items) { $uibModalInstance.close(items) } $scope.cancel = function () { $uibModalInstance.dismiss() } }] @@ -399,7 +407,11 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider , current_promise.then(function (items) { + var donor_unit_ids = {}; angular.forEach(items, function(i, index) { + if (item.unit()) donor_unit_ids[item.unit().id()] = 1; + if (do_barcode) item.unit(-1); + if (bind) item.unit(-2); copy_locations[i.id()] = i._copy_location; circ_mods[i.id()] = i._circ_mod; call_numbers[i.id()] = i._call_number || 'DEFAULT'; @@ -407,6 +419,13 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider , if (bind && index > 0) barcodes[i.id()] = items[0]._barcode; }); + var method; + if (mode == 'receive') { + method = 'open-ils.serial.receive_items'; + } else { // bind mode + method = 'open-ils.serial.bind_items'; + } + return egCore.net.request( 'open-ils.serial', method, egCore.auth.token(), items, barcodes, call_numbers, donor_unit_ids, diff --git a/Open-ILS/web/js/ui/default/staff/serials/services/core.js b/Open-ILS/web/js/ui/default/staff/serials/services/core.js index ec60fce0a6..edf250e32b 100644 --- a/Open-ILS/web/js/ui/default/staff/serials/services/core.js +++ b/Open-ILS/web/js/ui/default/staff/serials/services/core.js @@ -126,6 +126,19 @@ function(egCore , orderByFilter , $q , $filter , $uibModal) { }); } + // fetch subscription, distributions, streams, captions, + // and notes associated with the indicated bib + service.fetchLastCallnumber = function(contextOrg) { + return egCore.pcrud.search('acn', { + record : service.bibId, + owning_lib : contextOrg + }, { order_by : [{class:'acn',field:'create_date',direction:'desc'}], limit : 1 }, + { atomic : true } + ).then(function(list) { + return $q.when(list[0]); + }); + } + service.fetchItemsForSubPaged = function(subId,filter,offset,limit) { return service.fetchItemsForSub( subId, -- 2.11.0