From 5443336d2273b2241c27160071ba2e6ea82f048a Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sun, 1 Jul 2018 17:01:39 -0400
Subject: [PATCH] LP#1779158 Angular vandelay more import form

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../app/staff/cat/vandelay/import.component.html   | 61 +++++++++-------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
index f7bbaac7ff..5583413c36 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.html
@@ -14,22 +14,22 @@
         <option value='bib-acq' i18n>Acquisitions Records</option>
       </select>
     </div>
-  </div>
-  <div class="row">
     <div class="col-lg-3">
-      <label i18n>Create a New Upload Queue</label>
+      <label i18n>Select a Record Source</label>
     </div>
     <div class="col-lg-3">
-      <input type="text" class="form-control" 
-        placeholder="Create a new queue..." i18n-placeholder
-        [(ngModel)]="newQueueName"/>
+      <eg-typeahead [entries]="formatEntries('bibSources')"
+        placeholder="Record Source..." i18n-placeholder>
+      </eg-typeahead>
     </div>
+  </div>
+  <div class="row">
     <div class="col-lg-3">
-      <label i18n>or Add to an Existing Queue</label>
+      <label i18n>Find or Create a Qeueue</label>
     </div>
     <div class="col-lg-3">
       <eg-typeahead [entries]="formatEntries('activeQueues')"
-        placeholder="Select a Queue..." i18n-placeholder>
+        [allowFreeText]="true" placeholder="Select a Queue..." i18n-placeholder>
       </eg-typeahead>
     </div>
   </div>
@@ -58,15 +58,10 @@
         placeholder="Holdings Import Profile..." i18n-placeholder>
       </eg-typeahead>
     </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-3">
-      <label i18n>Select a Record Source</label>
-    </div>
+    <div class="col-lg-3"><label i18n>Import Non-Matching Records</label></div>
     <div class="col-lg-3">
-      <eg-typeahead [entries]="formatEntries('bibSources')"
-        placeholder="Record Source..." i18n-placeholder>
-      </eg-typeahead>
+      <input class="form-check-input" type="checkbox" 
+        [(ngModel)]="importNonMatching">
     </div>
   </div>
   <div class="row">
@@ -78,29 +73,24 @@
         placeholder="Merge Profile..." i18n-placeholder>
       </eg-typeahead>
     </div>
-  </div>
-  <div class="row">
-    <div class="col-lg-3"><label i18n>Import Non-Matching Records</label></div>
-    <div class="col-lg-3">
-      <input class="form-check-input" type="checkbox" 
-        [(ngModel)]="importNonMatching">
-    </div>
-    <div class="col-lg-3"><label i18n>Merge On Single Match</label></div>
+    <div class="col-lg-3"><label i18n>Merge On Exact Match (901c)</label></div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
-        [(ngModel)]="mergeOnSingleMatch">
+        [(ngModel)]="mergeOnExact">
     </div>
   </div>
   <div class="row">
-    <div class="col-lg-3"><label i18n>Merge On Exact Match (901c)</label></div>
     <div class="col-lg-3">
-      <input class="form-check-input" type="checkbox" 
-        [(ngModel)]="mergeOnExact">
+      <label i18n>Insufficient Quality Fall-Through Profile</label></div>
+    <div class="col-lg-3">
+      <eg-typeahead [entries]="formatEntries('mergeProfiles')"
+        placeholder="Merge Profile..." i18n-placeholder>
+      </eg-typeahead>
     </div>
-    <div class="col-lg-3"><label i18n>Merge On Best Match</label></div>
+    <div class="col-lg-3"><label i18n>Merge On Single Match</label></div>
     <div class="col-lg-3">
       <input class="form-check-input" type="checkbox" 
-        [(ngModel)]="mergeOnBestMatch">
+        [(ngModel)]="mergeOnSingleMatch">
     </div>
   </div>
   <div class="row">
@@ -110,15 +100,14 @@
       <input type="number" step="0.1" 
         class="form-control" [(ngModel)]="minQualityRatio">
     </div>
+    <div class="col-lg-3"><label i18n>Merge On Best Match</label></div>
     <div class="col-lg-3">
-      <label i18n>Insufficient Quality Fall-Through Profile</label></div>
-    <div class="col-lg-3">
-      <eg-typeahead [entries]="formatEntries('mergeProfiles')"
-        placeholder="Merge Profile..." i18n-placeholder>
-      </eg-typeahead>
+      <input class="form-check-input" type="checkbox" 
+        [(ngModel)]="mergeOnBestMatch">
     </div>
   </div>
-
+  <div class="row">
+  </div>
 </div>
 
 
-- 
2.11.0