From cc272ab4162fbb1bea2e6cb3e0bd0e37051729b0 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Fri, 12 May 2017 10:29:11 -0400 Subject: [PATCH] webstaff: Link MFHD action under Manage Subscriptions Signed-off-by: Jason Etheridge --- Open-ILS/src/templates/staff/serials/index.tt2 | 2 + .../src/templates/staff/serials/t_link_mfhd.tt2 | 35 ++++++ .../staff/serials/t_subscription_manager.tt2 | 2 +- .../serials/directives/subscription_manager.js | 131 ++++++++++++++++++++- .../js/ui/default/staff/serials/services/core.js | 2 + 5 files changed, 169 insertions(+), 3 deletions(-) create mode 100644 Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 diff --git a/Open-ILS/src/templates/staff/serials/index.tt2 b/Open-ILS/src/templates/staff/serials/index.tt2 index e95f8a8a81..63e7f3ad0b 100644 --- a/Open-ILS/src/templates/staff/serials/index.tt2 +++ b/Open-ILS/src/templates/staff/serials/index.tt2 @@ -17,6 +17,8 @@ angular.module('egCoreMod').run(['egStrings', function(s) { s.SERIALS_SUBSCRIPTION_SUCCESS_CLONE = "[% l('Cloned serial subscription') %]"; s.SERIALS_SUBSCRIPTION_FAIL_CLONE = "[% l('Failed to clone serial subscription') %]"; + s.SERIALS_DISTRIBUTION_SUCCESS_LINK_MFHD = "[% l('Distribution linked to MFHD') %]"; + s.SERIALS_DISTRIBUTION_FAIL_LINK_MFHD = "[% l('Failed to link distribution to MFHD') %]"; }]); [% END %] diff --git a/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 new file mode 100644 index 0000000000..0b423fd169 --- /dev/null +++ b/Open-ILS/src/templates/staff/serials/t_link_mfhd.tt2 @@ -0,0 +1,35 @@ +
+
+ +

[% l('Link MFHD') %]

+
+
+
+ +
+ {{legacy.mvr.physical_description}} +
+
+ + +
+
+
+
+ + +
+ + +
+ diff --git a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 index 1c15c0ae2f..d0f2c28a8b 100644 --- a/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 +++ b/Open-ILS/src/templates/staff/serials/t_subscription_manager.tt2 @@ -73,7 +73,7 @@ label="[% l('Apply Binding Template') %]"> - diff --git a/Open-ILS/web/js/ui/default/staff/serials/directives/subscription_manager.js b/Open-ILS/web/js/ui/default/staff/serials/directives/subscription_manager.js index da2a9c576d..b7f88683ef 100644 --- a/Open-ILS/web/js/ui/default/staff/serials/directives/subscription_manager.js +++ b/Open-ILS/web/js/ui/default/staff/serials/directives/subscription_manager.js @@ -208,7 +208,7 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider , var some_success = false; var seen = {}; angular.forEach(rows, function(row) { - console.log(row); + //console.log(row); if (!seen[row.id]) { seen[row.id] = 1; promises.push( @@ -245,11 +245,138 @@ function($scope , $q , egSerialsCoreSvc , egCore , egGridDataProvider , }); }); } + $scope.link_mfhd = function(rows) { + if (!rows) { return; } + var row = rows[0]; + if (!row['sdist.id']) { return; } + $uibModal.open({ + templateUrl: './serials/t_link_mfhd', + controller: 'LinkMFHDCtrl', + resolve : { + row : function() { + return rows[0]; + }, + bibId : function() { + return $scope.bibId; + } + }, + windowClass: 'app-modal-window', + backdrop: 'static', + keyboard: false + }).result.then(function(args) { + console.log('modal done', args); + egCore.pcrud.search('sdist', { + id: rows[0]['sdist.id'] + }, {}, { atomic : true } + ).then(function(resp){ + var evt = egCore.evt.parse(resp); + if (evt) { // any way to just throw or return this to the error handler? + console.log('failure',resp); + ngToast.danger(egCore.strings.SERIALS_DISTRIBUTION_FAIL_LINK_MFHD); + } + var sdist = resp[0]; + sdist.ischanged(true); + sdist.summary_method( args.summary_method ); + sdist.record_entry( args.which_mfhd ); + egCore.pcrud.apply(sdist).then( + function(resp) { // maybe success + console.log('apply',resp); + var evt = egCore.evt.parse(resp); + if (evt) { // any way to just throw or return this to the error handler? + console.log('failure',resp); + ngToast.danger(egCore.strings.SERIALS_DISTRIBUTION_FAIL_LINK_MFHD); + } else { + console.log('success',resp); + ngToast.success(egCore.strings.SERIALS_DISTRIBUTION_SUCCESS_LINK_MFHD); + reload(); + } + }, + function(resp) { + console.log('failure',resp); + ngToast.danger(egCore.strings.SERIALS_DISTRIBUTION_FAIL_LINK_MFHD); + } + ); + }); + }); + } }] } }) +.controller('LinkMFHDCtrl', + ['$scope','$q','$uibModalInstance','egCore','row','bibId', +function($scope , $q , $uibModalInstance , egCore , row , bibId ) { + console.log('row',row); + console.log('bibId',bibId); + $scope.args = { + summary_method: row['sdist.summary_method'] || 'add_to_sre', + }; + if (row['sdist.record_entry']) { + $scope.args.which_mfhd = row['sdist.record_entry'].id; + } + $scope.ok = function(count) { $uibModalInstance.close($scope.args) } + $scope.cancel = function () { $uibModalInstance.dismiss() } + $scope.legacies = {}; + egCore.pcrud.search('sre', { + record: bibId, owning_lib : row['owning_lib.id'], active: 't', deleted: 'f' + }, {}, { atomic : true } + ).then( + function(resp) { // maybe success + var evt; if (evt = egCore.evt.parse(resp)) { console.error(evt.toString()); return; } + if (!resp) { return; } + + var promises = []; + var seen = {}; + + angular.forEach(resp, function(sre) { + console.log('sre',sre); + if (!seen[sre.record()]) { + seen[sre.record()] = 1; + $scope.legacies[sre.record()] = { mvr: null, svrs: [] }; + promises.push( + egCore.net.request( + 'open-ils.search', + 'open-ils.search.biblio.record.mods_slim.retrieve.authoritative', + sre.record() + ).then(function(resp2) { + var evt; if (evt = egCore.evt.parse(resp2)) { console.error(evt.toString()); return; } + if (!resp2) { return; } + $scope.legacies[sre.record()].mvr = egCore.idl.toHash(resp2); + }) + ); + promises.push( + egCore.net.request( + 'open-ils.search', + 'open-ils.search.serial.record.bib.retrieve', + sre.record(), + row['owning_lib.id'] + ).then(function(resp2) { + angular.forEach(resp2,function(r) { + if (r.sre_id() > 0) { + console.log('svr',egCore.idl.toHash(r)); + $scope.legacies[sre.record()].svrs.push( egCore.idl.toHash(r) ); + } + }); + }) + ); + } + if (typeof $scope.legacies[sre.record()].sres == 'undefined') { + $scope.legacies[sre.record()].sres = {}; + } + $scope.legacies[sre.record()].sres[sre.id()] = egCore.idl.toHash(sre); + }); + + $q.all(promises).then(function(){ + console.log('done',$scope.legacies); + }); + }, + function(resp) { // outright failure + console.error('failure',resp); + } + ) +}]) + .controller('CloneCtrl', ['$scope','$uibModalInstance','egCore','subs', function($scope , $uibModalInstance , egCore , subs ) { @@ -282,7 +409,7 @@ function($scope , $uibModalInstance , egCore , subs ) { } $scope.mvr = egCore.idl.toHash(resp); - console.log($scope.mvr); + //console.log($scope.mvr); }, function(resp) { // outright failure console.error(resp); 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 2f69e04a8a..35a164323f 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 @@ -46,6 +46,7 @@ function(egCore , orderByFilter , $q) { var _ssub = { 'id' : ssubHash.id, 'owning_lib.name' : ssubHash.owning_lib.name, + 'owning_lib.id' : ssubHash.owning_lib.id, 'start_date' : ssubHash.start_date, 'end_date' : ssubHash.end_date, 'expected_date_offset' : ssubHash.expected_date_offset @@ -61,6 +62,7 @@ function(egCore , orderByFilter , $q) { angular.forEach([ 'id', 'summary_method', + 'record_entry', 'label', 'display_grouping', 'unit_label_prefix', -- 2.11.0