From 573dd9fca6e8a4249a2ed38ffea0a37ae70c7426 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 31 Aug 2015 22:09:01 +0000 Subject: [PATCH] webstaff: start work on authority linker modal When a bib record is opened in the MARC editor, fields that can be put under authority control now have a link button at the end of the subfield list. When clicked, this opens a dialog box that, for now, allows: * creating a new authority record based on the bib heading * creating a new authority record and launching a secondary MARC editor. Signed-off-by: Galen Charlton Signed-off-by: Jason Stephenson --- .../staff/cat/share/t_authority_link_dialog.tt2 | 15 ++ .../staff/cat/share/t_authority_linker.tt2 | 18 +++ .../staff/cat/share/t_edit_new_authority.tt2 | 15 ++ .../web/js/ui/default/staff/cat/catalog/app.js | 15 +- .../js/ui/default/staff/cat/services/marcedit.js | 166 ++++++++++++++++++++- 5 files changed, 223 insertions(+), 6 deletions(-) create mode 100644 Open-ILS/src/templates/staff/cat/share/t_authority_link_dialog.tt2 create mode 100644 Open-ILS/src/templates/staff/cat/share/t_authority_linker.tt2 create mode 100644 Open-ILS/src/templates/staff/cat/share/t_edit_new_authority.tt2 diff --git a/Open-ILS/src/templates/staff/cat/share/t_authority_link_dialog.tt2 b/Open-ILS/src/templates/staff/cat/share/t_authority_link_dialog.tt2 new file mode 100644 index 0000000000..1787168ca7 --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/share/t_authority_link_dialog.tt2 @@ -0,0 +1,15 @@ +
+
+ +

[% l('Manage authority record links') %]

+
+
+ +
+
+ + +
+
diff --git a/Open-ILS/src/templates/staff/cat/share/t_authority_linker.tt2 b/Open-ILS/src/templates/staff/cat/share/t_authority_linker.tt2 new file mode 100644 index 0000000000..ac15751db1 --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/share/t_authority_linker.tt2 @@ -0,0 +1,18 @@ +
+
+ {{bibField.tag}} {{bibField.ind1}}{{bibField.ind2}} +
+ ‡{{sf.0}} {{sf.1}} + +
+
+
+ [% l('Create new authority from this field') %] + + +
+
diff --git a/Open-ILS/src/templates/staff/cat/share/t_edit_new_authority.tt2 b/Open-ILS/src/templates/staff/cat/share/t_edit_new_authority.tt2 new file mode 100644 index 0000000000..d779dd210b --- /dev/null +++ b/Open-ILS/src/templates/staff/cat/share/t_edit_new_authority.tt2 @@ -0,0 +1,15 @@ +
+
+ +

[% l('Edit New Authority') %]

+
+
+ +
+
+ + +
+
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 c31adccbd5..61ad57f3fb 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 @@ -13,8 +13,19 @@ angular.module('egCatalogApp', ['ui.bootstrap','ngRoute','egCoreMod','egGridMod' $locationProvider.html5Mode(true); $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|blob):/); // grid export - var resolver = {delay : - ['egStartup', function(egStartup) {return egStartup.go()}]} + var resolver = {delay : ['egCore','egStartup', function(egCore, egStartup) { + egCore.env.classLoaders.aous = function() { + return egCore.org.settings([ + 'cat.marc_control_number_identifier' + ]).then(function(settings) { + // local settings are cached within egOrg. Caching them + // again in egEnv just simplifies the syntax for access. + egCore.env.aous = settings; + }); + } + egCore.env.loadClasses.push('aous'); + return egStartup.go() + }]}; $routeProvider.when('/cat/catalog/index', { templateUrl: './cat/catalog/t_catalog', diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js index e977cef38f..2ed3339b95 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js +++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js @@ -364,9 +364,59 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap']) ''+ ''+ ''+ + // FIXME: template should probably be moved to file to improve + // translatibility + ''+ '', scope: { field: "=", onKeydown: '=' }, - replace: true + replace: true, + controller : ['$scope','$modal', + function ( $scope, $modal ) { + $scope.isAuthorityControlled = function () { + return ($scope.$parent.$parent.record_type == 'bre') && + $scope.$parent.$parent.controlSet.bibFieldByTag($scope.field.tag); + } + $scope.spawnAuthorityLinker = function() { + // intentionally making a clone in case + // user decides to abandon the linking + var fieldCopy = new MARC21.Field({ + tag : $scope.field.tag, + ind1 : $scope.field.ind1, + ind2 : $scope.field.ind2 + }); + angular.forEach($scope.field.subfields, function(sf) { + fieldCopy.subfields.push(sf.slice(0)); + }); + var cs = $scope.$parent.$parent.controlSet; + var args = { changed : false }; + $modal.open({ + templateUrl: './cat/share/t_authority_link_dialog', + size: 'md', + controller: ['$scope', '$modalInstance', function($scope, $modalInstance) { + $scope.controlSet = cs; + $scope.bibField = fieldCopy; + $scope.focusMe = true; + $scope.args = args; + $scope.ok = function(args) { $modalInstance.close(args) }; + $scope.cancel = function () { $modalInstance.dismiss() }; + }] + }).result.then(function (args) { + if (args.changed) { + $scope.field.subfields.length = 0; + angular.forEach(fieldCopy.subfields, function(sf) { + $scope.field.addSubfields(sf[0], sf[1]); + }); + } + }); + } + } + ] } }) @@ -819,9 +869,15 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap']) deferred.resolve(rec); }); } else { - var bre = new egCore.idl.bre(); - bre.marc($scope.marcXml); - deferred.resolve(bre); + if ($scope.recordType == 'bre') { + var bre = new egCore.idl.bre(); + bre.marc($scope.marcXml); + deferred.resolve(bre); + } else if ($scope.recordType == 'are') { + var are = new egCore.idl.are(); + are.marc($scope.marcXml); + deferred.resolve(are); + } $scope.brandNewRecord = true; } return deferred.promise; @@ -1042,4 +1098,106 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap']) } }]) +.directive("egMarcEditAuthorityLinker", function () { + return { + restrict: 'E', + replace: true, + templateUrl: './cat/share/t_authority_linker', + scope : { + bibField : '=', + controlSet : '=', + changed : '=' + }, + controller: ['$scope','$modal','egCore','egAuth', + function ($scope , $modal, egCore, egAuth) { + + var cni = egCore.env.aous['cat.marc_control_number_identifier'] || + 'Set cat.marc_control_number_identifier in Library Settings'; + + $scope._controlled_sf_list = {}; + var found_acs = []; + angular.forEach($scope.controlSet.controlSetList(), function(acs_id) { + if ($scope.controlSet.controlSet(acs_id).control_map[$scope.bibField.tag]) + found_acs.push(acs_id); + }); + if (found_acs.length) { + angular.forEach( + $scope.controlSet.controlSet(found_acs[0]).control_map[$scope.bibField.tag], function(sf) { + $scope._controlled_sf_list[ sf[$scope.bibField.tag] ] = 1; + } + ) + } + + $scope.bibField.subfields.forEach(function (sf) { + if (sf[0] in $scope._controlled_sf_list) { + sf.selected = true; + sf.selectable = true; + } else { + sf.selectable = false; + } + }); + $scope.summarizeField = function() { + var source_f = { + 'tag': $scope.bibField.tag, + 'ind1': $scope.bibField.ind1, + 'ind2': $scope.bibField.ind2, + 'subfields': [] + }; + $scope.bibField.subfields.forEach(function(sf) { + if (sf.selected) { + source_f.subfields.push([ sf[0], sf[1] ]); + } + }); + return source_f; + } + + $scope.updateSubfieldZero = function(value) { + $scope.changed = true; + $scope.bibField.deleteSubfield({ code : ['0'] }); + $scope.bibField.subfields.push([ + '0', '(' + cni + ')' + value + ]); + }; + + $scope.createAuthorityFromBib = function(spawn_editor) { + var source_f = $scope.summarizeField(); + + var args = { authority_id : 0 }; + var method = (spawn_editor) ? + 'open-ils.cat.authority.record.create_from_bib.readonly' : + 'open-ils.cat.authority.record.create_from_bib'; + egCore.net.request( + 'open-ils.cat', + method, + source_f, + cni, + egAuth.token() + ).then(function(newAuthority) { + if (spawn_editor) { + $modal.open({ + templateUrl: './cat/share/t_edit_new_authority', + size: 'lg', + controller: + ['$scope', '$modalInstance', function($scope, $modalInstance) { + $scope.focusMe = true; + $scope.args = args; + $scope.dirty_flag = false; + $scope.marc_xml = newAuthority, + $scope.ok = function(args) { $modalInstance.close(args) } + $scope.cancel = function () { $modalInstance.dismiss() } + }] + }).result.then(function (args) { + if (!args || !args.authority_id) return; + $scope.updateSubfieldZero(args.authority_id); + }); + } else { + $scope.updateSubfieldZero(newAuthority.id()); + } + }); + } + } + ] + } +}) + ; -- 2.11.0