From 9f49278dda11d606c321419cbd8ddc81a7320dd1 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Sun, 2 Oct 2022 06:52:29 -0700 Subject: [PATCH] LP1942220: follow-up: ng lint fixes Signed-off-by: Jane Sandberg --- .../staff/acq/lineitem/copy-attrs.component.html | 14 ++++----- .../acq/lineitem/lineitem-list.component.html | 34 +++++++++++----------- .../app/staff/acq/lineitem/lineitem.component.ts | 5 ++-- .../app/staff/acq/lineitem/notes.component.html | 2 +- .../src/app/staff/acq/lineitem/notes.component.ts | 7 ++--- .../app/staff/acq/picklist/summary.component.ts | 12 ++------ .../src/app/staff/acq/picklist/upload.component.ts | 8 ++--- .../eg2/src/app/staff/acq/po/notes.component.html | 2 +- .../eg2/src/app/staff/acq/po/notes.component.ts | 8 ++--- .../src/app/staff/acq/po/summary.component.html | 18 ++++++------ 10 files changed, 45 insertions(+), 65 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html index 2d8ce9da71..758c965e3b 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.html @@ -88,31 +88,31 @@
- + - + Mark Received - + Un-Receive - + Cancel - +  Cancel - + {{copy.cancel_reason().label()}} - + {{copy.cancel_reason().label()}} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html index a67193aeaa..f1dcc08e5e 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.html @@ -213,24 +213,24 @@ class="form-control"> - + - - - - - - - - + + + + + + + + - - + - ISBN - ISSN - UPC + ISBN + ISSN + UPC
- - @@ -535,7 +535,7 @@
-
+
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.component.ts index 7d7c2d5ac8..0851c00817 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.component.ts @@ -1,9 +1,8 @@ -import {Component, OnInit} from '@angular/core'; +import {Component} from '@angular/core'; @Component({ templateUrl: 'lineitem.component.html' }) -export class LineitemComponent implements OnInit { - ngOnInit() {} +export class LineitemComponent { } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html index c4b32c2f0e..68358d870a 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.html @@ -31,7 +31,7 @@
- +
VENDOR PUBLIC
 diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.ts index 14f82e6beb..ad84bac186 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/notes.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, AfterViewInit, Input, Output, EventEmitter} from '@angular/core'; +import {Component, AfterViewInit, Input, Output, EventEmitter} from '@angular/core'; import {Observable} from 'rxjs'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; @@ -10,7 +10,7 @@ import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; templateUrl: 'notes.component.html', selector: 'eg-lineitem-notes' }) -export class LineitemNotesComponent implements OnInit, AfterViewInit { +export class LineitemNotesComponent implements AfterViewInit { @Input() lineitem: IdlObject; noteText: string; @@ -27,9 +27,6 @@ export class LineitemNotesComponent implements OnInit, AfterViewInit { private net: NetService ) {} - ngOnInit() { - } - ngAfterViewInit() { const node = document.getElementById('note-text-input'); if (node) { node.focus(); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/summary.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/summary.component.ts index 9ee226c198..a552f282f8 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/summary.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/summary.component.ts @@ -1,6 +1,4 @@ -import {Component, Input, OnInit, AfterViewInit, ViewChild} from '@angular/core'; -import {of, Observable} from 'rxjs'; -import {tap, take, map} from 'rxjs/operators'; +import {Component, Input, OnInit} from '@angular/core'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {FormatService} from '@eg/core/format.service'; @@ -9,11 +7,8 @@ import {OrgService} from '@eg/core/org.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {StoreService} from '@eg/core/store.service'; import {ServerStoreService} from '@eg/core/server-store.service'; -import {ComboboxEntry, ComboboxComponent} from '@eg/share/combobox/combobox.component'; -import {ProgressDialogComponent} from '@eg/share/dialog/progress.component'; import {EventService} from '@eg/core/event.service'; import {HoldingsService} from '@eg/staff/share/holdings/holdings.service'; -import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {BroadcastService} from '@eg/share/util/broadcast.service'; @@ -21,7 +16,7 @@ import {BroadcastService} from '@eg/share/util/broadcast.service'; templateUrl: 'summary.component.html', selector: 'eg-acq-picklist-summary' }) -export class PicklistSummaryComponent implements OnInit, AfterViewInit { +export class PicklistSummaryComponent implements OnInit { private _picklistId: number; @Input() set picklistId(id: number) { @@ -60,9 +55,6 @@ export class PicklistSummaryComponent implements OnInit, AfterViewInit { this.load().then(_ => this.initDone = true); } - ngAfterViewInit() { - } - load(): Promise { this.picklist = null; if (!this.picklistId) { return Promise.resolve(); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts index a27da982b2..17f1f75da6 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.ts @@ -1,7 +1,6 @@ -import {Component, OnInit, AfterViewInit, Input, +import {Component, AfterViewInit, Input, ViewChild, OnDestroy} from '@angular/core'; import {Router} from '@angular/router'; -import {Subject} from 'rxjs'; import {tap} from 'rxjs/operators'; import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; @@ -20,7 +19,6 @@ import {ProgressInlineComponent} from '@eg/share/dialog/progress-inline.componen import {AlertDialogComponent} from '@eg/share/dialog/alert.component'; import {ServerStoreService} from '@eg/core/server-store.service'; import {PicklistUploadService} from './upload.service'; -import {OrgSelectComponent} from '@eg/share/org-select/org-select.component'; const TEMPLATE_SETTING_NAME = 'eg.acq.picklist.upload.templates'; @@ -63,7 +61,7 @@ const ORG_SETTINGS = [ selector: 'eg-acq-upload', templateUrl: './upload.component.html' }) -export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { +export class UploadComponent implements AfterViewInit, OnDestroy { // mode can be one of // upload: actually upload and process a MARC order file @@ -205,8 +203,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { } } - ngOnInit() {} - ngAfterViewInit() { this.loadStartupData(); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html index 8227a7cb96..a3f9681559 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.html @@ -21,7 +21,7 @@
- +
VENDOR PUBLIC
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.ts index 75bbaafd19..d7af8da7c1 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/notes.component.ts @@ -1,16 +1,15 @@ -import {Component, OnInit, AfterViewInit, Input, Output, EventEmitter} from '@angular/core'; +import {Component, AfterViewInit, Input, Output, EventEmitter} from '@angular/core'; import {Observable} from 'rxjs'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {OrgService} from '@eg/core/org.service'; import {AuthService} from '@eg/core/auth.service'; -import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; @Component({ templateUrl: 'notes.component.html', selector: 'eg-po-notes' }) -export class PoNotesComponent implements OnInit, AfterViewInit { +export class PoNotesComponent implements AfterViewInit { @Input() po: IdlObject; noteText: string; @@ -25,9 +24,6 @@ export class PoNotesComponent implements OnInit, AfterViewInit { private net: NetService ) {} - ngOnInit() { - } - ngAfterViewInit() { const node = document.getElementById('note-text-input'); if (node) { node.focus(); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html index 30bae1d15f..8d344b3cfc 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.html @@ -31,8 +31,8 @@
- On Order - Received + On Order + Received Pending / Activatable @@ -52,7 +52,7 @@ (Warning: + *ngIf="evt.textcode === 'ACQ_FUND_EXCEEDS_WARN_PERCENT'"> Fund exceeds warning percent: {{evt.payload.fund.code()}} ({{evt.payload.fund.year()}}). @@ -65,7 +65,7 @@
+ *ngIf="evt.textcode === 'ACQ_FUND_EXCEEDS_STOP_PERCENT'; else noPrice"> Fund exceeds stop percent: {{evt.payload.fund.code()}} ({{evt.payload.fund.year()}}). @@ -73,19 +73,19 @@ + *ngIf="evt.textcode === 'ACQ_LINEITEM_NO_PRICE'; else noCopies"> One or more line items have no price. + *ngIf="evt.textcode === 'ACQ_LINEITEM_NO_COPIES'; else noOwner"> One or more line items have no items attached. + *ngIf="evt.textcode === 'ACQ_COPY_NO_OWNING_LIB'; else otherBlock"> One or more items have no owning lib. @@ -145,7 +145,7 @@
{{po().lineitem_count()}}
-
+