From c24cba48c942c783bc4efcb5f7e48ed43aee698c Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 15 Nov 2019 18:12:36 -0500
Subject: [PATCH] LPXXX Marc enriched more fields displaying

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../src/app/staff/share/marc-edit/editable-content.component.html | 4 +++-
 .../src/app/staff/share/marc-edit/editable-content.component.ts   | 5 ++++-
 .../src/eg2/src/app/staff/share/marc-edit/editor.component.ts     | 2 +-
 .../eg2/src/app/staff/share/marc-edit/fixed-field.component.ts    | 4 ++--
 .../eg2/src/app/staff/share/marc-edit/rich-editor.component.html  | 8 +++++++-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html
index 687a5a60f9..0f641418aa 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html
@@ -1,10 +1,12 @@
 
 <input 
   id='marc-editable-content-{{randId}}' 
-  class="p-0 pl-1 pr-1 rounded-0 form-control"
+  class="p-0 pl-1 rounded-0 form-control {{moreClasses}}"
   [size]="inputSize()" 
   [maxlength]="maxLength || ''"
   [disabled]="readOnly" 
+  [attr.tabindex]="readOnly ? -1 : ''"
+  (focus)="$event.target.select()"
   (blur)="propagateTouch()"
   [(ngModel)]="content"
 />
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts
index f1725e6ba1..791a55dda1 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts
@@ -24,6 +24,9 @@ export class EditableContentComponent implements OnInit, ControlValueAccessor {
     @Input() content: string;
     @Input() maxLength: number;
 
+    // space-separated list of additional CSS classes to append
+    @Input() moreClasses: string;
+
     get record(): MarcRecord { return this.context.record; }
 
     randId: string;
@@ -47,7 +50,7 @@ export class EditableContentComponent implements OnInit, ControlValueAccessor {
     }
 
     writeValue(content: string) {
-		   this.content = content;
+        this.content = content;
     }
 
     registerOnChange(fn) {
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.ts
index 361a4fb176..f75e4533d0 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor.component.ts
@@ -90,7 +90,7 @@ export class MarcEditorComponent implements OnInit {
     ngOnInit() {
 
         this.store.getItem('cat.marcedit.flateditor').then(
-            useFlat => this.editorTab = useFlat ? 'flat' : 'rich')
+            useFlat => this.editorTab = useFlat ? 'flat' : 'rich');
 
         this.pcrud.retrieveAll('cbs').subscribe(
             src => this.sources.push({id: +src.id(), label: src.source()}),
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/fixed-field.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/fixed-field.component.ts
index 4a4673043c..28ad9d3c63 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/fixed-field.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/fixed-field.component.ts
@@ -71,10 +71,10 @@ export class FixedFieldComponent implements OnInit {
 
             // Shuffling may occur with our fixed field as a result of
             // external changes.
-            this.record.fixedFieldChange.subscribe(_ => {
+            this.record.fixedFieldChange.subscribe(_ =>
                 this.fieldValue =
                     this.context.record.extractFixedField(this.fieldCode)
-            });
+            );
 
             return this.tagTable.getFFValueTable(this.record.recordType());
 
diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
index 73d0cb7f15..37a2f3ba20 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html
@@ -12,7 +12,7 @@
       </div>
     </div>
     <div class="row pt-0 pb-0 pl-3 form-horizontal">
-      <eg-marc-editable-content [context]="context" [ngModel]="'LDR'" 
+      <eg-marc-editable-content [context]="context" i18n-ngModel [ngModel]="'LDR'" 
         [maxLength]="3" [readOnly]="true"></eg-marc-editable-content>
       <eg-marc-editable-content [context]="context" [(ngModel)]="record.leader" 
         [maxLength]="record.leader.length"></eg-marc-editable-content>
@@ -34,9 +34,15 @@
         [maxLength]="1"></eg-marc-editable-content>
 
       <ng-container *ngFor="let subfield of field.subfields">
+
         <!-- subfield character -->
+        <eg-marc-editable-content [readOnly]="true" 
+          moreClasses="text-primary border-right-0 bg-transparent" 
+          i18n-ngModel [ngModel]="'‡'"></eg-marc-editable-content>
         <eg-marc-editable-content [context]="context" [(ngModel)]="subfield[0]"
+          moreClasses="text-info border-left-0"
           [maxLength]="1"></eg-marc-editable-content>
+
         <!-- subfield value -->
         <eg-marc-editable-content [context]="context" [(ngModel)]="subfield[1]">
         </eg-marc-editable-content>
-- 
2.11.0