From 8358009126616e7753003dd49a45479f9a5e9e6b Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 19 Jun 2020 16:50:38 -0400
Subject: [PATCH] LP1880726 MARC Batch edit Angular port

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/cat/volcopy/config.component.html    |  0
 .../src/app/staff/cat/volcopy/config.component.ts  | 50 ++++++++++++++++++++++
 .../app/staff/cat/volcopy/volcopy.component.html   | 32 ++++++++------
 .../src/app/staff/cat/volcopy/volcopy.component.ts |  4 --
 .../src/app/staff/cat/volcopy/volcopy.module.ts    |  4 +-
 5 files changed, 72 insertions(+), 18 deletions(-)
 create mode 100644 Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.html
 create mode 100644 Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.ts

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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.ts
new file mode 100644
index 0000000000..35c926b810
--- /dev/null
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/config.component.ts
@@ -0,0 +1,50 @@
+import {Component, Input, OnInit, AfterViewInit, ViewChild, Renderer2} from '@angular/core';
+import {Router, ActivatedRoute, ParamMap} from '@angular/router';
+import {tap} from 'rxjs/operators';
+import {IdlObject, IdlService} from '@eg/core/idl.service';
+import {EventService} from '@eg/core/event.service';
+import {OrgService} from '@eg/core/org.service';
+import {StoreService} from '@eg/core/store.service';
+import {NetService} from '@eg/core/net.service';
+import {AuthService} from '@eg/core/auth.service';
+import {PcrudService} from '@eg/core/pcrud.service';
+import {HoldingsService} from '@eg/staff/share/holdings/holdings.service';
+import {VolCopyContext} from './volcopy';
+import {VolCopyService} from './volcopy.service';
+import {FormatService} from '@eg/core/format.service';
+import {StringComponent} from '@eg/share/string/string.component';
+import {ComboboxComponent, ComboboxEntry} from '@eg/share/combobox/combobox.component';
+
+@Component({
+  selector: 'eg-volcopy-config',
+  templateUrl: 'config.component.html'
+})
+export class VolCopyConfigComponent implements OnInit, AfterViewInit {
+
+    @Input() context: VolCopyContext;
+
+    constructor(
+        private router: Router,
+        private route: ActivatedRoute,
+        private renderer: Renderer2,
+        private evt: EventService,
+        private idl: IdlService,
+        private org: OrgService,
+        private net: NetService,
+        private auth: AuthService,
+        private pcrud: PcrudService,
+        private holdings: HoldingsService,
+        private volcopy: VolCopyService,
+        private format: FormatService,
+        private store: StoreService
+    ) { }
+
+    ngOnInit() {
+    }
+
+    ngAfterViewInit() {
+
+    }
+}
+
+
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 ff1473f3ed..2c697788e4 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
@@ -6,22 +6,17 @@
   </div>
 </div>
 
-<ng-container *ngIf="!loading && !sessionExpired">
+<ng-container *ngIf="!sessionExpired">
 
   <eg-bib-summary *ngIf="context.recordId" [recordId]="context.recordId"></eg-bib-summary>
 
-  <div class="m-2"> </div>
+  <div class="mt-3"> </div>
 
   <ngb-tabset [activeId]="tab" (tabChange)="beforeTabChange($event)">
 
     <ngb-tab title="Holdings" i18n-title id="holdings">
       <ng-template ngbTabContent>
         <div class="mt-2">
-          <div class="row" [hidden]="!loading">
-            <div class="col-lg-6 offset-lg-3">
-              <eg-progress-inline #loadingProgress></eg-progress-inline>
-            </div>
-          </div>
           <eg-vol-edit [context]="context"></eg-vol-edit>
         </div>
       </ng-template>
@@ -30,13 +25,16 @@
     <ngb-tab title="Item Attributes" i18n-title id="attrs">
       <ng-template ngbTabContent>
         <div class="mt-2">
-          <div class="row" [hidden]="!loading">
-            <div class="col-lg-6 offset-lg-3">
-              <eg-progress-inline #loadingProgress></eg-progress-inline>
-            </div>
-          </div>
+          <eg-copy-attrs [context]="context"></eg-copy-attrs>
+        </div>
+      </ng-template>
+    </ngb-tab>
+
+    <ngb-tab title="Defaults" i18n-title id="config">
+      <ng-template ngbTabContent>
+        <div class="mt-2">
+          <eg-volcopy-config [context]="context"></eg-volcopy-config>
         </div>
-        <eg-copy-attrs [context]="context"></eg-copy-attrs>
       </ng-template>
     </ngb-tab>
 
@@ -56,3 +54,11 @@
 
 </ng-container>
 
+<ng-container *ngIf="loading">
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <eg-progress-inline></eg-progress-inline>
+    </div>
+  </div>
+</ng-container>
+
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 b73777986a..8f156351fd 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
@@ -53,9 +53,6 @@ export class VolCopyComponent implements OnInit {
     target: string;   // item | callnumber | record | session
     targetId: string; // id value or session string
 
-    @ViewChild('loadingProgress', {static: false})
-    loadingProgress: ProgressInlineComponent;
-
     constructor(
         private router: Router,
         private route: ActivatedRoute,
@@ -298,7 +295,6 @@ export class VolCopyComponent implements OnInit {
 
 
     save() {
-        this.loadingProgress.reset();
         this.loading = true;
 
         // Volume update API wants volumes fleshed with copies, instead
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.module.ts b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.module.ts
index 7400161776..5c4289de57 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.module.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/volcopy/volcopy.module.ts
@@ -8,12 +8,14 @@ import {VolEditComponent} from './vol-edit.component';
 import {VolCopyService} from './volcopy.service';
 import {CopyAttrsComponent} from './copy-attrs.component';
 import {ItemLocationSelectModule} from '@eg/share/item-location-select/item-location-select.module';
+import {VolCopyConfigComponent} from './config.component';
 
 @NgModule({
   declarations: [
     VolCopyComponent,
     VolEditComponent,
-    CopyAttrsComponent
+    CopyAttrsComponent,
+    VolCopyConfigComponent
   ],
   imports: [
     StaffCommonModule,
-- 
2.11.0