From: Bill Erickson Date: Fri, 6 Jul 2018 22:07:29 +0000 (-0400) Subject: LP#1779158 Ang vandelay queue list page cont. X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7276ef8c2d9eef49792646043df56f96f1ee6256;p=working%2FEvergreen.git LP#1779158 Ang vandelay queue list page cont. Signed-off-by: Bill Erickson --- 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 033065231e..8d444dc645 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 @@ -1,15 +1,16 @@ -
+

MARC File Upload

- +
@@ -36,6 +37,7 @@
@@ -44,6 +46,7 @@
@@ -54,6 +57,7 @@
@@ -70,6 +74,7 @@
@@ -102,7 +107,7 @@
+ placeholder="Fall-Through Merge Profile..." i18n-placeholder>
@@ -131,13 +136,14 @@
+ required class="form-control" type="file"/>
+ [disabled]="isUploading || !hasNeededData()" + (click)="upload()" i18n>Upload
diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index 19456ace8c..4a17e32d7d 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -162,11 +162,10 @@ export class ImportComponent implements OnInit, AfterViewInit { } // Required form data varies depending on context. - confirmNeededData(): boolean { - if (!this.selectedQueue || !this.selectedBibSource) { - return false; - } - return true; + hasNeededData(): boolean { + return this.selectedQueue + && Boolean(this.recordType) + && Boolean(this.selectedFile); } // 1. create queue if necessary @@ -174,8 +173,6 @@ export class ImportComponent implements OnInit, AfterViewInit { // 3. Enqueue MARC records // 4. Import records upload() { - if (!this.confirmNeededData()) { return; } - this.sessionKey = null; this.showProgress = true; this.isUploading = true; diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html index ac3da87677..1392b722e3 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.html @@ -1,4 +1,94 @@ -

Queue {{queueSummary ? queueSummary.queue.name() : ''}}

+ +

Queue {{queueSummary.queue.name()}}

+ +
+
+
+
Queue Actions
+
    +
+
+
+
+
+
Queue Summary
+
    +
  • +
    +
    Records in Queue:
    +
    {{queueSummary.total}}
    +
    +
    • +
  • +
    +
    Records Imported:
    +
    {{queueSummary.imported}}
    +
    +
    • +
  • +
    +
    Records Import Failures:
    +
    {{queueSummary.rec_import_errors}}
    +
    +
    • +
  • +
    +
    Items in Queue:
    +
    {{queueSummary.total_items}}
    +
    +
    • +
  • +
    +
    Items Imported:
    +
    {{queueSummary.total_items_imported}}
    +
    +
    • +
  • +
    +
    Item Import Failures:
    +
    {{queueSummary.item_import_errors}}
    +
    +
    • +
+
+
+
+
+
Queue Filters
+
    +
  • +
    +
    Limit to Records with Matches:
    +
    + +
    +
    +
    • +
  • +
    +
    Limit to Non-Imported Records:
    +
    + +
    +
    +
    • +
  • +
    +
    + Limit to Records with Import Errors
    +
    + +
    +
    +
    • +
+
+
+
+ diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts index 8d257ad0bc..405559a80b 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/queue.component.ts @@ -21,6 +21,11 @@ export class QueueComponent implements AfterViewInit { queueSource: GridDataSource; queuedRecClass: string; queueSummary: any; + + // Filters + limitToMatches: boolean; + limitToNonImported: boolean; + limitToImportErrors: boolean; // keep a local copy for convenience attrDefs: IdlObject[];