From a307cec41c8f4146cc3218faeec11b9a042b564c Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Thu, 8 Oct 2015 02:09:41 +0000
Subject: [PATCH] webstaff: implement subfield stacking in MARC editor

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../src/templates/staff/cat/share/t_marcedit.tt2     |  4 ++++
 Open-ILS/src/templates/staff/css/cat.css.tt2         |  5 +++++
 .../web/js/ui/default/staff/cat/services/marcedit.js | 12 +++++++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2 b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
index 808438f61c..92dc60b55c 100644
--- a/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
+++ b/Open-ILS/src/templates/staff/cat/share/t_marcedit.tt2
@@ -141,6 +141,10 @@
       </div>
     </div>
     <div class="marcrecord pad-vert">
+      <label>
+        <input type="checkbox" ng-model="stackSubfields.enabled" />
+        [% l('Stack subfields') %]
+      </label>
       <div>
         <eg-marc-edit-leader record="record" on-keydown="onKeydown"/>
       </div>
diff --git a/Open-ILS/src/templates/staff/css/cat.css.tt2 b/Open-ILS/src/templates/staff/css/cat.css.tt2
index 7a5e12dcae..a94f56ef17 100644
--- a/Open-ILS/src/templates/staff/css/cat.css.tt2
+++ b/Open-ILS/src/templates/staff/css/cat.css.tt2
@@ -28,6 +28,11 @@
     margin: 0px;
 }
 
+.marcedit_stacked_subfield {
+    display: block;
+    margin-left: 3em;
+}
+
 input.marcedit:focus {
     background-color: lightcyan;
 }
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 ae88380100..ce6f4c876e 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
@@ -418,9 +418,10 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     '<span><eg-marc-edit-tag context-functions="contextFunctions" field="field" tag="field.tag" on-keydown="onKeydown"/></span>'+
                     '<span><eg-marc-edit-ind field="field" ind="field.ind1" on-keydown="onKeydown" ind-number="1"/></span>'+
                     '<span><eg-marc-edit-ind field="field" ind="field.ind2" on-keydown="onKeydown" ind-number="2"/></span>'+
-                    '<span><eg-marc-edit-subfield ng-class="{ \'unvalidatedheading\' : field.heading_checked && !field.heading_valid}" ng-repeat="subfield in field.subfields" subfield="subfield" field="field" on-keydown="onKeydown"/></span>'+
+                    '<span><eg-marc-edit-subfield ng-class="{ \'unvalidatedheading\' : field.heading_checked && !field.heading_valid, \'marcedit_stacked_subfield\' : stackSubfields.enabled }" ng-repeat="subfield in field.subfields" subfield="subfield" field="field" on-keydown="onKeydown"/></span>'+
                     // FIXME: template should probably be moved to file to improve
                     // translatibility
+                    '<span  ng-class="{ \'marcedit_stacked_subfield\' : stackSubfields.enabled }">' +
                     '<button class="btn btn-info btn-xs" '+
                     'aria-label="Manage authority record links" '+
                     'ng-show="isAuthorityControlled(field)"'+
@@ -430,11 +431,13 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                     '</button>'+
                     '<span ng-show="field.heading_checked && field.heading_valid" class="glyphicon glyphicon-ok-sign"></span>'+
                     '<span ng-show="field.heading_checked && !field.heading_valid" class="glyphicon glyphicon-question-sign"></span>'+
+                    '</span>'+
                   '</div>',
         scope: { field: "=", onKeydown: '=', contextFunctions: '=' },
         replace: true,
         controller : ['$scope','$modal',
             function ( $scope,  $modal ) {
+                $scope.stackSubfields = $scope.$parent.$parent.stackSubfields;
                 $scope.isAuthorityControlled = function () {
                     return ($scope.$parent.$parent.record_type == 'bre') &&
                            $scope.$parent.$parent.controlSet.bibFieldByTag($scope.field.tag);
@@ -636,6 +639,13 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                 $scope.controlfields = [];
                 $scope.datafields = [];
                 $scope.controlSet = egTagTable.getAuthorityControlSet();
+                $scope.stackSubfields = { enabled : false };
+                egCore.hatch.getItem('cat.marcedit.stack_subfields').then(function(val) {
+                    $scope.stackSubfields.enabled = val;
+                });
+                $scope.$watch('stackSubfields.enabled', function (newVal, oldVal) {
+                    if (newVal != oldVal) egCore.hatch.setItem('cat.marcedit.stack_subfields', newVal);
+                });
 
                 egTagTable.loadTagTable({ marcRecordType : $scope.record_type });
 
-- 
2.43.2