From 140cd6d8b660dcaaa3a93b187de24dd82fee1472 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 25 Sep 2018 12:10:28 -0400
Subject: [PATCH] LP#1779158 Active imports display continued

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../cat/vandelay/active-imports.component.html     | 44 +++++++++++++---------
 .../staff/cat/vandelay/active-imports.component.ts | 11 +++++-
 2 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html
index 153fc4f8b3..7a0f591011 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.html
@@ -1,5 +1,13 @@
 
-
+<div *ngIf="trackers.length == 0">
+    <div class="row">
+        <div class="col-lg-6">
+            <div class="alert alert-info">
+                <span i18n>No Imports In Progress</span>
+            </div>
+        </div>
+    </div>
+</div>
 
   <div class="row" *ngFor="let tracker of trackers">
     <div class="col-lg-6">
@@ -14,29 +22,31 @@
             <div class="list-group-item border-0 p-2">
               <!-- .id (not .id()) check to see if it's fleshed yet -->
               <span i18n *ngIf="tracker.queue().id">
-                Created for Queue 
+                Created on {{tracker.create_time() | date}} for
                 <a routerLink="/staff/cat/vandelay/queue/{{tracker.record_type()}}/{{tracker.queue().id()}}">
-                  {{tracker.queue().name()}}
+                  Queue {{tracker.queue().name()}}
                 </a>
-                on {{tracker.create_time() | date}}
               </span>
             </div>
             <div class="list-group-item border-0 p-2">
-                <span i18n>State: 
-                    <span *ngIf="tracker.state() == 'active'" i18n>Active</span>
-                    <span *ngIf="tracker.state() == 'complete'" i18n>Complete</span>
-                    <span *ngIf="tracker.state() == 'error'" i18n>Error</span>
-                </span>
-                <span class='pl-3' *ngIf="tracker.state() == 'complete'">
-                    <span class="material-icons text-success">thumb_up</span>
-                </span>
+              <span *ngIf="tracker.action_type() == 'enqueue'" i18n>Enqueuing...</span>
+              <span *ngIf="tracker.action_type() == 'import'" i18n>Importing...</span>
+            </div>
+            <div class="list-group-item border-0 p-2">
+              <span i18n>State:</span>
+              <span *ngIf="tracker.state() == 'active'" i18n>Active</span>
+              <span *ngIf="tracker.state() == 'complete'" i18n>Complete</span>
+              <span *ngIf="tracker.state() == 'error'" i18n>Error</span>
+              <span class='pl-3' *ngIf="tracker.state() == 'complete'">
+                <span class="material-icons text-success">thumb_up</span>
+              </span>
             </div>
             <div class="list-group-item border-0 p-2">
-                <!-- ensure the progress shows 100% when complete -->
-                <eg-progress-inline 
-                    [max]="tracker.state() == 'complete' ? tracker.actions_performed() : tracker.total_actions() || null"
-                    [value]="tracker.actions_performed()">
-                </eg-progress-inline>
+              <!-- ensure the progress shows 100% when complete -->
+              <eg-progress-inline 
+                [max]="tracker.state() == 'complete' ? tracker.actions_performed() : tracker.total_actions() || null"
+                [value]="tracker.actions_performed()">
+              </eg-progress-inline>
             </div>
           </div>
         </div>
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts
index 7fc353ac2d..6ebcb66378 100644
--- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/active-imports.component.ts
@@ -70,9 +70,10 @@ export class ActiveImportsComponent implements OnInit {
                     existing.total_actions(tracker.total_actions());
                     existing.actions_performed(tracker.actions_performed());
                 } else {
+                    // TODO: replace enqueue trackers with import trackers
+                    // for a given session instead of appending?
                     this.trackers.push(tracker);
-
-                    // TODO: flesh the queue / check record_type
+                    this.fleshTrackerQueue(tracker);
                 }
             },
             err => {},
@@ -89,4 +90,10 @@ export class ActiveImportsComponent implements OnInit {
             }
         );
     }
+
+    fleshTrackerQueue(tracker: IdlObject) {
+        const qClass = tracker.record_type() === 'bib' ? 'vbq' : 'vaq';
+        this.pcrud.retrieve(qClass, tracker.queue())
+        .subscribe(queue => tracker.queue(queue));
+    }
 }
-- 
2.11.0