From 1c6dc95e9af8fd2b4132f31d134ef65d44148ef4 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 17 Jul 2020 10:28:08 -0400
Subject: [PATCH] LPXXX volcopy unified display option

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../eg2/src/app/staff/cat/volcopy/config.component.html | 10 ++++++++++
 .../src/app/staff/cat/volcopy/volcopy.component.html    | 17 +++++++++++------
 .../eg2/src/app/staff/cat/volcopy/volcopy.component.ts  |  8 ++++++++
 3 files changed, 29 insertions(+), 6 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 697462e36d..02bc4a1833 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
@@ -66,6 +66,16 @@
                 </label>
               </div>
             </li>
+            <li class="list-group-item">
+              <div class="form-check form-check-inline">
+                <input class="form-check-input" type="checkbox" 
+                  id="volcopy-unified-interface" 
+                  [(ngModel)]="volcopy.defaults.values.unified_display">
+                <label class="form-check-label" for="volcopy-unified-interface" i18n>
+                  Unified Holdings and Item Attributes Display
+                </label>
+              </div>
+            </li>
           </ul>
         </div>
       </div>
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 b8dd002d6e..e6a13790c2 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
@@ -18,14 +18,19 @@
       <a ngbNavLink i18n>Holdings</a>
       <ng-template ngbNavContent>
         <div class="mt-2"><eg-vol-edit [context]="context"></eg-vol-edit></div>
+        <ng-container *ngIf="volcopy.defaults.values.unified_display">
+          <div class="mt-2"><eg-copy-attrs [context]="context"></eg-copy-attrs></div>
+        </ng-container>
       </ng-template>
     </li>
-    <li ngbNavItem="attrs">
-      <a ngbNavLink i18n>Item Attributes</a>
-      <ng-template ngbNavContent>
-        <div class="mt-2"><eg-copy-attrs [context]="context"></eg-copy-attrs></div>
-      </ng-template>
-    </li>
+    <ng-container *ngIf="!volcopy.defaults.values.unified_display">
+      <li ngbNavItem="attrs">
+        <a ngbNavLink i18n>Item Attributes</a>
+        <ng-template ngbNavContent>
+          <div class="mt-2"><eg-copy-attrs [context]="context"></eg-copy-attrs></div>
+        </ng-template>
+      </li>
+    </ng-container>
     <li ngbNavItem="config">
       <a ngbNavLink i18n>Preferences</a>
       <ng-template ngbNavContent>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.ts
index 9edfb74e72..3ca7101ff7 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.component.ts
@@ -129,6 +129,14 @@ export class VolCopyComponent implements OnInit {
         .then(_ => this.context.setRecordId())
         .then(_ => this.printLabels =
             this.volcopy.defaults.values.print_labels === true)
+        .then(_ => {
+            // unified display has no 'attrs' tab
+            if (this.volcopy.defaults.values.unified_display
+                && this.tab === 'attrs') {
+                this.tab = 'holdings';
+                this.routeToTab();
+            }
+        })
         .then(_ => this.loading = false);
     }
 
-- 
2.11.0