From dd471e3e3c0f2aa09a0287d89127aafcbaa9973d Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 14 Sep 2020 14:43:25 -0400
Subject: [PATCH] LP1888723 Volcopy parts on demand; checkdigit preference

Support creating monograph parts on the fly in the Angular holdings
editor.

Create a separate preference for controlling the visibility of the 'Use
Checkdigit' checkbox.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Ruth Frasur <rfrasur@library.in.gov>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>
---
 .../app/staff/cat/volcopy/config.component.html    | 10 +++++++
 .../app/staff/cat/volcopy/vol-edit.component.html  | 25 +++++++---------
 .../app/staff/cat/volcopy/vol-edit.component.ts    | 20 +++++++++----
 .../app/staff/cat/volcopy/volcopy.component.html   | 33 ++++++++++++----------
 .../src/app/staff/cat/volcopy/volcopy.service.ts   |  4 +--
 5 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
index ab8f41b40a..1fc031a01f 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
@@ -52,6 +52,16 @@
               </div>
             </li>
             <li class="list-group-item">
+              <div class="form-check form-check-inline">
+                <input class="form-check-input" type="checkbox" 
+                  id="hide-use_checkdigit-column" 
+                  [(ngModel)]="volcopy.defaults.hidden.use_checkdigit">
+                <label class="form-check-label" for="hide-use_checkdigit-column" i18n>
+                  Hide Use Checkdigit
+                </label>
+              </div>
+            </li>
+            <li class="list-group-item">
               <!--
                 Copy_number_vc distinguishes from copy_number so the field
                 can appear in the volcopy UI and/or attr editor independently.
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
index c846598550..5926461ec4 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.html
@@ -408,21 +408,16 @@
           </ng-container>
         </div>
         <div class="p-1" [ngStyle]="{flex: flexAt(10)}">
-          <ng-container *ngIf="displayColumn('copy_part')">
-            <ng-container *ngIf="!recordHasParts(volNode.target.record())">
-              <label i18n>N/A</label>
-            </ng-container>
-            <ng-container *ngIf="recordHasParts(volNode.target.record())">
-              <eg-combobox
-                [selectedId]="copyNode.target.parts()[0] ? copyNode.target.parts()[0].id() : null"
-                [smallFormControl]="true"
-                (onChange)="copyPartChanged(copyNode, $event)">
-                <eg-combobox-entry 
-                  *ngFor="let part of volcopy.bibParts[volNode.target.record()]"
-                  [entryId]="part.id()" [entryLabel]="part.label()">
-                </eg-combobox-entry>
-              </eg-combobox>
-            </ng-container>
+        <ng-container *ngIf="displayColumn('copy_part')">
+            <eg-combobox
+              [selectedId]="copyNode.target.parts()[0] ? copyNode.target.parts()[0].id() : null"
+              [smallFormControl]="true" [allowFreeText]="true"
+              (onChange)="copyPartChanged(copyNode, $event)">
+              <eg-combobox-entry 
+                *ngFor="let part of volcopy.bibParts[volNode.target.record()]"
+                [entryId]="part.id()" [entryLabel]="part.label()">
+              </eg-combobox-entry>
+            </eg-combobox>
           </ng-container>
         </div>
         <div class="p-1" [ngStyle]="{flex: flexAt(11)}">
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
index f12dae1965..7dddc63546 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/vol-edit.component.ts
@@ -238,12 +238,22 @@ export class VolEditComponent implements OnInit {
 
         if (entry) {
 
-            const newPart =
-                this.volcopy.bibParts[copy.call_number().record()]
-                .filter(p => p.id() === entry.id)[0];
+            let newPart;
+            if (entry.freetext) {
+                newPart = this.idl.create('bmp');
+                newPart.isnew(true);
+                newPart.record(copy.call_number().record());
+                newPart.label(entry.label);
 
-            // Nothing to change?
-            if (part && part.id() === newPart.id()) { return; }
+            } else {
+
+                newPart =
+                    this.volcopy.bibParts[copy.call_number().record()]
+                    .filter(p => p.id() === entry.id)[0];
+
+                // Nothing to change?
+                if (part && part.id() === newPart.id()) { return; }
+            }
 
             copy.parts([newPart]);
             copy.ischanged(true);
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
index ccb5e5b437..fc254230d2 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.html
@@ -64,25 +64,28 @@
             i18n>Print Labels?</label>                                             
         </div>
 
-        <ng-container *ngIf="tab === 'holdings' && 
-          volcopy.defaults.hidden.generate_barcodes !== true">
+        <ng-container *ngIf="tab === 'holdings'">
           <!-- 
             These actions could cause confusion or unintended
             consequences if visible on any other tabs
           -->
-          <div class="form-check form-check-inline">
-            <input class="form-check-input" type="checkbox" id="use-checkdigit" 
-              (change)="toggleCheckbox('use_checkdigit')"
-              [ngModel]="volcopy.defaults.values.use_checkdigit"/>
-            <label class="form-check-label" for="use-checkdigit" i18n>
-              Use Checkdigit
-            </label>
-          </div>
-          <button class="btn btn-sm btn-outline-dark label-with-material-icon"
-            (click)="volcopy.genBarcodesRequested.emit()">
-            <span i18n>Generate Barcodes</span>
-            <span class="material-icons">refresh</span>
-          </button>
+          <ng-container *ngIf="volcopy.defaults.hidden.use_checkdigit !== true">
+            <div class="form-check form-check-inline">
+              <input class="form-check-input" type="checkbox" id="use-checkdigit" 
+                (change)="toggleCheckbox('use_checkdigit')"
+                [ngModel]="volcopy.defaults.values.use_checkdigit"/>
+              <label class="form-check-label" for="use-checkdigit" i18n>
+                Use Checkdigit
+              </label>
+            </div>
+          </ng-container>
+          <ng-container *ngIf="volcopy.defaults.hidden.generate_barcodes !== true">
+            <button class="btn btn-sm btn-outline-dark label-with-material-icon"
+              (click)="volcopy.genBarcodesRequested.emit()">
+              <span i18n>Generate Barcodes</span>
+              <span class="material-icons">refresh</span>
+            </button>
+          </ng-container>
         </ng-container>
 
         <div class="flex-1"> </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
index 7d065ec9a3..8f3559fc3b 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.service.ts
@@ -406,8 +406,8 @@ export class VolCopyService {
 
         if (recordIds.length === 0) { return; }
 
-        // Avoid doubling up
-        if (this.bibParts[recordIds[0]]) { return; }
+        // All calls fetch updated data since we may be creating
+        // new mono parts during editing.
 
         this.pcrud.search('bmp',
             {record: recordIds, deleted: 'f'})
-- 
2.11.0