From: Mike Rylander Date: Wed, 9 Sep 2015 14:17:05 +0000 (-0400) Subject: webstaff: Conjoined items management X-Git-Tag: sprint4-merge-nov22~967 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=ba4b2921846e66a4fc22ca2ccd7a21a818299ef2;p=working%2FEvergreen.git webstaff: Conjoined items management Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Signed-off-by: Jason Stephenson --- diff --git a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 index 9635c5d994..f5db2fe8b8 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/index.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/index.tt2 @@ -22,6 +22,10 @@ "[% l('Permanently delete selected copies and/or volumes from catalog?') %]"; s.CONFIRM_DELETE_COPIES_VOLUMES_MESSAGE = "[% l('Will delete {{copies}} copies and {{volumes}} volumes') %]"; + s.CONFIRM_DELETE_PEERS = + "[% l('Unlink selected conjoined copies?') %]"; + s.CONFIRM_DELETE_PEERS_MESSAGE = + "[% l('Will unlink {{peers}} copies') %]"; }]) diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 index 9b5eabae02..62db3ca76c 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/t_catalog.tt2 @@ -59,6 +59,11 @@ [% l('Holdings View') %] +
  • + + [% l('Conjoined Items') %] + +
    • @@ -86,5 +91,8 @@
    [% INCLUDE 'staff/cat/catalog/t_holdings.tt2' %]
    +
    + [% INCLUDE 'staff/cat/catalog/t_conjoined_items.tt2' %] +
    diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2 new file mode 100644 index 0000000000..a4ad8c9a53 --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_items.tt2 @@ -0,0 +1,35 @@ + +
    + + + + + + + + + + + {{item.target_copy().barcode()}} + + + + + {{item.target_copy().call_number().record().simple_record().title()}} + + + + + + +
    + diff --git a/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_selector.tt2 b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_selector.tt2 index 377c42684b..aac05ae9bf 100644 --- a/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_selector.tt2 +++ b/Open-ILS/src/templates/staff/cat/catalog/t_conjoined_selector.tt2 @@ -2,7 +2,8 @@
    -

    [% l('Attach conjoined items') %]

    +

    [% l('Update conjoined items') %]

    +

    [% l('Attach conjoined items') %]

    diff --git a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js index a5331d7e1f..20fe682ec9 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/catalog/app.js @@ -227,9 +227,9 @@ function($scope , $routeParams , $location , $window , $q , egCore) { .controller('CatalogCtrl', ['$scope','$routeParams','$location','$window','$q','egCore','egHolds','egCirc','egConfirmDialog', - 'egGridDataProvider','egHoldGridActions','$timeout','$modal','holdingsSvc','egUser', + 'egGridDataProvider','egHoldGridActions','$timeout','$modal','holdingsSvc','egUser','conjoinedSvc', function($scope , $routeParams , $location , $window , $q , egCore , egHolds , egCirc, egConfirmDialog, - egGridDataProvider , egHoldGridActions , $timeout , $modal , holdingsSvc , egUser) { + egGridDataProvider , egHoldGridActions , $timeout , $modal , holdingsSvc , egUser , conjoinedSvc) { // set record ID on page load if available... $scope.record_id = $routeParams.record_id; @@ -338,6 +338,9 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e $scope.record_id = match[1]; egCore.hatch.setLocalItem("eg.cat.last_record_retrieved", $scope.record_id); $scope.holdings_record_id_changed($scope.record_id); + conjoinedSvc.fetch($scope.record_id).then(function(){ + $scope.conjoinedGridDataProvider.refresh(); + }); init_parts_url(); } else { delete $scope.record_id; @@ -364,6 +367,92 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e $scope.handlers = { } // ------------------------------------------------------------------ + // Conjoined items + + $scope.conjoinedGridControls = {}; + $scope.conjoinedGridDataProvider = egGridDataProvider.instance({ + get : function(offset, count) { + return this.arrayNotifier(conjoinedSvc.items, offset, count); + } + }); + + $scope.changeConjoinedType = function () { + var peers = egCore.idl.Clone($scope.conjoinedGridControls.selectedItems()); + angular.forEach(peers, function (p) { + p.target_copy(p.target_copy().id()); + p.peer_type(p.peer_type().id()); + }); + + var conjoinedGridDataProviderRef = $scope.conjoinedGridDataProvider; + + return $modal.open({ + templateUrl: './cat/catalog/t_conjoined_selector', + animation: true, + controller: + ['$scope','$modalInstance', + function($scope , $modalInstance) { + $scope.update = true; + + $scope.peer_type = null; + $scope.peer_type_list = []; + conjoinedSvc.get_peer_types().then(function(list){ + $scope.peer_type_list = list; + }); + + $scope.ok = function(type) { + var promises = []; + + angular.forEach(peers, function (p) { + p.ischanged(1); + p.peer_type(type); + promises.push(egCore.pcrud.update(p)); + }); + + return $q.all(promises) + .then(function(){$modalInstance.close()}) + .then(function(){return conjoinedSvc.fetch()}) + .then(function(){conjoinedGridDataProviderRef.refresh()}); + } + + $scope.cancel = function($event) { + $modalInstance.dismiss(); + $event.preventDefault(); + } + }] + }); + + } + + $scope.refreshConjoined = function () { + conjoinedSvc.fetch($scope.record_id) + .then(function(){$scope.conjoinedGridDataProvider.refresh();}); + } + + $scope.deleteSelectedConjoined = function () { + var peers = $scope.conjoinedGridControls.selectedItems(); + + if (peers.length > 0) { + egConfirmDialog.open( + egCore.strings.CONFIRM_DELETE_PEERS, + egCore.strings.CONFIRM_DELETE_PEERS_MESSAGE, + {peers : peers.length} + ).result.then(function() { + angular.forEach(peers, function (p) { + p.isdeleted(1); + }); + + egCore.pcrud.remove(peers).then(function() { + return conjoinedSvc.fetch(); + }).then(function() { + $scope.conjoinedGridDataProvider.refresh(); + }); + }); + } + } + if ($scope.record_id) + conjoinedSvc.fetch($scope.record_id); + + // ------------------------------------------------------------------ // Holdings $scope.holdingsGridControls = {}; @@ -827,9 +916,11 @@ function($scope , $routeParams , $location , $window , $q , egCore , egHolds , e controller: ['$scope','$modalInstance', function($scope , $modalInstance) { + $scope.update = false; + $scope.peer_type = null; $scope.peer_type_list = []; - holdingsSvc.get_peer_types().then(function(list){ + conjoinedSvc.get_peer_types().then(function(list){ $scope.peer_type_list = list; }); @@ -1328,6 +1419,53 @@ function(egCore , $q) { ); } + return service; +}]) + +.factory('conjoinedSvc', + ['egCore','$q', +function(egCore , $q) { + + var service = { + items : [], // record search results + index : 0, // search grid index + rid : null + }; + + service.flesh = { + flesh : 4, + flesh_fields : { + bpbcm : ['target_copy','peer_type'], + acp : ['call_number'], + acn : ['record'], + bre : ['simple_record'] + }, + // avoid fetching the MARC blob by specifying which + // fields on the bre to select. More may be needed. + // note that fleshed fields are explicitly selected. + select : { bre : ['id'] }, + order_by : { bpbcm : ['id'] }, + } + + // resolved with the last received copy + service.fetch = function(rid) { + if (!rid && !service.rid) return $q.when(); + + if (rid) service.rid = rid; + service.items = []; + service.index = 0; + + return egCore.pcrud.search( + 'bpbcm', + {peer_record : service.rid}, + service.flesh, + {atomic : true} + ).then( function(list) { // finished + service.items = list; + return service.items; + }); + } + // returns a promise resolved with the list of peer bib types service.get_peer_types = function() { if (egCore.env.bpt)