From 0435f55ec691e54348c0ef64770e0dc43bb3ffc7 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 22 Jul 2020 17:06:17 -0400
Subject: [PATCH] LPXXX volcopy misc

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../eg2/src/app/staff/cat/volcopy/vol-edit.component.html | 10 +++++++++-
 .../staff/share/holdings/batch-item-attr.component.html   | 15 ++++++++++-----
 Open-ILS/src/eg2/src/styles.css                           |  4 ++++
 3 files changed, 23 insertions(+), 6 deletions(-)

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 a66da0f395..6f3db70df5 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
@@ -286,6 +286,7 @@
             <input class="form-control form-control-sm" type="text"
               spellcheck="false"
               [required]="true"
+              [ngClass]="{invalid: !volNode.target.label()}"
               [ngModel]="volNode.target.label()"
               (change)="applyVolValue(volNode.target, 'label', $event.target.value)">
           </ng-container>
@@ -326,13 +327,20 @@
               </button>
             </ng-container>
 
+            <!--
+              Barcode value is not required for new copies, since those 
+              without a barcode will be ignored.
+            -->
             <input type="text" class="form-control form-control-sm"
               title="{{copyStatLabel(copyNode.target)}}"
               id="barcode-input-{{copyNode.target.id()}}"
               spellcheck="false" [required]="true"
               placeholder="New Barcode..." i18n-placeholder
               [disabled]="volcopy.copyStatIsMagic(copyNode.target.status())"
-              [ngClass]="{'text-danger': copyNode.target._dupe_barcode}"
+              [ngClass]="{
+                'text-danger': copyNode.target._dupe_barcode,
+                'invalid': !copyNode.target.barcode() && !copyNode.target.isnew()
+              }"
               (change)="barcodeChanged(copyNode.target, $event.target.value)"  
               (ngModelChange)="copyNode.target.barcode($event)"
               (keyup.enter)="selectNextBarcode(copyNode.target.id())"
diff --git a/Open-ILS/src/eg2/src/app/staff/share/holdings/batch-item-attr.component.html b/Open-ILS/src/eg2/src/app/staff/share/holdings/batch-item-attr.component.html
index ac2426a2f2..64c985fad6 100644
--- a/Open-ILS/src/eg2/src/app/staff/share/holdings/batch-item-attr.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/holdings/batch-item-attr.component.html
@@ -1,5 +1,5 @@
 
-<div class="border rounded m-1" [ngClass]="{'border-danger': warnOnRequired()}">
+<div class="border rounded m-1">
   <div class="font-weight-bold header p-2 d-flex" i18n>
     {{label}} <span *ngIf="hasChanged" class="text-danger">*</span>
     <ng-container *ngIf="bulky()">
@@ -14,7 +14,7 @@
   </div>
   <div tabindex="0" class="p-2" *ngIf="!editing || multiValue()"
     (click)="enterEditMode()" (keyup.enter)="enterEditMode()"
-    [ngClass]="{'has-changes': hasChanged}">
+    [ngClass]="{'has-changes': hasChanged, 'bg-warning': warnOnRequired()}">
     <div class="d-flex" 
       *ngFor="let count of labelCounts | keyvalue; let idx = index">
       <ng-container *ngIf="!expanded && !editing && idx === defaultDisplayCount">
@@ -29,8 +29,13 @@
         </ng-container>
         <div class="flex-1">
           <ng-container *ngIf="displayAs == 'bool'">
-            <span *ngIf="count.key == 't'" i18n>Yes</span>
-            <span *ngIf="count.key == 'f'" i18n>No</span>
+            <ng-container *ngIf="valueIsUnset(count.key); else defaultBool">
+              <span i18n>&lt;Unset&gt;</span>
+            </ng-container>
+            <ng-template #defaultBool>
+              <span *ngIf="count.key == 't'" i18n>Yes</span>
+              <span *ngIf="count.key == 'f'" i18n>No</span>
+            </ng-template>
           </ng-container>
           <ng-container *ngIf="displayAs == 'currency'">
             <ng-container 
@@ -39,7 +44,7 @@
             </ng-container>
             <ng-template #defaultCurrency>{{count.key | currency}}</ng-template>
           </ng-container>
-          <ng-container *ngIf="displayAs == null">
+          <ng-container *ngIf="displayAs != 'bool' && displayAs != 'currency'">
             <ng-container 
               *ngIf="valueIsUnset(count.key); else default">
               <span i18n>&lt;Unset&gt;</span>
diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css
index 7780680d2a..5eebe2629e 100644
--- a/Open-ILS/src/eg2/src/styles.css
+++ b/Open-ILS/src/eg2/src/styles.css
@@ -154,6 +154,10 @@ h5 {font-size: .95rem}
   border-left: 5px solid #FA787E;
 }
 
+.invalid {
+  border-left: 5px solid #FA787E;
+}
+
 /* Typical form CSS.
  * Brings font size down 5% to squeeze a bit more in.
  * Bold labels
-- 
2.11.0