From: Galen Charlton Date: Mon, 29 Nov 2021 16:11:02 +0000 (-0500) Subject: LP#1942220: more Angularization of the Acquisitions staff interfaces X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8e062cc8ffb3264b926047bca2a5cbd9df1ee6d8;p=working%2FEvergreen.git LP#1942220: more Angularization of the Acquisitions staff interfaces This patch extends on the work done for bugs 1929741 and 1929749 to finish converting the following interfaces to Angular: - Selection Lists - Load MARC Order Records - Purchase Orders - Create Purchase Order Note: this project was often referred to as "Angular acquisitions sprint 4" Mike Rylander made some contributions to this patch. Sponsored-by: Evergreen Community Development Initiative Signed-off-by: Galen Charlton Signed-off-by: Ruth Frasur Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/eg2/src/app/staff/acq/acq-common.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/acq-common.module.ts new file mode 100644 index 0000000000..7a32edacbe --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/acq-common.module.ts @@ -0,0 +1,19 @@ +import {NgModule} from '@angular/core'; +import {StaffCommonModule} from '@eg/staff/common.module'; +import {UploadComponent} from './picklist/upload.component'; + +@NgModule({ + declarations: [ + UploadComponent + ], + exports: [ + UploadComponent + ], + imports: [ + StaffCommonModule + ], + providers: [] +}) + +export class AcqCommonModule { +} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html new file mode 100644 index 0000000000..29d1b3eed1 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.html @@ -0,0 +1,26 @@ + +
+
+

Add Items to Selected Line Items

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+ +
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.ts new file mode 100644 index 0000000000..6f2237c625 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-copies-dialog.component.ts @@ -0,0 +1,18 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-add-copies-dialog', + templateUrl: './add-copies-dialog.component.html' +}) + +export class AddCopiesDialogComponent extends DialogComponent { + @Input() ids: number[]; + lineitemWithCopies: IdlObject; + constructor(private modal: NgbModal) { super(modal); } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html new file mode 100644 index 0000000000..9567e2e7b0 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.html @@ -0,0 +1,32 @@ + +
+
+

Add Line Items to Purchase order

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+

Please select a PO and click "Add to Purchase Order" to add the line items, + or "Exit Dialog" to exit without adding the line items to a PO.

+ +
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.ts new file mode 100644 index 0000000000..5e8739d682 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/add-to-po-dialog.component.ts @@ -0,0 +1,18 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-add-to-po-dialog', + templateUrl: './add-to-po-dialog.component.html' +}) + +export class AddToPoDialogComponent extends DialogComponent { + @Input() ids: number[]; + po: ComboboxEntry; + constructor(private modal: NgbModal) { super(modal); } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html index 8a5bb4d132..a654c87bc8 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.html @@ -1,10 +1,6 @@ - - - - + + @@ -12,14 +8,15 @@
Owning Branch
-
Copy Location
+
Shelving Location
Collection Code
Fund
Circ Modifier
-
Callnumber
+
Callnumber
- Barcode + Barcode
+
Receiver
@@ -35,6 +32,7 @@
@@ -47,10 +45,13 @@
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.ts index 5adb6e3f00..f312b43eca 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-copies.component.ts @@ -8,8 +8,8 @@ import {AuthService} from '@eg/core/auth.service'; import {LineitemService} from './lineitem.service'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {LineitemCopyAttrsComponent} from './copy-attrs.component'; -import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {CancelDialogComponent} from './cancel-dialog.component'; +import {LineitemAlertDialogComponent} from './lineitem-alert-dialog.component'; const BATCH_FIELDS = [ 'owning_lib', @@ -28,12 +28,18 @@ const BATCH_FIELDS = [ export class LineitemBatchCopiesComponent implements OnInit { @Input() lineitem: IdlObject; + @Input() batchAdd = false; - @ViewChild('confirmAlertsDialog') confirmAlertsDialog: ConfirmDialogComponent; + @Output() becameDirty = new EventEmitter(); + + @ViewChild('confirmAlertsDialog') confirmAlertsDialog: LineitemAlertDialogComponent; @ViewChild('cancelDialog') cancelDialog: CancelDialogComponent; // Current alert that needs confirming alertText: IdlObject; + liId: number; + liTitle: string; + alertComment: string; constructor( private evt: EventService, @@ -43,7 +49,14 @@ export class LineitemBatchCopiesComponent implements OnInit { private liService: LineitemService ) {} - ngOnInit() {} + ngOnInit() { + if (!this.lineitem) { + this.lineitem = this.idl.create('jub'); + const copy = this.idl.create('acqlid'); + copy.isnew(true); + this.lineitem.lineitem_details([copy]); + } + } // Propagate values from the batch edit bar into the indivudual LID's batchApplyAttrs(copyTemplate: IdlObject) { @@ -53,6 +66,7 @@ export class LineitemBatchCopiesComponent implements OnInit { this.lineitem.lineitem_details().forEach(copy => { copy[field](val); copy.ischanged(true); // isnew() takes precedence + this.becameDirty.emit(true); }); }); } @@ -66,6 +80,7 @@ export class LineitemBatchCopiesComponent implements OnInit { } else { // Requires a Save Changes action. copy.isdeleted(true); + this.becameDirty.emit(true); } } @@ -94,7 +109,7 @@ export class LineitemBatchCopiesComponent implements OnInit { } receiveCopy(copy: IdlObject) { - this.checkLiAlerts().then(ok => { + this.liService.checkLiAlerts([this.lineitem], this.confirmAlertsDialog).then(ok => { this.net.request( 'open-ils.acq', 'open-ils.acq.lineitem_detail.receive', @@ -111,29 +126,6 @@ export class LineitemBatchCopiesComponent implements OnInit { ).subscribe(ok => this.handleActionResponse(ok)); } - checkLiAlerts(): Promise { - - let promise = Promise.resolve(true); - - const notes = this.lineitem.lineitem_notes().filter(note => - note.alert_text() && !this.liService.alertAcks[note.id()]); - - if (notes.length === 0) { return promise; } - - notes.forEach(n => { - promise = promise.then(_ => { - this.alertText = n.alert_text(); - return this.confirmAlertsDialog.open().toPromise().then(ok => { - if (!ok) { return Promise.reject(); } - this.liService.alertAcks[n.id()] = true; - return true; - }); - }); - }); - - return promise; - } - hasEditableCopies(): boolean { if (this.lineitem) { const copies = this.lineitem.lineitem_details(); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html new file mode 100644 index 0000000000..72e71b122b --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.html @@ -0,0 +1,70 @@ + +
+
Owning Branch
+
Shelving Location
+
Collection Code
+
Fund
+
Circ Modifier
+
+
+ + + +
+
+

Batch Update Items on Selected Line Items

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+
+
+ + + + + | + + + + + +
+
+ +
+ + + +
+ +
+ +
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.ts new file mode 100644 index 0000000000..0ca7575463 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/batch-update-copies-dialog.component.ts @@ -0,0 +1,91 @@ +import {Component, Input} from '@angular/core'; +import {Observable} from 'rxjs'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlObject} from '@eg/core/idl.service'; +import {OrgService} from '@eg/core/org.service'; +import {AuthService} from '@eg/core/auth.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {LineitemCopyAttrsComponent} from './copy-attrs.component'; + +@Component({ + selector: 'eg-acq-batch-update-copies-dialog', + templateUrl: './batch-update-copies-dialog.component.html' +}) + +export class BatchUpdateCopiesDialogComponent extends DialogComponent { + + @Input() ids: number[]; + + copyCount = ''; + selectedFormula: ComboboxEntry; + formulaFilter = {owner: []}; + templateCopy: IdlObject; + + constructor( + private modal: NgbModal, + private org: OrgService, + private auth: AuthService + ) { + super(modal); + } + + open(args?: NgbModalOptions): Observable { + if (!args) { + args = {}; + } + + this.copyCount = ''; + this.selectedFormula = null; + this.formulaFilter.owner = + this.org.fullPath(this.auth.user().ws_ou(), true); + + return super.open(args); + } + + canApply(): boolean { + if (!this.templateCopy) { return false; } + + const _copyCount = parseInt(this.copyCount, 10); + if ((_copyCount && _copyCount > 0) || + this.selectedFormula?.id || + this.templateCopy.owning_lib() || + this.templateCopy.location() || + this.templateCopy.collection_code() || + this.templateCopy.fund() || + this.templateCopy.circ_modifier()) { + return true; + } else { + return false; + } + } + + compileBatchChange(): any { + const changes = { + _dist_formula: this.selectedFormula?.id + }; + const _copyCount = parseInt(this.copyCount, 10); + if (_copyCount && _copyCount > 0) { + changes['item_count'] = _copyCount; + } + if (this.templateCopy.owning_lib()) { + changes['owning_lib'] = this.templateCopy.owning_lib(); + } + if (this.templateCopy.location()) { + changes['location'] = this.templateCopy.location(); + } + if (this.templateCopy.collection_code()) { + changes['collection_code'] = this.templateCopy.collection_code(); + } + if (this.templateCopy.fund()) { + changes['fund'] = this.templateCopy.fund(); + } + if (this.templateCopy.circ_modifier()) { + changes['circ_modifier'] = this.templateCopy.owning_lib(); + } + return changes; + } + +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.css b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.css new file mode 100644 index 0000000000..56fc5d395e --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.css @@ -0,0 +1,3 @@ +.bib-finder-results-row:nth-child(even) { + background-color: rgba(0,0,0,.03); +} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html new file mode 100644 index 0000000000..5adebb5b0a --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.html @@ -0,0 +1,57 @@ + +
+
+

Link Line Item to Catalog

+ +
+
+

Line Item: {{liId}}

+
+ + + +
+
+
+ +
+
+
+
+
Search results
+
+
+
+ + +
+
+ Record {{rec.id}}: + {{rec.display.title}} + {{rec.display.author}} + {{rec.display.isbn}} + {{rec.display.issn}} + {{rec.display.pubdate}} + {{rec.display.publisher}} +
+
+
+
+
+
MARC Display
+ +
+
+
+
+ +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.ts new file mode 100644 index 0000000000..630400d8e7 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/bib-finder-dialog.component.ts @@ -0,0 +1,107 @@ +import {Component, Input, ViewChild} from '@angular/core'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {NetService} from '@eg/core/net.service'; +import {EgEvent, EventService} from '@eg/core/event.service'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {LineitemService} from './lineitem.service'; +import {BibRecordService, BibRecordSummary} from '@eg/share/catalog/bib-record.service'; + +@Component({ + selector: 'eg-acq-bib-finder-dialog', + styleUrls: ['./bib-finder-dialog.component.css'], + templateUrl: './bib-finder-dialog.component.html' +}) + +export class BibFinderDialogComponent extends DialogComponent { + @Input() liId: number; + + queryString: string; + lineitem: IdlObject; + results: BibRecordSummary[] = []; + doingSearch = false; + bibToDisplay: number; + + constructor( + private modal: NgbModal, + private net: NetService, + private evt: EventService, + private bib: BibRecordService, + private liService: LineitemService + ) { + super(modal); + } + + open(args?: NgbModalOptions): Observable { + if (!args) { + args = {}; + } + + this.queryString = ''; + this.results.length = 0; + this.doingSearch = false; + this.bibToDisplay = null; + this.liService.getFleshedLineitems([this.liId], {fromCache: true}).subscribe(liStruct => { + this.lineitem = liStruct.lineitem; + this.queryString = this._buildDefaultQuery(this.lineitem); + }); + return super.open(args); + } + + _buildDefaultQuery(li: IdlObject): string { + let query = ''; + ['title', 'author'].forEach(field => { + const attr = this.liService.getFirstAttributeValue(li, field); + if (attr.length) { + query += field + ':' + attr + ' '; + } + }); + ['isbn', 'issn', 'upc'].forEach(field => { + const attr = this.liService.getFirstAttributeValue(li, field); + if (attr.length) { + query += 'identifier|' + field + ':' + attr + ' '; + } + }); + return query; + } + + submitSearch() { + this.results.length = 0; + this.bibToDisplay = null; + this.doingSearch = true; + this.net.request( + 'open-ils.search', + 'open-ils.search.biblio.multiclass.query.staff', + {limit: 15}, this.queryString, 1 + ).subscribe(response => { + const evt = this.evt.parse(response); + if (evt) { + this.doingSearch = false; + return; + } + const ids = response.ids.map(x => x[0]); + if (ids.length < 1) { + this.doingSearch = false; + return; + } + const bibSummaries: {[id: number]: BibRecordSummary} = {}; + this.bib.getBibSummaries(ids).subscribe( + summary => bibSummaries[summary.id] = summary, + err => {}, + () => { + this.doingSearch = false; + ids.forEach(id => { + if (bibSummaries[id]) { + this.results.push(bibSummaries[id]); + } + }); + } + ); + }); + } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts index fa82cec9ad..3d5912e310 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/brief-record.component.ts @@ -79,7 +79,11 @@ export class BriefRecordComponent implements OnInit { // Append fields to the document dfNode.setAttribute('tag', '' + tags[0]); - dfNode.setAttribute('ind1', ' '); + if (attr.code() === 'upc') { + dfNode.setAttribute('ind1', '1'); + } else { + dfNode.setAttribute('ind1', ' '); + } dfNode.setAttribute('ind2', ' '); sfNode.setAttribute('code', '' + subfields[0]); const tNode = doc.createTextNode(value); diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html index 23ae488701..a8e7dd1a6a 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.html @@ -1,15 +1,23 @@
-

Cancel

+

Confirm Order Cancellation

+

Confirm Line Item Cancellation

+

Confirm Item Cancellation

-

Select a cancel reason:

+

Please select a cancel reason and click "Apply" to cancel the order, + or "Exit Dialog" to exit without cancelling the order.

+

Please select a cancel reason and click "Apply" to cancel the line item, + or "Exit Dialog" to exit without cancelling the line item.

+

Please select a cancel reason and click "Apply" to cancel the item, + or "Exit Dialog" to exit without cancelling the item.

diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.ts index 630f57d389..98b04480e9 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/cancel-dialog.component.ts @@ -10,6 +10,7 @@ import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; }) export class CancelDialogComponent extends DialogComponent { + @Input() recordType = 'po'; cancelReason: number; constructor(private modal: NgbModal) { super(modal); } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html new file mode 100644 index 0000000000..c295f329df --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.html @@ -0,0 +1,29 @@ + + +
+

Apply Claim Policy

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+

Select a claim policy:

+ +
+
+ + +
+ + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.ts new file mode 100644 index 0000000000..f1c407b3b2 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/claim-policy-dialog.component.ts @@ -0,0 +1,16 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-claim-policy-dialog', + templateUrl: './claim-policy-dialog.component.html' +}) + +export class ClaimPolicyDialogComponent extends DialogComponent { + @Input() ids: number[]; + claimPolicy: number; + constructor(private modal: NgbModal) { super(modal); } +} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html index a29b178bff..22e7650ced 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.html @@ -1,3 +1,10 @@ +

Items for Line Item {{lineitem?.id()}} ({{getTitle(lineitem)}})

+ + +
@@ -16,6 +23,7 @@ @@ -23,7 +31,7 @@ [disabled]="!distribFormCbox.selectedId || liLocked" (click)="applyFormula(distribFormCbox.selectedId)" i18n>Apply -
@@ -38,7 +46,7 @@ -
+
Distribution formulas applied to this lineitem
    @@ -58,7 +66,10 @@
- + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.ts index ac5788ecfb..b6ae8e26df 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copies.component.ts @@ -1,7 +1,8 @@ import {Component, OnInit, AfterViewInit, Input, Output, EventEmitter, ViewChild} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {tap} from 'rxjs/operators'; +import {Observable, of} from 'rxjs'; +import {tap, map} from 'rxjs/operators'; import {Pager} from '@eg/share/util/pager'; import {IdlService, IdlObject} from '@eg/core/idl.service'; import {OrgService} from '@eg/core/org.service'; @@ -11,6 +12,7 @@ import {AuthService} from '@eg/core/auth.service'; import {LineitemService, FleshCacheParams} from './lineitem.service'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {ItemLocationService} from '@eg/share/item-location-select/item-location-select.service'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; const FORMULA_FIELDS = [ 'owning_lib', @@ -26,17 +28,30 @@ interface FormulaApplication { } @Component({ + selector: 'eg-lineitem-copies', templateUrl: 'copies.component.html' }) export class LineitemCopiesComponent implements OnInit, AfterViewInit { + static newCopyId = -1; + // modes are 'normal' and 'multiAdd' + // normal = manage copies for a single line item whose + // ID is taken from the route + // multiAdd = embedded in a modal and applying the results + // to selected LIs + @Input() mode = 'normal'; + + // emited only in multiAdd mode + @Output() lineitemWithCopies = new EventEmitter(); + lineitemId: number; lineitem: IdlObject; copyCount = 1; batchOwningLib: IdlObject; batchFund: ComboboxEntry; batchCopyLocId: number; + dirty = false; saving = false; progressMax = 0; progressValue = 0; @@ -47,6 +62,8 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { // Can any changes be applied? liLocked = false; + @ViewChild('leaveConfirm', { static: true }) leaveConfirm: ConfirmDialogComponent; + constructor( private route: ActivatedRoute, private idl: IdlService, @@ -63,13 +80,19 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { this.formulaFilter.owner = this.org.fullPath(this.auth.user().ws_ou(), true); - this.route.paramMap.subscribe((params: ParamMap) => { - const id = +params.get('lineitemId'); - if (id !== this.lineitemId) { - this.lineitemId = id; - if (id) { this.load(); } - } - }); + if (this.mode === 'multiAdd') { + this.load(); + } else { + // normal mode, we're checking the route to initalize + // ourselves + this.route.paramMap.subscribe((params: ParamMap) => { + const id = +params.get('lineitemId'); + if (id !== this.lineitemId) { + this.lineitemId = id; + if (id) { this.load(); } + } + }); + } this.liService.getLiAttrDefs(); } @@ -82,13 +105,23 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { params = {toCache: true, fromCache: true}; } - return this.liService.getFleshedLineitems([this.lineitemId], params) - .pipe(tap(liStruct => this.lineitem = liStruct.lineitem)).toPromise() - .then(_ => { - this.liLocked = - this.lineitem.state().match(/on-order|received|cancelled/); - }) - .then(_ => this.applyCount()); + if (this.mode === 'multiAdd') { + this.lineitem = this.idl.create('jub'); + this.lineitem.lineitem_details([]); + this.lineitem.distribution_formulas([]); + this.liLocked = false; // trusting our invoker in multiAdd mode + this.applyCount(); + this.lineitemWithCopies.emit(this.lineitem); + return Promise.resolve(true); + } else { + return this.liService.getFleshedLineitems([this.lineitemId], params) + .pipe(tap(liStruct => this.lineitem = liStruct.lineitem)).toPromise() + .then(_ => { + this.liLocked = + this.lineitem.state().match(/on-order|received|cancelled/); + }) + .then(_ => this.applyCount()); + } } ngAfterViewInit() { @@ -103,9 +136,11 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { while (copies.length < this.copyCount) { const copy = this.idl.create('acqlid'); copy.id(LineitemCopiesComponent.newCopyId--); + copy.owning_lib(this.auth.user().ws_ou()); copy.isnew(true); copy.lineitem(this.lineitem.id()); copies.push(copy); + this.dirty = true; } if (copies.length > this.copyCount) { @@ -163,11 +198,17 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { app.creator(this.auth.user().id()); app.formula(formula.id()); - this.pcrud.create(app).toPromise().then(a => { - a.creator(this.auth.user()); - a.formula(formula); - this.lineitem.distribution_formulas().push(a); - }); + if (this.mode === 'multiAdd') { + app.isnew(true); + this.lineitem.distribution_formulas().push(app); + this.dirty = true; + } else { + this.pcrud.create(app).toPromise().then(a => { + a.creator(this.auth.user()); + a.formula(formula); + this.lineitem.distribution_formulas().push(a); + }); + } } // Grab values applied by distribution formulas and cache them before @@ -228,6 +269,7 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { } else { copy[field](val); + this.dirty = true; } }); @@ -248,6 +290,7 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { () => this.load({toCache: true}).then(_ => { this.liService.activateStateChange.emit(this.lineitem.id()); this.saving = false; + this.dirty = false; }) ); } @@ -260,6 +303,26 @@ export class LineitemCopiesComponent implements OnInit, AfterViewInit { ); }); } + + getTitle(li: IdlObject): string { + if (!li) { return ''; } + return this.liService.getFirstAttributeValue(li, 'title'); + } + + canDeactivate(): Observable { + if (this.dirty) { + return this.leaveConfirm.open().pipe(map(confirmed => { + if (confirmed) { + // fire-and-forget fetching the line item to restore it + // to its previous state + this.liService.getFleshedLineitems([ this.lineitemId ], {toCache: true}).toPromise(); + } + return confirmed; + })); + } else { + return of(true); + } + } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.css b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.css new file mode 100644 index 0000000000..ca6cb05f1a --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.css @@ -0,0 +1,7 @@ +.fund-balance-state-stop { + color: #c00; + font-weight: bold; +} +.fund-balance-state-warning { + color: #c93; +} 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 43f13b3245..2d8ce9da71 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 @@ -11,12 +11,14 @@
@@ -35,7 +37,9 @@
@@ -45,11 +49,12 @@
-
+
{{copy.cn_label()}} @@ -65,7 +70,7 @@ - + {{copy.barcode()}} @@ -77,7 +82,10 @@
- +
+ {{copy.receiver()?.usrname()}} +
+
@@ -87,7 +95,7 @@ delete - + Mark Received @@ -97,7 +105,7 @@ Cancel - Cancel +  Cancel @@ -115,3 +123,7 @@
+ + {{r.label}} + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts index 4c12012e7f..f07bc3a23d 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/copy-attrs.component.ts @@ -4,6 +4,7 @@ import {Pager} from '@eg/share/util/pager'; import {IdlObject, IdlService} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; +import {OrgService} from '@eg/core/org.service'; import {LineitemService, COPY_ORDER_DISPOSITION} from './lineitem.service'; import {ComboboxComponent, ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {ItemLocationService} from '@eg/share/item-location-select/item-location-select.service'; @@ -11,14 +12,22 @@ import {ItemLocationSelectComponent} from '@eg/share/item-location-select/item-l @Component({ templateUrl: 'copy-attrs.component.html', + styleUrls: ['copy-attrs.component.css'], selector: 'eg-lineitem-copy-attrs' }) export class LineitemCopyAttrsComponent implements OnInit { @Input() lineitem: IdlObject; @Input() rowIndex: number; + @Input() batchAdd = false; + @Input() gatherParamsOnly = false; + + @Output() becameDirty = new EventEmitter(); + @Output() templateCopy = new EventEmitter(); fundEntries: ComboboxEntry[]; + _fundBalanceCache: string[] = []; + _inflight: Promise[] = []; circModEntries: ComboboxEntry[]; private _copy: IdlObject; @@ -47,6 +56,8 @@ export class LineitemCopyAttrsComponent implements OnInit { // Always read-only. @Input() embedded = false; + @Input() showReceiver = false; + // Emits an 'acqlid' object; @Output() batchApplyRequested: EventEmitter = new EventEmitter(); @Output() deleteRequested: EventEmitter = new EventEmitter(); @@ -62,16 +73,22 @@ export class LineitemCopyAttrsComponent implements OnInit { private idl: IdlService, private net: NetService, private auth: AuthService, + private org: OrgService, private loc: ItemLocationService, private liService: LineitemService ) {} ngOnInit() { - if (this.batchMode) { // stub batch copy + if (this.gatherParamsOnly) { + this.batchMode = false; + this.batchAdd = false; + } + + if (this.batchMode || this.gatherParamsOnly) { // stub batch copy this.copy = this.idl.create('acqlid'); this.copy.isnew(true); - + this.templateCopy.emit(this.copy); } else { // When a batch selector value changes, duplicate the selected @@ -95,6 +112,17 @@ export class LineitemCopyAttrsComponent implements OnInit { const announce: any = {}; this.copy.ischanged(true); + if (!this.batchMode) { + if (field !== 'owning_lib') { + this.becameDirty.emit(true); + } else { + // FIXME eg-org-select current send needless change + // events, so we need to check + if (entry && this.copy[field]() !== entry.id()) { + this.becameDirty.emit(true); + } + } + } switch (field) { @@ -127,13 +155,31 @@ export class LineitemCopyAttrsComponent implements OnInit { } } + // copied from combobox to get the label right for funds + getOrgShortname(ou: any) { + if (typeof ou === 'object') { + return ou.shortname(); + } else { + return this.org.get(ou).shortname(); + } + } + // Tell our inputs about the values we know we need // Values will be pre-cached in the liService + // + // TODO: figure out a better way to do this so that we + // don't need to duplicate the code to format + // the display labels for funds correctly setInitialOptions(copy: IdlObject) { if (copy.fund()) { const fund = this.liService.fundCache[copy.fund()]; - this.fundEntries = [{id: fund.id(), label: fund.code(), fm: fund}]; + this.fundEntries = [{ + id: fund.id(), + label: fund.code() + ' (' + fund.year() + ')' + + ' (' + this.getOrgShortname(fund.org()) + ')', + fm: fund + }]; } if (copy.circ_modifier()) { @@ -142,8 +188,39 @@ export class LineitemCopyAttrsComponent implements OnInit { } } + checkFundBalance(fundId: number): string { + if (this.liService.fundCache[fundId] && this.liService.fundCache[fundId]._balance) { + return this.liService.fundCache[fundId]._balance; + } + if (this._fundBalanceCache[fundId]) { + return this._fundBalanceCache[fundId]; + } + if (this._inflight[fundId]) { + return 'ok'; + } + this._inflight[fundId] = this.net.request( + 'open-ils.acq', + 'open-ils.acq.fund.check_balance_percentages', + this.auth.token(), fundId + ).toPromise().then(r => { + if (r[0]) { + this._fundBalanceCache[fundId] = 'stop'; + } else if (r[1]) { + this._fundBalanceCache[fundId] = 'warning'; + } else { + this._fundBalanceCache[fundId] = 'ok'; + } + if (this.liService.fundCache[fundId]) { + this.liService.fundCache[fundId]['_balance'] = this._fundBalanceCache[fundId]; + } + delete this._inflight[fundId]; + return this._fundBalanceCache[fundId]; + }); + } + fieldIsDisabled(field: string) { if (this.batchMode) { return false; } + if (this.gatherParamsOnly) { return false; } if (this.embedded || // inline expandy view this.copy.isdeleted() || diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.html new file mode 100644 index 0000000000..7144bc266d --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.html @@ -0,0 +1,43 @@ + +

Load Bibs and Items

+

Load Bibs and Items, then Activate Order

+ +
+ +
+ + + +
+

Bib and Item Creation Status

+
+
Line Items Processed
+
{{creationStatus.liProcessed}}
+
+
+
Vandelay Records Processed
+
{{creationStatus.vqbrProcessed}}
+
+
+
Bib Records Merged/Imported
+
{{creationStatus.bibsProcessed}}
+
+
+
Acquisitions Items Processed
+
{{creationStatus.lidProcessed}}
+
+
+
Debits Encumbered
+
{{creationStatus.debitsProcessed}}
+
+
+
Real Items Processed
+
{{creationStatus.copiesProcessed}}
+
+ +

Errors encountered

+
+
{{evt.textcode}}
+
{{evt.desc}}
+
+
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.ts new file mode 100644 index 0000000000..3152b0d584 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/create-assets.component.ts @@ -0,0 +1,106 @@ +import {Component, OnInit, Input, Output} from '@angular/core'; +import {ActivatedRoute, Router, ParamMap, NavigationStart} from '@angular/router'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {NetService} from '@eg/core/net.service'; +import {EventService, EgEvent} from '@eg/core/event.service'; +import {PcrudService} from '@eg/core/pcrud.service'; +import {AuthService} from '@eg/core/auth.service'; +import {LineitemService} from './lineitem.service'; +import {UploadComponent} from '../picklist/upload.component'; + + +interface AssetCreationResponse { + liProcessed: number; + vqbrProcessed: number; + bibsProcessed: number; + lidProcessed: number; + debitsProcessed: number; + copiesProcessed: number; +} + +@Component({ + templateUrl: 'create-assets.component.html' +}) +export class CreateAssetsComponent implements OnInit { + + targetPo: number; + creationRequested = false; + creatingAssets = false; + activatePo = false; + + creationStatus: AssetCreationResponse = { + liProcessed: 0, + vqbrProcessed: 0, + bibsProcessed: 0, + lidProcessed: 0, + debitsProcessed: 0, + copiesProcessed: 0 + }; + creationErrors: EgEvent[] = []; + + constructor( + private router: Router, + private route: ActivatedRoute, + private idl: IdlService, + private auth: AuthService, + private net: NetService, + private evt: EventService, + private pcrud: PcrudService, + private liService: LineitemService + ) { } + + ngOnInit() { + this.activatePo = history.state.activatePo ? true : false; + this.route.parent.paramMap.subscribe((params: ParamMap) => { + this.targetPo = +params.get('poId'); + }); + } + + // using arrow notion here because we want 'this' to + // refer to CreateAssetsComponent, not the component + // that createAssets is passed to + createAssets = (args: Object) => { + this.creatingAssets = true; + this.creationRequested = true; + this.creationErrors = []; + + const assetArgs = { + vandelay: args['vandelay'] + }; + + this.net.request( + 'open-ils.acq', + 'open-ils.acq.purchase_order.assets.create', + this.auth.token(), + this.targetPo, + assetArgs + ).subscribe( + resp => { + const evt = this.evt.parse(resp); + if (evt) { + this.creationErrors.push(evt); + } else { + this.creationStatus['liProcessed'] = resp.li; + this.creationStatus['vqbrProcessed'] = resp.vqbr; + this.creationStatus['bibsProcessed'] = resp.bibs; + this.creationStatus['lidProcessed'] = resp.lid; + this.creationStatus['debitsProcessed'] = resp.debits_accrued; + this.creationStatus['copiesProcessed'] = resp.copies; + } + }, + err => {}, + () => { + if (!this.creationErrors.length) { + this.creatingAssets = false; + if (this.activatePo) { + this.router.navigate( + ['/staff/acq/po/' + this.targetPo], + { state: { finishPoActivation: true } } + ); + } + } + } + ); + } +} + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html new file mode 100644 index 0000000000..6b7e645049 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.html @@ -0,0 +1,28 @@ + +
+
+

Confirm Deletion of Line Items

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+

Are you sure you want to delete the selected line items?

+

Please click "Apply" to delete line items or "Exit Dialog" + to exit without deleting line items.

+
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.ts new file mode 100644 index 0000000000..21c6ecea46 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/delete-lineitems-dialog.component.ts @@ -0,0 +1,17 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-delete-lineitems-dialog', + templateUrl: './delete-lineitems-dialog.component.html' +}) + +export class DeleteLineitemsDialogComponent extends DialogComponent { + @Input() ids: number[]; + constructor(private modal: NgbModal) { super(modal); } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/detail.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/detail.component.html index 5bcba98f0d..386dfc160a 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/detail.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/detail.component.html @@ -31,7 +31,7 @@
- Changes to lineitems that are linked to catalog records will + Changes to line items that are linked to catalog records will not result in changes to the cataloged record.
+
+
+

Export Single Attribute List for Selected Line Items

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+

Download a text file of ISBN, ISSN, or UPC + values for selected line item(s). +

+
+ + +
+
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.ts new file mode 100644 index 0000000000..d6e8a666d5 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/export-attributes-dialog.component.ts @@ -0,0 +1,18 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-export-attributes-dialog', + templateUrl: './export-attributes-dialog.component.html' +}) + +export class ExportAttributesDialogComponent extends DialogComponent { + @Input() ids: number[]; + selectedAttr = 'isbn'; + constructor(private modal: NgbModal) { super(modal); } +} + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/history.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/history.component.html index dda7ce5531..6fc18acc66 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/history.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/history.component.html @@ -1,9 +1,10 @@ - - -
+ + + +
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.html new file mode 100644 index 0000000000..05a02d8204 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.html @@ -0,0 +1,17 @@ + + + +
+ Alert {{alertIndex}} out of {{numAlerts}} +
+
An alert has been placed on line item {{liId}} ({{title}})
+
{{alertText.code()}}
+
{{alertText.description()}}
+
{{alertComment}}
+
Choose "Confirm" to acknowledge this alert and continue with receiving. + Otherwise, choose "Cancel" to not receive the line item(s). If there is more than one alert, + all of them must be confirmed in order to complete the receiving. +
+ diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.ts new file mode 100644 index 0000000000..37b480d291 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-alert-dialog.component.ts @@ -0,0 +1,24 @@ +import {Component, Input, ViewChild} from '@angular/core'; +import {Observable} from 'rxjs'; +import {IdlObject} from '@eg/core/idl.service'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; + +@Component({ + selector: 'eg-lineitem-alert-dialog', + templateUrl: './lineitem-alert-dialog.component.html' +}) + +export class LineitemAlertDialogComponent { + @Input() liId: number; + @Input() title: string; + @Input() alertText: IdlObject; + @Input() alertComment: string; + @Input() numAlerts = 0; + @Input() alertIndex = 0; + + @ViewChild('confirmAlertsDialog') confirmAlertsDialog: ConfirmDialogComponent; + + open(): Observable { + return this.confirmAlertsDialog.open(); + } +} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.css b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.css index ac883144f5..7f3e605850 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.css +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.css @@ -30,4 +30,4 @@ input[type="text"].form-control-sm { border-width: 1px; } .li-state-pending-order { background-color: #EEEEDD; } .li-state-on-order { background-color: #EEDDDD; } .li-state-received { background-color: #DDDDDD; } -.li-state-delayed { background-color: #99CCFF; } +.li-state-delayed { background-color: #B3D9FF; } 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 c6413c15ef..a67193aeaa 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 @@ -1,6 +1,36 @@ - + + + + + + + + + + + + + + + + + + + + +
+ + +
@@ -8,23 +38,43 @@
Add Brief Record + [disabled]="!canDeleteLis() || !selectedIds().length" i18n>Delete Selected Line Items + + +
Selection List Actions
+ + + [disabled]="!picklistId" i18n>Create Purchase Order from Selected Line Items + [disabled]="!picklistId" i18n>Create Purchase Order from All Line Items
Purchase Order Actions
+ Load Bibs and Items + [disabled]="!isActivatedPo() || !selectedIds().length" i18n>Mark Selected Line Items as Received + [disabled]="!isActivatedPo() || !selectedIds().length" i18n>Un-Receive Selected Line Items + [disabled]="!isActivatedPo() || !selectedIds().length" i18n>Cancel Selected Line Items + + +
@@ -69,7 +119,7 @@
- +
@@ -77,7 +127,7 @@
- +
@@ -137,14 +187,72 @@
+
+
+
+ + + + + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + View History +
+
+
+
+
@@ -211,7 +410,7 @@
- # {{li.id()}} + # {{li.id()}} | @@ -225,33 +424,42 @@ | - + unfold_more Expand - + unfold_less Collapse | - event_note - Notes ({{li.lineitem_notes().length}}) + Notes and Alerts ({{li.lineitem_notes().length}}) flag | + routerLink="/staff/catalog/record/{{li.eg_bib_id()}}" + target="_blank"> library_books Catalog - + + | + + library_books + Link to Catalog + + | center_focus_weak - {{li.purchase_order().id()}} + {{li.purchase_order().name()}} - + | + + help + Request(s) + | + routerLink="/staff/acq/search/invoices" target="_blank"> list Invoice(s) - + + | + Claim policy: {{li.claim_policy().name()}} + | store {{li.provider().name()}} - - -
-
-
+ + | + + queue + Import Queue + + - -
-
-
-
- -
-
- - ({{identOptions(li).length}}) - -
- -
- - - -
-
-
- - -
-
-
-
-
-
-
- -
New
-
Selector-Ready
-
Order-Ready
-
Approved
-
Pending-Order
-
On-Order
-
Received
-
Canceled
- -
-
-
- -
- - - - View History -
-
-
-
- -
@@ -411,22 +541,23 @@
-
+
Owning Branch
-
Copy Location
+
Shelving Location
Collection Code
Fund
Circ Modifier
Callnumber
Barcode
+
Receiver
- +
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts index 0e2caacd03..14d12e5e51 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem-list.component.ts @@ -1,17 +1,31 @@ import {Component, OnInit, Input, Output, ViewChild} from '@angular/core'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; -import {Observable, from} from 'rxjs'; +import {Observable, from, of, Subscription} from 'rxjs'; import {tap, concatMap} from 'rxjs/operators'; import {Pager} from '@eg/share/util/pager'; import {EgEvent, EventService} from '@eg/core/event.service'; -import {IdlObject} from '@eg/core/idl.service'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; +import {ToastService} from '@eg/share/toast/toast.service'; import {ServerStoreService} from '@eg/core/server-store.service'; -import {LineitemService} from './lineitem.service'; +import {LineitemService, LINEITEM_DISPOSITION} from './lineitem.service'; +import {PoService} from '../po/po.service'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {HoldingsService} from '@eg/staff/share/holdings/holdings.service'; +import {StringComponent} from '@eg/share/string/string.component'; +import {AlertDialogComponent} from '@eg/share/dialog/alert.component'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {CancelDialogComponent} from './cancel-dialog.component'; +import {DeleteLineitemsDialogComponent} from './delete-lineitems-dialog.component'; +import {AddCopiesDialogComponent} from './add-copies-dialog.component'; +import {BibFinderDialogComponent} from './bib-finder-dialog.component'; +import {BatchUpdateCopiesDialogComponent} from './batch-update-copies-dialog.component'; +import {LinkInvoiceDialogComponent} from './link-invoice-dialog.component'; +import {ExportAttributesDialogComponent} from './export-attributes-dialog.component'; +import {ClaimPolicyDialogComponent} from './claim-policy-dialog.component'; +import {ManageClaimsDialogComponent} from './manage-claims-dialog.component'; +import {LineitemAlertDialogComponent} from './lineitem-alert-dialog.component'; const DELETABLE_STATES = [ 'new', 'selector-ready', 'order-ready', 'approved', 'pending-order' @@ -42,6 +56,8 @@ export class LineitemListComponent implements OnInit { picklistId: number = null; poId: number = null; + poWasActivated = false; + poSubscription: Subscription; recordId: number = null; // lineitems related to a bib. loading = false; @@ -49,6 +65,10 @@ export class LineitemListComponent implements OnInit { pageOfLineitems: IdlObject[] = []; lineitemIds: number[] = []; + saving = false; + progressMax = 0; + progressValue = 0; + // Selected lineitems selected: {[id: number]: boolean} = {}; @@ -65,13 +85,35 @@ export class LineitemListComponent implements OnInit { // sorting and filtering sortOrder = DEFAULT_SORT_ORDER; showFilterSort = false; + filterField = ''; + filterOperator = ''; + filterValue = ''; + filterApplied = false; + + searchTermDatatypes = { + 'id': 'id', + 'state': 'state', + 'acqlia:title': 'text', + 'acqlia:author': 'text', + 'acqlia:publisher': 'text', + 'acqlia:pubdate': 'text', + 'acqlia:isbn': 'text', + 'acqlia:issn': 'text', + 'acqlia:upc': 'text', + 'claim_count': 'number', + 'item_count': 'number', + 'estimated_unit_price': 'money', + }; + dateLikeSearchFields = { + 'acqlia:pubdate': true, + }; batchNote: string; noteIsPublic = false; batchSelectPage = false; batchSelectAll = false; showNotesFor: number; - showExpandFor: number; // 'Expand' + expandLineitem: {[id: number]: boolean} = {}; expandAll = false; action = ''; batchFailure: EgEvent; @@ -81,6 +123,19 @@ export class LineitemListComponent implements OnInit { // TODO: route guard might be better @ViewChild('cancelDialog') cancelDialog: CancelDialogComponent; + @ViewChild('deleteLineitemsDialog') deleteLineitemsDialog: DeleteLineitemsDialogComponent; + @ViewChild('addCopiesDialog') addCopiesDialog: AddCopiesDialogComponent; + @ViewChild('bibFinderDialog') bibFinderDialog: BibFinderDialogComponent; + @ViewChild('batchUpdateCopiesDialog') batchUpdateCopiesDialog: BatchUpdateCopiesDialogComponent; + @ViewChild('linkInvoiceDialog') linkInvoiceDialog: LinkInvoiceDialogComponent; + @ViewChild('exportAttributesDialog') exportAttributesDialog: ExportAttributesDialogComponent; + @ViewChild('claimPolicyDialog') claimPolicyDialog: ClaimPolicyDialogComponent; + @ViewChild('manageClaimsDialog') manageClaimsDialog: ManageClaimsDialogComponent; + @ViewChild('lineItemsUpdatedString', { static: false }) lineItemsUpdatedString: StringComponent; + @ViewChild('noActionableLIs', { static: true }) private noActionableLIs: AlertDialogComponent; + @ViewChild('selectorReadyConfirmDialog', { static: true }) selectorReadyConfirmDialog: ConfirmDialogComponent; + @ViewChild('orderReadyConfirmDialog', { static: true }) orderReadyConfirmDialog: ConfirmDialogComponent; + @ViewChild('confirmAlertsDialog') confirmAlertsDialog: LineitemAlertDialogComponent; constructor( private router: Router, @@ -89,12 +144,17 @@ export class LineitemListComponent implements OnInit { private net: NetService, private auth: AuthService, private store: ServerStoreService, + private idl: IdlService, + private toast: ToastService, private holdings: HoldingsService, - private liService: LineitemService + private liService: LineitemService, + private poService: PoService ) {} ngOnInit() { + this.liService.getLiAttrDefs(); + this.route.queryParamMap.subscribe((params: ParamMap) => { this.pager.offset = +params.get('offset'); this.pager.limit = +params.get('limit'); @@ -130,6 +190,13 @@ export class LineitemListComponent implements OnInit { }); }); + this.poSubscription = this.poService.poRetrieved.subscribe(() => { + this.poWasActivated = this.po().order_date() ? true : false; + }); + } + + po(): IdlObject { + return this.poService.currentPo; } pageSizeChange(count: number) { @@ -152,6 +219,52 @@ export class LineitemListComponent implements OnInit { }); } + filterFieldChange(event) { + this.filterOperator = ''; + if (this.filterField === 'state') { + this.filterValue = ''; + } + this.filterField = event; + } + + filterOperatorChange() { + // empty for now + } + + canApplyFilter(): boolean { + if (this.filterField !== '' && + this.filterValue !== '') { + return true; + } else { + return false; + } + } + + applyFilter() { + this.filterApplied = true; + if (this.pager.isFirstPage()) { + this.load(); + } else { + this.pager.toFirst(); + this.goToPage(); + } + } + + resetFilter() { + this.filterField = ''; + this.filterOperator = ''; + this.filterValue = ''; + if (this.filterApplied) { + this.filterApplied = false; + if (this.pager.isFirstPage()) { + this.load(); + } else { + this.pager.toFirst(); + this.goToPage(); + } + } + } + // Focus the selected lineitem, which may not yet exist in the // DOM for focusing. focusLineitem(id?: number) { @@ -185,7 +298,7 @@ export class LineitemListComponent implements OnInit { this.lineitemIds = []; const searchTerms = {}; - const opts = { id_list: true, limit: 1000 }; + const opts = { limit: 10000 }; if (this.picklistId) { Object.assign(searchTerms, { jub: [ { picklist: this.picklistId } ] }); @@ -195,11 +308,38 @@ export class LineitemListComponent implements OnInit { Object.assign(searchTerms, { jub: [ { purchase_order: this.poId } ] }); } + if (this.filterApplied) { + this._handleFiltering(searchTerms); + } + if (!(this.sortOrder in SORT_ORDER_MAP)) { this.sortOrder = DEFAULT_SORT_ORDER; } Object.assign(opts, SORT_ORDER_MAP[this.sortOrder]); + let _doingClientSort = false; + if (this.filterField === 'item_count' || + this.filterField === 'claim_count') { + opts['flesh_li_details'] = true; + } + if (this.sortOrder === 'title_asc' || + this.sortOrder === 'title_desc' || + this.sortOrder === 'author_asc' || + this.sortOrder === 'author_desc' || + this.sortOrder === 'publisher_asc' || + this.sortOrder === 'publisher_desc') { + // if we're going to sort by an attribute, we'll need + // to actually fetch LI attributes so that we can + // do a client-side sorting pass that ignores + // articles and attempts international collation + _doingClientSort = true; + opts['flesh_attrs'] = true; + } else { + if (!opts['flesh_li_details']) { + opts['id_list'] = true; + } + } + return this.net.request( 'open-ils.acq', 'open-ils.acq.lineitem.unified_search.atomic', @@ -209,11 +349,119 @@ export class LineitemListComponent implements OnInit { null, opts ).toPromise().then(resp => { - this.lineitemIds = resp.map(i => Number(i)); + let _mustDeflesh = false; + if (this.filterField === 'item_count') { + _mustDeflesh = true; + if (!isNaN(Number(this.filterValue))) { + const num = Number(this.filterValue); + resp = resp.filter(l => { + if (this.filterOperator === '' && l.item_count() === num) { + return true; + } else if (this.filterOperator === '__not' && l.item_count() !== num) { + return true; + } else if (this.filterOperator === '__gte' && l.item_count() >= num) { + return true; + } else if (this.filterOperator === '__lte' && l.item_count() <= num) { + return true; + } else { + return false; + } + }); + } + } else if (this.filterField === 'claim_count') { + _mustDeflesh = true; + if (!isNaN(Number(this.filterValue))) { + const num = Number(this.filterValue); + resp.forEach( + l => l['_claim_count'] = l.lineitem_details().reduce( + (a, b) => (a ? a.claims().length : 0) + b.claims().length, 0 + ) + ); + resp = resp.filter(l => { + if (this.filterOperator === '' && l['_claim_count'] === num) { + return true; + } else if (this.filterOperator === '__not' && l['_claim_count'] !== num) { + return true; + } else if (this.filterOperator === '__gte' && l['_claim_count'] >= num) { + return true; + } else if (this.filterOperator === '__lte' && l['_claim_count'] <= num) { + return true; + } else { + return false; + } + }); + resp.forEach(l => delete l['_claim_count']); + } + } + if (_doingClientSort) { + const sortOrder = this.sortOrder; + const liService = this.liService; + function _compareLIs(a, b) { + const direction = sortOrder.match(/_asc$/) ? 'asc' : 'desc'; + const field = sortOrder.replace(/_asc|_desc$/, ''); + + const a_val = liService.getLISortKey(a, field); + const b_val = liService.getLISortKey(b, field); + + if (direction === 'asc') { + return liService.nullableCompare(a_val, b_val); + } else { + return -liService.nullableCompare(a_val, b_val); + } + } + this.lineitemIds = resp.sort(_compareLIs).map(l => Number(l.id())); + } else { + if (_mustDeflesh) { + this.lineitemIds = resp.map(l => Number(l.id())); + } else { + this.lineitemIds = resp.map(i => Number(i)); + } + } this.pager.resultCount = resp.length; }); } + _handleFiltering(searchTerms: any) { + const searchTerm: Object = {}; + const filterField = this.filterField; + let filterOp = this.filterOperator; + let filterVal = this.filterValue; + + if (filterField === 'item_count' || + filterField === 'claim_count') { + return; + } + + if (filterOp === 'like' && filterVal.length > 1) { + if (filterVal[0] === '%' && filterVal[filterVal.length - 1] === '%') { + filterVal = filterVal.slice(1, filterVal.length - 1); + } else if (filterVal[filterVal.length - 1] === '%') { + filterVal = filterVal.slice(0, filterVal.length - 1); + filterOp = 'startswith'; + } else if (filterVal[0] === '%') { + filterVal = filterVal.slice(1); + filterOp = 'endswith'; + } + } + + if (filterOp !== '') { + searchTerm[filterOp] = true; + } + + if (filterField.match(/^acqlia:/)) { + const attrName = (filterField.split(':'))[1]; + const def = this.liService.liAttrDefs.filter( + d => d.code() === attrName)[0]; + if (def) { + searchTerm[def.id()] = filterVal; + searchTerms['acqlia'] = [ searchTerm ]; + } + } else { + searchTerm[filterField] = filterVal; + searchTerms['jub'].push(searchTerm); + } + } + goToPage() { this.focusLi = null; this.router.navigate([], { @@ -276,6 +524,12 @@ export class LineitemListComponent implements OnInit { ingestOneLi(li: IdlObject, replace?: boolean) { this.liMarcAttrs[li.id()] = {}; + if (this.expandAll) { + this.expandLineitem[li.id()] = true; + } else { + this.expandLineitem[li.id()] = false; + } + li.attributes().forEach(attr => { const name = attr.attr_name(); this.liMarcAttrs[li.id()][name] = @@ -431,33 +685,38 @@ export class LineitemListComponent implements OnInit { } liPriceChange(li: IdlObject) { - const price = li.estimated_unit_price(); if (this.liPriceIsValid(li)) { - li.estimated_unit_price(Number(price).toFixed(2)); - + const price = Number(li.estimated_unit_price()).toFixed(2); this.net.request( 'open-ils.acq', - 'open-ils.acq.lineitem.update', - this.auth.token(), li - ).subscribe(resp => - this.liService.activateStateChange.emit(li.id())); + 'open-ils.acq.lineitem.price.set', + this.auth.token(), li.id(), price + ).subscribe(resp => { + // update local copy + li.estimated_unit_price(price); + this.liService.activateStateChange.emit(li.id()); + }); } } toggleShowNotes(liId: number) { - this.showExpandFor = null; this.showNotesFor = this.showNotesFor === liId ? null : liId; + this.expandLineitem[liId] = false; } toggleShowExpand(liId: number) { this.showNotesFor = null; - this.showExpandFor = this.showExpandFor === liId ? null : liId; + this.expandLineitem[liId] = !this.expandLineitem[liId]; } toggleExpandAll() { this.showNotesFor = null; - this.showExpandFor = null; this.expandAll = !this.expandAll; + if (this.expandAll) { + this.pageOfLineitems.forEach(li => this.expandLineitem[li.id()] = true); + } else { + this.pageOfLineitems.forEach(li => this.expandLineitem[li.id()] = false); + } } toggleFilterSort() { @@ -471,16 +730,205 @@ export class LineitemListComponent implements OnInit { deleteLineitems() { const ids = Object.keys(this.selected).filter(id => this.selected[id]); - const method = this.poId ? - 'open-ils.acq.purchase_order.lineitem.delete' : - 'open-ils.acq.picklist.lineitem.delete'; + this.deleteLineitemsDialog.ids = ids.map(i => Number(i)); + this.deleteLineitemsDialog.open().subscribe(doIt => { + if (!doIt) { return; } + + const method = this.poId ? + 'open-ils.acq.purchase_order.lineitem.delete' : + 'open-ils.acq.picklist.lineitem.delete'; + + from(ids) + .pipe(concatMap(id => + this.net.request('open-ils.acq', method, this.auth.token(), id) + // TODO: cap parallelism + )) + .pipe(concatMap(_ => of(true) )) + .subscribe(r => {}, err => {}, () => { + ids.forEach(id => { + delete this.liService.liCache[id]; + delete this.selected[id]; + }); + this.batchSelectAll = false; + this.load(); + }); + }); + } + + addCopiesToLineitems() { + const ids = Object.keys(this.selected).filter(id => this.selected[id]); + + this.addCopiesDialog.ids = ids.map(i => Number(i)); + this.addCopiesDialog.open({size: 'xl'}).subscribe(templateLineitem => { + if (!templateLineitem) { return; } + + const lids = []; + ids.forEach(li_id => { + templateLineitem.lineitem_details().forEach(lid => { + const c = this.idl.clone(lid); + c.isnew(true); + c.lineitem(li_id); + lids.push(c); + }); + }); + + this.saving = true; + this.progressMax = null; + this.progressValue = 0; + + this.liService.updateLiDetailsMulti(lids).subscribe( + struct => { + this.progressMax = struct.total; + this.progressValue++; + }, + err => {}, + () => { + // Remove the modified LI's from the cache so we are + // forced to re-fetch them. + ids.forEach(id => delete this.liService.liCache[id]); + this.saving = false; + this.loadPageOfLis(); + this.liService.activateStateChange.emit(Number(ids[0])); + } + ); + + }); + } + + openBibFinder(liId: number) { + this.bibFinderDialog.liId = liId; + this.bibFinderDialog.open({size: 'xl'}).subscribe(bibId => { + if (!bibId) { return; } + + const lis: IdlObject[] = []; + this.liService.getFleshedLineitems([liId], { fromCache: true }).subscribe( + liStruct => { + liStruct.lineitem.eg_bib_id(bibId); + liStruct.lineitem.attributes([]); + lis.push(liStruct.lineitem); + }, + err => { }, + () => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lis + ).toPromise().then(resp => this.postBatchAction(resp, [liId])); + } + ); + }); + } + + batchUpdateCopiesOnLineitems() { + const ids = Object.keys(this.selected).filter(id => this.selected[id]); + + this.batchUpdateCopiesDialog.ids = ids.map(i => Number(i)); + this.batchUpdateCopiesDialog.open({size: 'xl'}).subscribe(batchChanges => { + if (!batchChanges) { return; } + + this.saving = true; + this.progressMax = ids.length; + this.progressValue = 0; + + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.batch_update', + this.auth.token(), { lineitems: ids }, + batchChanges, batchChanges._dist_formula + ).subscribe( + response => { + const evt = this.evt.parse(response); + if (!evt) { + delete this.liService.liCache[response]; + this.progressValue++; + } + }, + err => {}, + () => { + this.saving = false; + this.loadPageOfLis(); + this.liService.activateStateChange.emit(Number(ids[0])); + } + ); + }); + } + + exportSingleAttributeList() { + const ids = Object.keys(this.selected).filter(id => this.selected[id]).map(i => Number(i)); + this.exportAttributesDialog.ids = ids; + this.exportAttributesDialog.open().subscribe(attr => { + if (!attr) { return; } + + this.liService.doExportSingleAttributeList(ids, attr); + }); + } + + markSelectorReady(rows: IdlObject[]) { + const ids = this.selectedIds().map(i => Number(i)); + if (ids.length === 0) { return; } + + const lis: IdlObject[] = []; + this.liService.getFleshedLineitems(ids, { fromCache: true }).subscribe( + liStruct => { + if (liStruct.lineitem.state() === 'new') { + lis.push(liStruct.lineitem); + } + }, + err => {}, + () => { + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + this.selectorReadyConfirmDialog.open().subscribe(doIt => { + if (!doIt) { return; } + lis.forEach(li => li.state('selector-ready')); + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lis + ).toPromise().then(resp => { + this.lineItemsUpdatedString.current() + .then(str => this.toast.success(str)); + this.postBatchAction(resp, ids); + }); + }); + } + ); + } + + markOrderReady(rows: IdlObject[]) { + const ids = this.selectedIds().map(i => Number(i)); + if (ids.length === 0) { return; } - from(ids) - .pipe(concatMap(id => - this.net.request('open-ils.acq', method, this.auth.token(), id) - )) - .pipe(concatMap(_ => from(this.load()))) - .subscribe(); + const lis: IdlObject[] = []; + this.liService.getFleshedLineitems(ids, { fromCache: true }).subscribe( + liStruct => { + if (liStruct.lineitem.state() === 'new' || liStruct.lineitem.state() === 'selector-ready') { + lis.push(liStruct.lineitem); + } + }, + err => {}, + () => { + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + this.orderReadyConfirmDialog.open().subscribe(doIt => { + if (!doIt) { return; } + lis.forEach(li => li.state('order-ready')); + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lis + ).toPromise().then(resp => { + this.lineItemsUpdatedString.current() + .then(str => this.toast.success(str)); + this.postBatchAction(resp, ids); + }); + }); + } + ); } liHasRealCopies(li: IdlObject): boolean { @@ -507,6 +955,26 @@ export class LineitemListComponent implements OnInit { ); } + jumpToHoldings(li: IdlObject) { + window.open('/eg2/staff/catalog/record/' + li.eg_bib_id() + '/holdings', '_blank'); + } + + manageClaims(li: IdlObject) { + this.manageClaimsDialog.li = li; + this.manageClaimsDialog.open().subscribe(result => { + if (result) { + delete this.liService.liCache[li.id()]; + this.loadPageOfLis(); + } + }); + } + + countClaims(li: IdlObject): number { + let total = 0; + li.lineitem_details().forEach(lid => total += lid.claims().length); + return total; + } + receiveSelected() { this.markReceived(this.selectedIds()); } @@ -529,14 +997,74 @@ export class LineitemListComponent implements OnInit { }); } + applyClaimPolicyToSelected() { + const liIds = this.selectedIds(); + + if (liIds.length === 0) { return; } + + this.claimPolicyDialog.ids = liIds.map(i => Number(i)); + this.claimPolicyDialog.open().subscribe(claimPolicy => { + if (!claimPolicy) { return; } + + const lis: IdlObject[] = []; + this.liService.getFleshedLineitems(liIds, { fromCache: true }).subscribe( + liStruct => { + liStruct.lineitem.claim_policy(claimPolicy); + lis.push(liStruct.lineitem); + }, + err => { }, + () => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lis + ).toPromise().then(resp => this.postBatchAction(resp, liIds)); + } + ); + }); + } + + createInvoiceFromSelected() { + const liIds = this.selectedIds(); + if (liIds.length === 0) { return; } + + const path = '/eg/staff/acq/legacy/invoice/view?create=1&' + + liIds.map(x => 'attach_li=' + x.toString()).join('&'); + window.location.href = path; + } + + linkInvoiceFromSelected() { + const liIds = this.selectedIds(); + if (liIds.length === 0) { return; } + + this.linkInvoiceDialog.liIds = liIds.map(i => Number(i)); + this.linkInvoiceDialog.open().subscribe(invId => { + if (!invId) { return; } + + const path = '/eg/staff/acq/legacy/invoice/view/' + invId + '?' + + liIds.map(x => 'attach_li=' + x.toString()).join('&'); + window.location.href = path; + }); + + } + markReceived(liIds: number[]) { if (liIds.length === 0) { return; } - this.net.request( - 'open-ils.acq', - 'open-ils.acq.lineitem.receive.batch', - this.auth.token(), liIds - ).toPromise().then(resp => this.postBatchAction(resp, liIds)); + const lis: IdlObject[] = []; + this.liService.getFleshedLineitems(liIds, { fromCache: true }).subscribe( + liStruct => lis.push(liStruct.lineitem), + err => {}, + () => { + this.liService.checkLiAlerts(lis, this.confirmAlertsDialog).then(ok => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.receive.batch', + this.auth.token(), liIds + ).toPromise().then(resp => this.postBatchAction(resp, liIds)); + }, err => {}); // avoid console errors + } + ); } markUnReceived(liIds: number[]) { @@ -573,6 +1101,26 @@ export class LineitemListComponent implements OnInit { }); } + // order was activated as some point in past + isActivatedPo(): boolean { + if (this.picklistId) { + return false; // not an order + } else { + if (this.po()) { + this.poWasActivated = this.po().order_date() ? true : false; + } + return this.poWasActivated; + } + } + + isPendingPo(): boolean { + if (this.picklistId || !this.po()) { + return false; + } else { + return this.po().order_date() ? false : true; + } + } + // For PO's, lineitems can only be deleted if they are pending order. canDeleteLis(): boolean { const li = this.pageOfLineitems[0]; @@ -582,5 +1130,9 @@ export class LineitemListComponent implements OnInit { Boolean(this.poId) ); } + + lineitemDisposition(li: IdlObject): LINEITEM_DISPOSITION { + return this.liService.lineitemDisposition(li); + } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.module.ts index 888830f9dc..89d278062a 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.module.ts @@ -5,6 +5,7 @@ import {ItemLocationSelectModule } from '@eg/share/item-location-select/item-location-select.module'; import {LineitemWorksheetComponent} from './worksheet.component'; import {LineitemService} from './lineitem.service'; +import {PoService} from '../po/po.service'; import {LineitemComponent} from './lineitem.component'; import {LineitemNotesComponent} from './notes.component'; import {LineitemDetailComponent} from './detail.component'; @@ -15,8 +16,20 @@ import {LineitemBatchCopiesComponent} from './batch-copies.component'; import {LineitemCopyAttrsComponent} from './copy-attrs.component'; import {LineitemHistoryComponent} from './history.component'; import {BriefRecordComponent} from './brief-record.component'; +import {CreateAssetsComponent} from './create-assets.component'; import {CancelDialogComponent} from './cancel-dialog.component'; +import {AddToPoDialogComponent} from './add-to-po-dialog.component'; +import {DeleteLineitemsDialogComponent} from './delete-lineitems-dialog.component'; +import {AddCopiesDialogComponent} from './add-copies-dialog.component'; +import {BibFinderDialogComponent} from './bib-finder-dialog.component'; +import {BatchUpdateCopiesDialogComponent} from './batch-update-copies-dialog.component'; +import {LinkInvoiceDialogComponent} from './link-invoice-dialog.component'; +import {ExportAttributesDialogComponent} from './export-attributes-dialog.component'; +import {ClaimPolicyDialogComponent} from './claim-policy-dialog.component'; +import {ManageClaimsDialogComponent} from './manage-claims-dialog.component'; +import {LineitemAlertDialogComponent} from './lineitem-alert-dialog.component'; import {MarcEditModule} from '@eg/staff/share/marc-edit/marc-edit.module'; +import {AcqCommonModule} from '../acq-common.module'; @NgModule({ declarations: [ @@ -30,20 +43,42 @@ import {MarcEditModule} from '@eg/staff/share/marc-edit/marc-edit.module'; LineitemCopyAttrsComponent, LineitemHistoryComponent, CancelDialogComponent, + AddToPoDialogComponent, + DeleteLineitemsDialogComponent, + AddCopiesDialogComponent, + BibFinderDialogComponent, + BatchUpdateCopiesDialogComponent, + LinkInvoiceDialogComponent, + ExportAttributesDialogComponent, + ClaimPolicyDialogComponent, + ManageClaimsDialogComponent, + LineitemAlertDialogComponent, BriefRecordComponent, + CreateAssetsComponent, LineitemWorksheetComponent ], exports: [ LineitemListComponent, - CancelDialogComponent + CancelDialogComponent, + AddToPoDialogComponent, + DeleteLineitemsDialogComponent, + AddCopiesDialogComponent, + LinkInvoiceDialogComponent, + ExportAttributesDialogComponent, + ClaimPolicyDialogComponent, + ManageClaimsDialogComponent, + LineitemAlertDialogComponent ], imports: [ StaffCommonModule, ItemLocationSelectModule, - MarcEditModule + MarcEditModule, + HttpClientModule, + AcqCommonModule ], providers: [ - LineitemService + LineitemService, + PoService ] }) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts index e3202947ef..f86de359fc 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/lineitem.service.ts @@ -7,10 +7,21 @@ import {AuthService} from '@eg/core/auth.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {ItemLocationService} from '@eg/share/item-location-select/item-location-select.service'; +import {saveAs} from 'file-saver'; +import {LineitemAlertDialogComponent} from './lineitem-alert-dialog.component'; + +const LINEITEM_DISPOSITIONS: + 'new' | 'selector-ready' | 'order-ready' | 'pending-order' | 'on-order' | 'received' | 'delayed' = null; +export type LINEITEM_DISPOSITION = typeof LINEITEM_DISPOSITIONS; const COPY_ORDER_DISPOSITIONS: 'canceled' | 'delayed' | 'received' | 'on-order' | 'pre-order' = null; export type COPY_ORDER_DISPOSITION = typeof COPY_ORDER_DISPOSITIONS; +const ORDER_IDENT_ATTRS = [ + 'isbn', + 'issn', + 'upc' +]; export interface BatchLineitemStruct { id: number; @@ -45,6 +56,13 @@ export interface FleshCacheParams { toCache?: boolean; } +interface LineitemAlertData { + liId: number; + title: string; + alertText: IdlObject; + alertComment: string; +} + @Injectable() export class LineitemService { @@ -70,6 +88,9 @@ export class LineitemService { // Alerts the user has already confirmed are OK. alertAcks: {[id: number]: boolean} = {}; + naturalCollator = new Intl.Collator(undefined, + {numeric: true, sensitivity: 'base', ignorePunctuation: true}); + constructor( private idl: IdlService, private net: NetService, @@ -78,6 +99,10 @@ export class LineitemService { private loc: ItemLocationService ) {} + clearLiCache() { + this.liCache = []; + } + getFleshedLineitems(ids: number[], params: FleshCacheParams = {}): Observable { @@ -92,6 +117,7 @@ export class LineitemService { flesh_order_summary: true, flesh_cancel_reason: true, flesh_li_details: true, + flesh_li_details_receiver: true, flesh_notes: true, flesh_fund: true, flesh_circ_modifier: true, @@ -101,8 +127,10 @@ export class LineitemService { flesh_pl: true, flesh_formulas: true, flesh_copies: true, + flesh_claim_policy: true, clear_marc: false, - apply_order_identifiers: true + apply_order_identifiers: true, + flesh_queued_record: true }, params.fleshMore || {}); return this.net.request( @@ -296,6 +324,27 @@ export class LineitemService { )); } + updateLiDetailsMulti(inLids: IdlObject[]): Observable { + const lids = inLids.filter(copy => + (copy.isnew() || copy.ischanged() || copy.isdeleted())); + + return from( + + // Ensure we have the updated fund/loc/mod values before + // sending the copies off to be updated and then re-drawn. + this.fetchFunds(lids.map(lid => lid.fund())) + .then(_ => this.fetchLocations(lids.map(lid => lid.location()))) + .then(_ => this.fetchCircMods(lids.map(lid => lid.circ_modifier()))) + + ).pipe(switchMap(_ => + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem_detail.cud.batch', + this.auth.token(), lids + ) + )); + } + updateLineitems(lis: IdlObject[]): Observable { // Fire updates one LI at a time. Note the API allows passing @@ -371,5 +420,109 @@ export class LineitemService { return 'on-order'; } else { return 'pre-order'; } } + + // state/disposition of a single lineitem + lineitemDisposition(lineitem: IdlObject): LINEITEM_DISPOSITION { + if (lineitem.cancel_reason() && lineitem.cancel_reason().keep_debits() === 't') { + return 'delayed'; + } else { + return lineitem.state(); + } + } + + // convenience function for sorting values + nullableCompare(a_val: any, b_val: any): number { + return a_val === b_val ? 0 : + a_val === null ? 1 : + b_val === null ? -1 : + this.naturalCollator.compare(a_val, b_val); + } + + // Given a line item, get its sort key + getLISortKey(li: IdlObject, field: string): any { + let vals = []; + switch (field) { + case 'li_id': + return li.id(); + break; + case 'title': + vals = li.attributes().filter(x => x.attr_name() === 'title'); + return vals.length ? vals[0].attr_value().replace(/^(a|an|the|el|la) /i, '') : null; + break; + case 'author': + vals = li.attributes().filter(x => x.attr_name() === 'author'); + return vals.length ? vals[0].attr_value() : null; + break; + case 'publisher': + vals = li.attributes().filter(x => x.attr_name() === 'publisher'); + return vals.length ? vals[0].attr_value() : null; + break; + case 'order_ident': + vals = li.attributes().filter(x => ORDER_IDENT_ATTRS.includes(x.attr_name())); + return vals.length ? vals[0].attr_value() : null; + break; + default: + return li.id(); + } + } + + doExportSingleAttributeList(ids: number[], attr: string) { + if (!attr) { return; } + const values: string[] = []; + this.getFleshedLineitems(ids, { fromCache: true }).subscribe( + li => values.push(this.getFirstAttributeValue(li.lineitem, attr, 'lineitem_marc_attr_definition')), + err => {}, + () => { + const filtered = values.filter(x => x !== ''); + saveAs( + new Blob( + [ filtered.join('\n') + '\n' ], + { type: 'text/plain;charset=utf-8' } + ), + 'export_attr_list.txt' + ); + } + ); + } + + checkLiAlerts(lis: IdlObject[], dialog: LineitemAlertDialogComponent): Promise { + + let promise = Promise.resolve(true); + + const alerts: LineitemAlertData[] = []; + lis.forEach(li => { + li.lineitem_notes().filter( + note => note.alert_text() && !this.alertAcks[note.id()] + ).forEach(alert => + alerts.push({ + liId: li.id(), + title: this.getFirstAttributeValue(li, 'title'), + alertText: alert.alert_text(), + alertComment: alert.value() + }) + ); + }); + + if (alerts.length === 0) { return promise; } + + dialog.numAlerts = alerts.length; + + alerts.forEach((alert, i) => { + promise = promise.then(_ => { + dialog.liId = alert.liId; + dialog.title = alert.title; + dialog.alertText = alert.alertText; + dialog.alertComment = alert.alertComment; + dialog.alertIndex = i + 1; + return dialog.open().toPromise().then(ok => { + if (!ok) { return Promise.reject(); } + this.alertAcks[alert.alertText.id()] = true; + return true; + }); + }); + }); + + return promise; + } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html new file mode 100644 index 0000000000..1f0c5ef48a --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.html @@ -0,0 +1,57 @@ + +
+
+

Link Invoice

+ +
+
+

Line Item(s) selected: + + {{id}}, + +

+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ + +
+
+ + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.ts new file mode 100644 index 0000000000..83b238c3e9 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/link-invoice-dialog.component.ts @@ -0,0 +1,20 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; + +@Component({ + selector: 'eg-acq-link-invoice-dialog', + templateUrl: './link-invoice-dialog.component.html' +}) + +export class LinkInvoiceDialogComponent extends DialogComponent { + @Input() liIds: number[] = []; + @Input() poId: number = null; + + provider: ComboboxEntry; + invoice: ComboboxEntry; + + constructor(private modal: NgbModal) { super(modal); } +} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html new file mode 100644 index 0000000000..4b30bd5914 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.html @@ -0,0 +1,70 @@ + +
+
+

Manage Claims

+ +
+
+

Claims

+ Against line item {{liService.getFirstAttributeValue(li, 'title')}} ({{li.id()}}) +
    +
  • + {{lid.barcode()}} / + Cancelled ({{lid.cancel_reason().label()}}) + Received {{lid.recv_time() | formatValue:'timestamp'}} + Not received + +
    • +
+
+

Initiate New Claims

+
+ + {{lid.barcode()}} / + Cancelled ({{lid.cancel_reason().label()}}) + Received {{lid.recv_time() | formatValue:'timestamp'}} + Not received +
+ + + + + + + + +
+ +
+ + +
+
+ + + +
+

Claim Voucher

+
+ +
+ diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.ts new file mode 100644 index 0000000000..0cd56d5d38 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/manage-claims-dialog.component.ts @@ -0,0 +1,113 @@ +import {Component, Input, ViewChild, TemplateRef} from '@angular/core'; +import {Observable} from 'rxjs'; +import {NgbModal, NgbModalOptions} from '@ng-bootstrap/ng-bootstrap'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {IdlService, IdlObject} from '@eg/core/idl.service'; +import {NetService} from '@eg/core/net.service'; +import {PcrudService} from '@eg/core/pcrud.service'; +import {AuthService} from '@eg/core/auth.service'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {LineitemService} from '../lineitem/lineitem.service'; +import {PrintService} from '@eg/share/print/print.service'; + +@Component({ + selector: 'eg-acq-manage-claims-dialog', + templateUrl: './manage-claims-dialog.component.html' +}) + +export class ManageClaimsDialogComponent extends DialogComponent { + @Input() li: IdlObject; + + @ViewChild('printTemplate', { static: true }) private printTemplate: TemplateRef; + + lidsWithClaims: IdlObject[] = []; + + note = ''; + claimEventTypes: number[] = []; + selectedClaimEventTypes: number[] = []; + claimType: ComboboxEntry; + + constructor( + private modal: NgbModal, + private net: NetService, + private auth: AuthService, + private pcrud: PcrudService, + private printer: PrintService, + private liService: LineitemService + ) { super(modal); } + + open(args?: NgbModalOptions): Observable { + if (!args) { + args = {}; + } + + this.lidsWithClaims = this.getLidsWithClaims(); + this.note = ''; + this.claimEventTypes = []; + this.selectedClaimEventTypes = []; + this.getClaimEventTypes(); + + return super.open(args); + } + + getLidsWithClaims(): IdlObject[] { + return this.li.lineitem_details().filter(x => x.claims().length > 0); + } + + getClaimEventTypes() { + this.pcrud.retrieveAll('acqclet', + { 'order_by': {'acqclet': 'code'}, flesh: 1, flesh_fields: {acqclet: ['org_unit']} }, + {} + ).subscribe(t => this.claimEventTypes.push(t)); + } + + canPerformClaim(): boolean { + if (!this.claimType) { return false; } + if (!this.claimType.id) { return false; } + const lidsToClaim = this.li.lineitem_details().filter(x => x._selected_for_claim); + if (lidsToClaim.length < 1) { return false; } + return true; + } + + claimItems() { + if (!this.canPerformClaim()) { return; } + const lidsToClaim = this.li.lineitem_details() + .filter(x => x._selected_for_claim) + .map(x => x.id()); + this.net.request( + 'open-ils.acq', + 'open-ils.acq.claim.lineitem_detail.atomic', + this.auth.token(), + lidsToClaim, null, + this.claimType.id, + this.note, + null, + this.selectedClaimEventTypes + ).subscribe(result => { + if (result && result.length) { + const voucher = result.map(x => x.template_output().data()).join('
'); + this.printer.print({ + template: this.printTemplate, + contextData: { voucher: voucher }, + printContext: 'default' + }); + } + this.close(true); + }); + } + + printVoucher(lidId: number) { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.claim.voucher.by_lineitem_detail', + this.auth.token(), lidId + ).subscribe(result => { + if (!result) { return; } + this.printer.print({ + template: this.printTemplate, + contextData: { voucher: result.template_output().data() }, + printContext: 'default' + }); + }); + } +} 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 25f393cad1..c4b32c2f0e 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 @@ -12,14 +12,17 @@
+ (click)="newNote()" i18n>Create Note +
|
+ - + close 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 963470d39d..14f82e6beb 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 @@ -14,6 +14,7 @@ export class LineitemNotesComponent implements OnInit, AfterViewInit { @Input() lineitem: IdlObject; noteText: string; + alertComments: string; vendorPublic = false; alertEntry: ComboboxEntry; @@ -46,10 +47,11 @@ export class LineitemNotesComponent implements OnInit, AfterViewInit { const note = this.idl.create('acqlin'); note.isnew(true); note.lineitem(this.lineitem.id()); - note.value(this.noteText || ''); if (isAlert) { + note.value(this.alertComments || ''); note.alert_text(this.alertEntry.id); } else { + note.value(this.noteText || ''); note.vendor_public(this.vendorPublic ? 't' : 'f'); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/worksheet.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/worksheet.component.ts index 21c2a13ab0..3fabcffdf8 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/lineitem/worksheet.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/lineitem/worksheet.component.ts @@ -57,10 +57,12 @@ export class LineitemWorksheetComponent implements OnInit, AfterViewInit { flesh_cancel_reason: true, flesh_li_details: true, flesh_fund: true, - flesh_li_details_copy: true, - flesh_li_details_location: true, + flesh_copies: true, + flesh_location: true, + flesh_copy_location: true, + flesh_call_number: true, flesh_li_details_receiver: true, - distribution_formulas: true + flesh_formulas: true } ).toPromise() .then(li => this.lineitem = li) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/picklist.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/picklist.module.ts index 91ee36c819..644ce48d97 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/picklist.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/picklist.module.ts @@ -7,13 +7,12 @@ import {PicklistRoutingModule} from './routing.module'; import {PicklistComponent} from './picklist.component'; import {PicklistSummaryComponent} from './summary.component'; import {HttpClientModule} from '@angular/common/http'; -import {UploadComponent} from './upload.component'; +import {AcqCommonModule} from '../acq-common.module'; @NgModule({ declarations: [ PicklistComponent, - PicklistSummaryComponent, - UploadComponent + PicklistSummaryComponent ], imports: [ StaffCommonModule, @@ -21,7 +20,8 @@ import {UploadComponent} from './upload.component'; LineitemModule, HoldingsModule, PicklistRoutingModule, - HttpClientModule + HttpClientModule, + AcqCommonModule ], providers: [] }) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html index d2f4c15d73..7ef7962e97 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.component.html @@ -1,10 +1,13 @@ - + -
+
Legacy Upload Interface
+ + + @@ -13,7 +16,8 @@
- + +
-
+
+ (click)="saveTemplate()" i18n>Save Template @@ -38,6 +42,7 @@
+

Purchase Order

@@ -46,11 +51,13 @@
+ [asyncSupportsEmptyTermClick]="true" + idlIncludeLibraryInLabel="owner" + [idlQueryAnd]="{active: 't'}" idlClass="acqpro">
@@ -69,8 +76,9 @@
+ [applyOrgId]="orderingAgency" + (onChange)="orgOnChange($event)" + [limitPerms]="['CREATE_PICKLIST','CREATE_PURCHASE_ORDER']">
@@ -114,9 +122,9 @@
+ - -

Upload Settings

+

Upload Settings

@@ -214,6 +222,7 @@
+
@@ -222,9 +231,10 @@ id="load-items" [(ngModel)]="loadItems">
+
-

This Upload

+

This Upload

@@ -239,7 +249,7 @@
-
+
@@ -264,14 +274,21 @@
-
+
-
+
+
+ +
+
+
@@ -286,15 +303,25 @@
-
-

-
-
-
-
- -
- -
Selection List
-
Purchase Order
-
+ +
+

+
+
Error {{uploadErrorCode}} ({{uploadErrorText}})
+
+
+ + +
+

+
+
+ +
+
Queue
+
Selection List
+
Purchase Order
+
+
+ +
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 22ae79d69a..a27da982b2 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,5 +1,6 @@ import {Component, OnInit, 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'; @@ -7,6 +8,7 @@ import {NetService} from '@eg/core/net.service'; import {EventService} from '@eg/core/event.service'; import {OrgService} from '@eg/core/org.service'; import {AuthService} from '@eg/core/auth.service'; +import {StringComponent} from '@eg/share/string/string.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {ComboboxComponent, ComboboxEntry} from '@eg/share/combobox/combobox.component'; @@ -58,10 +60,21 @@ const ORG_SETTINGS = [ @Component({ + selector: 'eg-acq-upload', templateUrl: './upload.component.html' }) export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { + // mode can be one of + // upload: actually upload and process a MARC order file + // getImportParams: gather import parameters to use when creating + // assets for a purchase order; the invoker + // would do the actual asset creation + @Input() mode = 'upload'; + + @Input() customAction: (args: any) => void; + customActionProcessing = false; + settings: Object = {}; recordType: string; selectedQueue: ComboboxEntry; @@ -95,6 +108,9 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { isUploading: boolean; uploadProcessing: boolean; + uploadError: boolean; + uploadErrorCode: string; + uploadErrorText: string; uploadComplete: boolean; // Generated by the server @@ -112,9 +128,9 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { private formTemplateSelector: ComboboxComponent; @ViewChild('bibSourceSelector', { static: true }) private bibSourceSelector: ComboboxComponent; - @ViewChild('providerSelector', {static: true}) + @ViewChild('providerSelector', {static: false}) private providerSelector: ComboboxComponent; - @ViewChild('fiscalYearSelector', { static: true }) + @ViewChild('fiscalYearSelector', { static: false }) private fiscalYearSelector: ComboboxComponent; @ViewChild('selectionListSelector', { static: true }) private selectionListSelector: ComboboxComponent; @@ -126,9 +142,17 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { private fallThruMergeProfileSelector: ComboboxComponent; @ViewChild('dupeQueueAlert', { static: true }) private dupeQueueAlert: AlertDialogComponent; + @ViewChild('loadMarcOrderTemplateSavedString', { static: false }) + private loadMarcOrderTemplateSavedString: StringComponent; + @ViewChild('loadMarcOrderTemplateDeletedString', { static: false }) + private loadMarcOrderTemplateDeletedString: StringComponent; + @ViewChild('loadMarcOrderTemplateSetAsDefaultString', { static: false }) + private loadMarcOrderTemplateSetAsDefaultString: StringComponent; + constructor( private http: HttpClient, + private router: Router, private toast: ToastService, private evt: EventService, private net: NetService, @@ -137,6 +161,11 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { private store: ServerStoreService, private vlagent: PicklistUploadService ) { + // force a reload of the component if we navigate to it + // from itself + this.router.routeReuseStrategy.shouldReuseRoute = () => { + return false; + }; this.applyDefaults(); this.applySettings(); } @@ -198,12 +227,18 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { this.vlagent.getAllQueues('bib'), this.vlagent.getMatchSets('bib'), this.vlagent.getBibSources(), - this.vlagent.getFiscalYears(), - this.vlagent.getProvidersList(), + this.vlagent.getFiscalYears(this.auth.user().ws_ou()).then( years => { + this.vlagent.getDefaultFiscalYear(this.auth.user().ws_ou()).then(y => { + this.selectedFiscalYear = y.id(); + if (this.fiscalYearSelector) { + this.fiscalYearSelector.applyEntryId(this.selectedFiscalYear); + } + }); + }), this.vlagent.getSelectionLists(), this.vlagent.getItemImportDefs(), - this.org.settings(['vandelay.default_match_set']).then( - s => this.defaultMatchSet = s['vandelay.default_match_set']), + this.org.settings(['vandelay.default_match_set']).then( + s => this.defaultMatchSet = s['vandelay.default_match_set']), this.loadTemplates() ]; @@ -213,6 +248,11 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { orgOnChange(org: IdlObject) { this.orderingAgency = org.id(); + this.vlagent.getFiscalYears(this.orderingAgency).then( years => { + this.vlagent.getDefaultFiscalYear(this.orderingAgency).then( + y => { this.selectedFiscalYear = y.id(); this.fiscalYearSelector.applyEntryId(this.selectedFiscalYear); } + ); + }); } loadTemplates() { @@ -249,12 +289,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { return {id: s.id(), label: s.source()}; }); - case 'providersList': - return (this.vlagent.providersList || []).map( - p => { - return {id: p.id(), label: p.code()}; - }); - case 'fiscalYears': return (this.vlagent.fiscalYears || []).map( fy => { @@ -297,10 +331,6 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { this.recordType = id; break; - case 'providersList': - this.selectedProvider = id; - break; - case 'bibSources': this.selectedBibSource = id; break; @@ -333,6 +363,9 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { } hasNeededData(): boolean { + if (this.mode === 'getImportParams') { + return this.selectedQueue ? true : false; + } return this.selectedQueue && Boolean(this.selectedFile) && Boolean(this.selectedFiscalYear) && @@ -371,6 +404,47 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { ); } + // helper method to return the year string rather than the FY ID + // TODO: can remove this once fiscal years are better managed + _getFiscalYearLabel(): string { + if (this.selectedFiscalYear) { + const found = (this.vlagent.fiscalYears || []).find(x => x.id() === this.selectedFiscalYear); + return found ? found.year() : ''; + } else { + return ''; + } + } + + performCustomAction() { + + const vandelayOptions = { + match_set: this.selectedMatchSet, + import_no_match: this.importNonMatching, + auto_overlay_exact: this.mergeOnExact, + auto_overlay_best_match: this.mergeOnBestMatch, + auto_overlay_1match: this.mergeOnSingleMatch, + merge_profile: this.selectedMergeProfile, + fall_through_merge_profile: this.selectedFallThruMergeProfile, + match_quality_ratio: this.minQualityRatio, + bib_source: this.selectedBibSource, + create_assets: this.loadItems, + queue_name: this.selectedQueue.label + }; + + const args = { + provider: this.selectedProvider, + ordering_agency: this.orderingAgency, + create_po: this.createPurchaseOrder, + activate_po: this.activatePurchaseOrder, + fiscal_year: this._getFiscalYearLabel(), + picklist: this.activeSelectionListId, + vandelay: vandelayOptions + }; + + this.customActionProcessing = true; + this.customAction(args); + } + resetProgressBars() { this.uploadProgress.update({value: 0, max: 1}); } @@ -464,6 +538,7 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { processUpload(): Promise { this.uploadProcessing = true; + this.uploadError = false; if (this.vlagent.importSelection) { return Promise.resolve(); @@ -472,6 +547,7 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { const spoolType = this.recordType; const vandelayOptions = { + match_set: this.selectedMatchSet, import_no_match: this.importNonMatching, auto_overlay_exact: this.mergeOnExact, auto_overlay_best_match: this.mergeOnBestMatch, @@ -489,7 +565,7 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { ordering_agency: this.orderingAgency, create_po: this.createPurchaseOrder, activate_po: this.activatePurchaseOrder, - fiscal_year: this.selectedFiscalYear, + fiscal_year: this._getFiscalYearLabel(), picklist: this.activeSelectionListId, vandelay: vandelayOptions }; @@ -504,7 +580,14 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { progress => { const resp = this.evt.parse(progress); console.log(progress); - if (resp) { console.error(resp); return reject(); } + if (resp) { + this.uploadError = true; + this.uploadErrorCode = resp.textcode; + this.uploadErrorText = resp.payload; + this.uploadProcessing = false; + this.uploadComplete = true; + return reject(); + } if (progress.complete) { this.uploadProcessing = false; this.uploadComplete = true; @@ -526,21 +609,25 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { const template = {}; TEMPLATE_ATTRS.forEach(key => template[key] = this[key]); - console.debug('Saving import profile', template); - this.formTemplates[this.selectedTemplate] = template; - return this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates); + this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates).then(x => + this.loadMarcOrderTemplateSavedString.current() + .then(str => this.toast.success(str)) + ); } markTemplateDefault() { Object.keys(this.formTemplates).forEach( - name => delete this.formTemplates.default + name => delete this.formTemplates[name].default ); this.formTemplates[this.selectedTemplate].default = true; - return this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates); + this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates).then(x => + this.loadMarcOrderTemplateSetAsDefaultString.current() + .then(str => this.toast.success(str)) + ); } templateSelectorChange(entry: ComboboxEntry) { @@ -562,8 +649,12 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { this.bibSourceSelector.applyEntryId(this.selectedBibSource); this.matchSetSelector.applyEntryId(this.selectedMatchSet); - this.providerSelector.applyEntryId(this.selectedProvider); - this.fiscalYearSelector.applyEntryId(this.selectedFiscalYear); + if (this.providerSelector) { + this.providerSelector.selectedId = this.selectedProvider; + } + if (this.fiscalYearSelector) { + this.fiscalYearSelector.applyEntryId(this.selectedFiscalYear); + } this.mergeProfileSelector.applyEntryId(this.selectedMergeProfile); this.fallThruMergeProfileSelector.applyEntryId(this.selectedFallThruMergeProfile); } @@ -571,7 +662,10 @@ export class UploadComponent implements OnInit, AfterViewInit, OnDestroy { deleteTemplate() { delete this.formTemplates[this.selectedTemplate]; this.formTemplateSelector.selected = null; - return this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates); + this.store.setItem(TEMPLATE_SETTING_NAME, this.formTemplates).then(x => + this.loadMarcOrderTemplateDeletedString.current() + .then(str => this.toast.success(str)) + ); } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts index 7b1f739bc3..8e555ae6f3 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/picklist/upload.service.ts @@ -25,6 +25,7 @@ export class PicklistUploadService { mergeProfiles: IdlObject[]; providersList: IdlObject[]; fiscalYears: IdlObject[]; + defaultFiscalYear: IdlObject; selectionLists: IdlObject[]; queueType: string; recordType: string; @@ -79,20 +80,6 @@ export class PicklistUploadService { }); } - getProvidersList(): Promise { - if (this.providersList) { - return Promise.resolve(this.providersList); - } - - const owners = this.org.ancestors(this.auth.user().ws_ou(), true); - return this.pcrud.search('acqpro', - {owner: owners}, {order_by: {acqpro: ['code']}}, {atomic: true}) - .toPromise().then(providers => { - this.providersList = providers; - return providers; - }); - } - getSelectionLists(): Promise { if (this.selectionLists) { return Promise.resolve(this.selectionLists); @@ -137,17 +124,34 @@ export class PicklistUploadService { }); } - getFiscalYears(): Promise { - if (this.fiscalYears) { - return Promise.resolve(this.fiscalYears); - } + getDefaultFiscalYear(org: number): Promise { + return this.net.request( + 'open-ils.acq', + 'open-ils.acq.org_unit.current_fiscal_year', + this.auth.token(), org + ).pipe(tap(afy => { + this.defaultFiscalYear = this.fiscalYears.filter(fy => Number(fy.year()) === Number(afy))[0]; + })).toPromise().then(() => { + return this.defaultFiscalYear; + }); + } + getFiscalYears(org: number): Promise { return this.pcrud.retrieveAll('acqfy', {order_by: {acqfy: 'year'}}, {atomic: true} ).toPromise().then(years => { - this.fiscalYears = years; - return years; + this.fiscalYears = years.filter( y => y.calendar() === this.org.get(org).fiscal_calendar()); + // if there are no entries, inject a special entry for the current year + if (!this.fiscalYears.length) { + const afy = this.idl.create('acqfy'); + afy.id(-1); + afy.calendar(-1); + const now = new Date(); + afy.year(now.getFullYear()); + this.fiscalYears = [ afy ]; + } + return this.fiscalYears; }); } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html b/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html index 4ea18915c2..9ecff20d80 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/charges.component.html @@ -1,8 +1,10 @@

Direct Charges, Taxes, Fees, etc. - +

+ +
Charge Type
@@ -20,7 +22,7 @@ [asyncSupportsEmptyTermClick]="true" (onChange)="charge.inv_item_type($event ? $event.id : null)" i18n-placeholder placeholder="Charge Type..." - [required]="true" [readOnly]="!charge.isnew()"> + [required]="true" [readOnly]="!charge.isnew() && !charge.ischanged()">
-
+ diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/po.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/po.module.ts index 3d27b946c6..11345e4d38 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/po.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/po.module.ts @@ -14,7 +14,8 @@ import {PoEdiMessagesComponent} from './edi.component'; import {PoNotesComponent} from './notes.component'; import {PoCreateComponent} from './create.component'; import {PoChargesComponent} from './charges.component'; - +import {PicklistUploadService} from '../picklist/upload.service'; +import {DisencumberChargeDialogComponent} from './disencumber-charge-dialog.component'; @NgModule({ declarations: [ @@ -25,7 +26,8 @@ import {PoChargesComponent} from './charges.component'; PoNotesComponent, PoCreateComponent, PoChargesComponent, - PrintComponent + PrintComponent, + DisencumberChargeDialogComponent ], imports: [ StaffCommonModule, @@ -35,7 +37,8 @@ import {PoChargesComponent} from './charges.component'; PoRoutingModule ], providers: [ - PoService + PoService, + PicklistUploadService ] }) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/po.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/po.service.ts index 25d1924c6b..2d39d23725 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/po.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/po.service.ts @@ -2,12 +2,18 @@ import {Injectable, EventEmitter} from '@angular/core'; import {Observable, from} from 'rxjs'; import {switchMap, map, tap, merge} from 'rxjs/operators'; import {IdlObject, IdlService} from '@eg/core/idl.service'; +import {OrgService} from '@eg/core/org.service'; import {EventService} from '@eg/core/event.service'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {LineitemService, FleshCacheParams} from '@eg/staff/acq/lineitem/lineitem.service'; +export interface PoDupeCheckResults { + dupeFound: boolean; + dupePoId: number; +} + @Injectable() export class PoService { @@ -18,6 +24,8 @@ export class PoService { constructor( private evt: EventService, private net: NetService, + private org: OrgService, + private pcrud: PcrudService, private auth: AuthService ) {} @@ -34,6 +42,7 @@ export class PoService { flesh_provider: true, flesh_notes: true, flesh_po_items: true, + flesh_po_items_further: true, flesh_price_summary: true, flesh_lineitem_count: true }, params.fleshMore || {}); @@ -56,20 +65,63 @@ export class PoService { // Fetch the PO again (with less fleshing) and update the // order summary totals our main fully-fleshed PO. - refreshOrderSummary(): Promise { + refreshOrderSummary(update_po_items = false): Promise { + const flesh = Object.assign({ + flesh_price_summary: true + }); + if (update_po_items) { + flesh['flesh_po_items'] = true; + flesh['flesh_po_items_further'] = true; + } return this.net.request('open-ils.acq', 'open-ils.acq.purchase_order.retrieve.authoritative', this.auth.token(), this.currentPo.id(), - {flesh_price_summary: true} + flesh ).toPromise().then(po => { this.currentPo.amount_encumbered(po.amount_encumbered()); this.currentPo.amount_spent(po.amount_spent()); this.currentPo.amount_estimated(po.amount_estimated()); + if (update_po_items) { + this.currentPo.po_items(po.po_items()); + } }); } + + checkIfImportNeeded(): Promise { + return new Promise((resolve, reject) => { + this.pcrud.search('jub', + { purchase_order: this.currentPo.id(), eg_bib_id: null }, + { limit: 1 }, { idlist: true, atomic: true } + ).toPromise().then(ids => { + if (ids && ids.length) { + resolve(true); + } else { + resolve(false); + } + }); + }); + } + + checkDuplicatePoName(orderAgency: number, poName: string, results: PoDupeCheckResults) { + if (Boolean(orderAgency) && Boolean(poName)) { + this.pcrud.search('acqpo', + { name: poName, ordering_agency: this.org.descendants(orderAgency, true) }, + {}, { idlist: true, atomic: true } + ).toPromise().then(ids => { + if (ids && ids.length) { + results.dupeFound = true; + results.dupePoId = ids[0]; + } else { + results.dupeFound = false; + } + }); + } else { + results.dupeFound = false; + } + } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/print.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/print.component.ts index beadb5d99e..d0f0ea3e1b 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/print.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/print.component.ts @@ -5,12 +5,33 @@ import {ActivatedRoute, ParamMap} from '@angular/router'; import {IdlObject} from '@eg/core/idl.service'; import {NetService} from '@eg/core/net.service'; import {AuthService} from '@eg/core/auth.service'; +import {ServerStoreService} from '@eg/core/server-store.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {IdlService} from '@eg/core/idl.service'; import {OrgService} from '@eg/core/org.service'; import {PrintService} from '@eg/share/print/print.service'; import {BroadcastService} from '@eg/share/util/broadcast.service'; import {PoService} from './po.service'; +import {LineitemService} from '../lineitem/lineitem.service'; + +const DEFAULT_SORT_ORDER = 'li_id_asc'; +const SORT_ORDERS = [ + 'li_id_asc', + 'li_id_desc', + 'title_asc', + 'title_desc', + 'author_asc', + 'author_desc', + 'publisher_asc', + 'publisher_desc', + 'order_ident_asc', + 'order_ident_desc' +]; +const ORDER_IDENT_ATTRS = [ + 'isbn', + 'issn', + 'upc' +]; @Component({ templateUrl: 'print.component.html' @@ -30,8 +51,10 @@ export class PrintComponent implements OnInit, AfterViewInit { private org: OrgService, private net: NetService, private auth: AuthService, + private store: ServerStoreService, private pcrud: PcrudService, private poService: PoService, + private liService: LineitemService, private broadcaster: BroadcastService, private printer: PrintService) { } @@ -68,10 +91,33 @@ export class PrintComponent implements OnInit, AfterViewInit { } }) .then(po => this.po = po) + .then(_ => this.sortLineItems()) .then(_ => this.populatePreview()) .then(_ => this.initDone = true); } + sortLineItems(): Promise { + return this.store.getItem('acq.lineitem.sort_order').then(sortOrder => { + if (!sortOrder || !SORT_ORDERS.includes(sortOrder)) { + sortOrder = DEFAULT_SORT_ORDER; + } + const liService = this.liService; + function _compareLIs(a, b) { + const direction = sortOrder.match(/_asc$/) ? 'asc' : 'desc'; + const field = sortOrder.replace(/_asc|_desc$/, ''); + const a_val = liService.getLISortKey(a, field); + const b_val = liService.getLISortKey(b, field); + + if (direction === 'asc') { + return liService.nullableCompare(a_val, b_val); + } else { + return -liService.nullableCompare(a_val, b_val); + } + } + this.po.lineitems().sort(_compareLIs); + }); + } + populatePreview(): Promise { return this.printer.compileRemoteTemplate({ diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/routing.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/routing.module.ts index 02a7918154..8f3508d786 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/routing.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/routing.module.ts @@ -1,5 +1,8 @@ -import {NgModule} from '@angular/core'; +import {NgModule, Injectable} from '@angular/core'; import {RouterModule, Routes} from '@angular/router'; +import {Router, Resolve, RouterStateSnapshot, + ActivatedRouteSnapshot, CanDeactivate} from '@angular/router'; +import {Observable} from 'rxjs'; import {PoComponent} from './po.component'; import {PrintComponent} from './print.component'; import {PoSummaryComponent} from './summary.component'; @@ -7,12 +10,25 @@ import {LineitemListComponent} from '../lineitem/lineitem-list.component'; import {LineitemDetailComponent} from '../lineitem/detail.component'; import {LineitemCopiesComponent} from '../lineitem/copies.component'; import {BriefRecordComponent} from '../lineitem/brief-record.component'; +import {CreateAssetsComponent} from '../lineitem/create-assets.component'; import {LineitemHistoryComponent} from '../lineitem/history.component'; import {LineitemWorksheetComponent} from '../lineitem/worksheet.component'; import {PoHistoryComponent} from './history.component'; import {PoEdiMessagesComponent} from './edi.component'; import {PoCreateComponent} from './create.component'; +// following example of https://www.concretepage.com/angular-2/angular-candeactivate-guard-example +export interface PoChildDeactivationGuarded { + canDeactivate(): Observable | Promise | boolean; +} + +@Injectable() +export class CanLeavePoChildGuard implements CanDeactivate { + canDeactivate(component: PoChildDeactivationGuarded): Observable | Promise | boolean { + return component.canDeactivate ? component.canDeactivate() : true; + } +} + const routes: Routes = [{ path: 'create', component: PoCreateComponent @@ -32,6 +48,9 @@ const routes: Routes = [{ path: 'brief-record', component: BriefRecordComponent }, { + path: 'create-assets', + component: CreateAssetsComponent + }, { path: 'lineitem/:lineitemId/detail', component: LineitemDetailComponent }, { @@ -39,7 +58,8 @@ const routes: Routes = [{ component: LineitemHistoryComponent }, { path: 'lineitem/:lineitemId/items', - component: LineitemCopiesComponent + component: LineitemCopiesComponent, + canDeactivate: [CanLeavePoChildGuard] }, { path: 'lineitem/:lineitemId/worksheet', component: LineitemWorksheetComponent @@ -58,7 +78,7 @@ const routes: Routes = [{ @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule], - providers: [] + providers: [CanLeavePoChildGuard] }) export class PoRoutingModule {} 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 262b020549..30bae1d15f 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 @@ -1,11 +1,18 @@ - + + + + +
@@ -25,6 +32,7 @@
On Order + Received Pending / Activatable @@ -39,34 +47,40 @@ + + + (Warning: + + + + Fund exceeds warning percent: + {{evt.payload.fund.code()}} ({{evt.payload.fund.year()}}). + + + + ) + +
+ *ngIf="evt.textcode == 'ACQ_FUND_EXCEEDS_STOP_PERCENT'; else noPrice"> Fund exceeds stop percent: {{evt.payload.fund.code()}} ({{evt.payload.fund.year()}}). - - - - Fund exceeds warning percent: - {{evt.payload.fund.code()}} ({{evt.payload.fund.year()}}). - - - - One or more lineitems have no price. + One or more line items have no price. - One or more lineitems have no items attached. + One or more line items have no items attached. @@ -89,13 +103,18 @@
{{po().name()}} +
+ This name is already in used by another PO: + View PO +
@@ -122,15 +141,15 @@
-
Lineitems:
+
Line Items:
{{po().lineitem_count()}}
-
+
@@ -153,7 +172,7 @@
Prepayment Required?
- +
@@ -166,6 +185,7 @@ event_note Notes ({{po().notes().length}}) + | @@ -179,6 +199,13 @@ Create Invoice | + + receipt + Link Invoice + + + | EDI Messages ({{ediMessageCount}}) | History @@ -187,25 +214,17 @@ print Print - + | - - cancel - Cancel Order - + | - - Activate Without Loading Items - + | - - launch - Activate Order - + | @@ -214,6 +233,12 @@ Finalize Blanket Order + + | + + Show PO in Legacy Interface + +
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.ts index 5f2faa7543..8484cf0693 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/po/summary.component.ts @@ -15,7 +15,11 @@ import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; import {PoService} from './po.service'; import {LineitemService} from '../lineitem/lineitem.service'; import {CancelDialogComponent} from '../lineitem/cancel-dialog.component'; +import {LinkInvoiceDialogComponent} from '../lineitem/link-invoice-dialog.component'; +const PO_ACTIVATION_WARNINGS = [ + 'ACQ_FUND_EXCEEDS_WARN_PERCENT' +]; @Component({ templateUrl: 'summary.component.html', @@ -33,6 +37,10 @@ export class PoSummaryComponent implements OnInit, OnDestroy { newPoName: string; editPoName = false; + dupeResults = { + dupeFound: false, + dupePoId: -1 + }; initDone = false; ediMessageCount = 0; invoiceCount = 0; @@ -40,15 +48,21 @@ export class PoSummaryComponent implements OnInit, OnDestroy { zeroCopyActivate = false; canActivate: boolean = null; canFinalize = false; + showLegacyLinks = false; + doingActivation = false; + finishPoActivation = false; activationBlocks: EgEvent[] = []; + activationWarnings: EgEvent[] = []; activationEvent: EgEvent; nameEditEnterToggled = false; stateChangeSub: Subscription; @ViewChild('cancelDialog') cancelDialog: CancelDialogComponent; + @ViewChild('linkInvoiceDialog') linkInvoiceDialog: LinkInvoiceDialogComponent; @ViewChild('progressDialog') progressDialog: ProgressDialogComponent; @ViewChild('confirmFinalize') confirmFinalize: ConfirmDialogComponent; + @ViewChild('confirmActivate') confirmActivate: ConfirmDialogComponent; constructor( private router: Router, @@ -83,10 +97,18 @@ export class PoSummaryComponent implements OnInit, OnDestroy { return this.poService.currentPo; } - load(): Promise { + load(useCache: boolean = true): Promise { if (!this.poId) { return Promise.resolve(); } - return this.poService.getFleshedPo(this.poId, {fromCache: true, toCache: true}) + this.dupeResults.dupeFound = false; + this.dupeResults.dupePoId = -1; + + if (history.state.finishPoActivation) { + this.doingActivation = true; + useCache = false; + } + + return this.poService.getFleshedPo(this.poId, {fromCache: useCache, toCache: true}) .then(po => { // EDI message count @@ -106,13 +128,22 @@ export class PoSummaryComponent implements OnInit, OnDestroy { }) .then(_ => this.setCanActivate()) - .then(_ => this.setCanFinalize()); + .then(_ => this.setCanFinalize()) + .then(_ => this.loadUiPrefs()) + .then(_ => this.activatePoIfRequested()); } // Can run via Enter or blur. If it just ran via Enter, avoid // running it again on the blur, which will happen directly after // the Enter. toggleNameEdit(fromEnter?: boolean) { + + // don't allow change if new name is currently + // a duplicate + if (this.dupeResults.dupeFound) { + return; + } + if (fromEnter) { this.nameEditEnterToggled = true; } else { @@ -132,11 +163,13 @@ export class PoSummaryComponent implements OnInit, OnDestroy { if (node) { node.select(); } }); - } else if (this.newPoName && this.newPoName !== this.po().name()) { + } else if (this.newPoName && this.newPoName !== this.po().name() && + !this.dupeResults.dupeFound) { const prevName = this.po().name(); this.po().name(this.newPoName); this.newPoName = null; + this.dupeResults.dupeFound = false; this.pcrud.update(this.po()).subscribe(resp => { const evt = this.evt.parse(resp); @@ -148,6 +181,12 @@ export class PoSummaryComponent implements OnInit, OnDestroy { } } + checkDuplicatePoName() { + this.poService.checkDuplicatePoName( + this.po().ordering_agency(), this.newPoName, this.dupeResults + ); + } + cancelPo() { this.cancelDialog.open().subscribe(reason => { if (!reason) { return; } @@ -157,16 +196,36 @@ export class PoSummaryComponent implements OnInit, OnDestroy { this.net.request('open-ils.acq', 'open-ils.acq.purchase_order.cancel', this.auth.token(), this.poId, reason - ).subscribe(ok => { + ).subscribe(resp => { this.progressDialog.close(); - location.href = location.href; + + const evt = this.evt.parse(resp); + if (evt) { + alert(evt); + } else { + location.href = location.href; + } }); }); } + linkInvoiceFromPo() { + + this.linkInvoiceDialog.poId = this.poId; + this.linkInvoiceDialog.open().subscribe(invId => { + if (!invId) { return; } + + const path = '/eg/staff/acq/legacy/invoice/view/' + invId + '?' + + 'attach_po=' + this.poId; + window.location.href = path; + }); + + } + setCanActivate() { this.canActivate = null; this.activationBlocks = []; + this.activationWarnings = []; if (!(this.po().state().match(/new|pending/))) { this.canActivate = false; @@ -177,14 +236,20 @@ export class PoSummaryComponent implements OnInit, OnDestroy { zero_copy_activate: this.zeroCopyActivate }; - this.net.request('open-ils.acq', + return this.net.request('open-ils.acq', 'open-ils.acq.purchase_order.activate.dry_run', this.auth.token(), this.poId, null, options ).pipe(tap(resp => { const evt = this.evt.parse(resp); - if (evt) { this.activationBlocks.push(evt); } + if (evt) { + if (PO_ACTIVATION_WARNINGS.includes(evt.textcode)) { + this.activationWarnings.push(evt); + } else { + this.activationBlocks.push(evt); + } + } })).toPromise().then(_ => { @@ -198,23 +263,56 @@ export class PoSummaryComponent implements OnInit, OnDestroy { } activatePo(noAssets?: boolean) { + this.doingActivation = true; + if (this.activationWarnings.length) { + this.confirmActivate.open().subscribe(confirmed => { + if (!confirmed) { + this.doingActivation = true; + return; + } + + this._activatePo(noAssets); + }); + } else { + this._activatePo(noAssets); + } + } + + _activatePo(noAssets?: boolean) { + if (noAssets) { + // Bypass any Vandelay choices and force-load all records. + const vandelay = { + import_no_match: true, + queue_name: `ACQ ${new Date().toISOString()}` + }; + + const options = { + zero_copy_activate: this.zeroCopyActivate, + no_assets: noAssets + }; + + this._doActualActivate(vandelay, options); + } else { + this.poService.checkIfImportNeeded().then(importNeeded => { + if (importNeeded) { + this.router.navigate( + ['/staff/acq/po/' + this.po().id() + '/create-assets'], + { state: { activatePo: true } } + ); + } else { + // LIs are linked to bibs, so charge forward and activate with no options set + this._doActualActivate({}, {}); + } + }); + } + } + + _doActualActivate(vandelay: any, options: any) { this.activationEvent = null; this.progressDialog.open(); this.progressDialog.update({max: this.po().lineitem_count() * 3}); - // Bypass any Vandelay choices and force-load all records. - // TODO: Add intermediate Vandelay options. - const vandelay = { - import_no_match: true, - queue_name: `ACQ ${new Date().toISOString()}` - }; - - const options = { - zero_copy_activate: this.zeroCopyActivate, - no_assets: noAssets - }; - - this.net.request( + this.net.request( 'open-ils.acq', 'open-ils.acq.purchase_order.activate', this.auth.token(), this.poId, vandelay, options @@ -230,7 +328,13 @@ export class PoSummaryComponent implements OnInit, OnDestroy { if (Number(resp) === 1) { this.progressDialog.close(); // Refresh everything. - location.href = location.href; + this.initDone = false; + this.doingActivation = false; + this.load(false).then(_ => { + this.initDone = true; + this.liService.clearLiCache(); + this.router.navigate([]); + }); } else { this.progressDialog.update( @@ -259,6 +363,19 @@ export class PoSummaryComponent implements OnInit, OnDestroy { .subscribe(_ => this.canFinalize = true); } + loadUiPrefs() { + return this.store.getItemBatch(['ui.staff.acq.show_deprecated_links']) + .then(settings => { + this.showLegacyLinks = settings['ui.staff.acq.show_deprecated_links']; + }); + } + + activatePoIfRequested() { + if (this.canActivate && history.state.finishPoActivation) { + this.activatePo(false); + } + } + finalizePo() { this.confirmFinalize.open().subscribe(confirmed => { diff --git a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-purchase-orders.component.html b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-purchase-orders.component.html index caed7ae8f1..1cf4d8fa46 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-purchase-orders.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/provider/provider-purchase-orders.component.html @@ -1,5 +1,5 @@ - {{purchaseorder.name()}} diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html index b78a2bdb6b..81c1d7e354 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.html @@ -160,16 +160,6 @@ [ngModelOptions]="{standalone: true}" [(ngModel)]="runImmediately"/>
-
-
- - -
-
diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts index 0f0646fc97..1b2e3da050 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search-form.component.ts @@ -4,7 +4,7 @@ import {IdlService, IdlObject} from '@eg/core/idl.service'; import {PcrudService} from '@eg/core/pcrud.service'; import {StringComponent} from '@eg/share/string/string.component'; import {ToastService} from '@eg/share/toast/toast.service'; -import {AcqSearchService, AcqSearchTerm, AcqSearch} from './acq-search.service'; +import {AcqSearchTerm, AcqSearch} from './acq-search.service'; import {ServerStoreService} from '@eg/core/server-store.service'; @Component({ @@ -46,8 +46,7 @@ export class AcqSearchFormComponent implements OnInit, OnChanges { private pcrud: PcrudService, private store: ServerStoreService, private idl: IdlService, - private toast: ToastService, - private acqSearch: AcqSearchService + private toast: ToastService ) {} ngOnInit() { @@ -240,18 +239,4 @@ export class AcqSearchFormComponent implements OnInit, OnChanges { saveRunImmediately() { return this.store.setItem(this.runImmediatelySetting, this.runImmediately); } - - showExpAngOptions(): boolean { - return this.acqSearch.angSelectionEnabled; - } - - showExpAngLinks(): boolean { - return this.acqSearch.angSearchLinksEnabled; - } - - toggleExpSearchLinks() { - this.acqSearch.angSearchLinksEnabled = !this.acqSearch.angSearchLinksEnabled; - this.store.setItem('ui.staff.angular_acq_search.enabled', - this.acqSearch.angSearchLinksEnabled); - } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.module.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.module.ts index 1fea224ec1..05226d5cc1 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.module.ts @@ -12,6 +12,7 @@ import {PicklistCloneDialogComponent} from './picklist-clone-dialog.component'; import {PicklistDeleteDialogComponent} from './picklist-delete-dialog.component'; import {PicklistMergeDialogComponent} from './picklist-merge-dialog.component'; import {AcqSearchService} from './acq-search.service'; +import {LineitemModule} from '@eg/staff/acq/lineitem/lineitem.module'; @NgModule({ declarations: [ @@ -28,7 +29,8 @@ import {AcqSearchService} from './acq-search.service'; ], imports: [ StaffCommonModule, - AcqSearchRoutingModule + AcqSearchRoutingModule, + LineitemModule ], providers: [AcqSearchService] }) diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts index b1367dab73..577f6ba1dc 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/acq-search.service.ts @@ -9,7 +9,6 @@ import {Pager} from '@eg/share/util/pager'; import {IdlObject} from '@eg/core/idl.service'; import {EventService} from '@eg/core/event.service'; import {AttrDefsService} from './attr-defs.service'; -import {ServerStoreService} from '@eg/core/server-store.service'; const baseIdlClass = { lineitem: 'jub', @@ -109,15 +108,11 @@ export class AcqSearchService { _conjunction = 'all'; firstRun = true; - angSelectionEnabled = false; - angSearchLinksEnabled = false; - constructor( private net: NetService, private evt: EventService, private auth: AuthService, private pcrud: PcrudService, - private serverStore: ServerStoreService, private attrDefs: AttrDefsService ) { this.firstRun = true; @@ -287,14 +282,4 @@ export class AcqSearchService { return gridSource; } - loadUiPrefs(): Promise { - return this.serverStore.getItemBatch([ - 'ui.staff.angular_acq_selection.enabled', - 'ui.staff.angular_acq_search.enabled' - ]).then(sets => { - this.angSelectionEnabled = sets['ui.staff.angular_acq_selection.enabled']; - this.angSearchLinksEnabled = - sets['ui.staff.angular_acq_search.enabled'] && this.angSelectionEnabled; - }); - } } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html index 9b39ef3674..334d357ee5 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.html @@ -2,9 +2,40 @@ i18n-searchTypeLabel searchTypeLabel="Line Item" runImmediatelySetting="eg.acq.search.lineitems.run_immediately" defaultSearchSetting="eg.acq.search.default.lineitems"> + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -17,53 +48,26 @@ - - - {{lineitem.id()}} - - - {{lineitem.id()}} - - - + {{lineitem.purchase_order().name()}} - - - {{lineitem.purchase_order().name()}} - - - + {{lineitem.picklist().name()}} - - - - {{lineitem.picklist().name()}} - - @@ -87,25 +91,17 @@ Catalog
  • - - + Worksheet - - Worksheet -
  • - + Purchase Order - - Purchase Order -
  • Requests
    • @@ -116,14 +112,10 @@ Queue
  • - + Selection List - - Selection List -
    • @@ -139,6 +131,48 @@ (onRowActivate)="showRow($event)" [showDeclaredFieldsOnly]="true"> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts index 6c757f8e7d..6a30b788d8 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/lineitem-results.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit, Input, ViewChild} from '@angular/core'; -import {Observable} from 'rxjs'; -import {map} from 'rxjs/operators'; +import {Observable, from, of} from 'rxjs'; +import {map, concatMap} from 'rxjs/operators'; import {Router, ActivatedRoute, ParamMap} from '@angular/router'; import {Pager} from '@eg/share/util/pager'; import {IdlObject} from '@eg/core/idl.service'; @@ -9,7 +9,19 @@ import {AuthService} from '@eg/core/auth.service'; import {GridComponent} from '@eg/share/grid/grid.component'; import {GridDataSource, GridCellTextGenerator} from '@eg/share/grid/grid'; import {AcqSearchService, AcqSearchTerm, AcqSearch} from './acq-search.service'; +import {LineitemService} from '../lineitem/lineitem.service'; +import {ToastService} from '@eg/share/toast/toast.service'; +import {ExportAttributesDialogComponent} from '../lineitem/export-attributes-dialog.component'; import {AcqSearchFormComponent} from './acq-search-form.component'; +import {StringComponent} from '@eg/share/string/string.component'; +import {AlertDialogComponent} from '@eg/share/dialog/alert.component'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; +import {ClaimPolicyDialogComponent} from '../lineitem/claim-policy-dialog.component'; +import {CancelDialogComponent} from '../lineitem/cancel-dialog.component'; +import {AddToPoDialogComponent} from '../lineitem/add-to-po-dialog.component'; +import {DeleteLineitemsDialogComponent} from '../lineitem/delete-lineitems-dialog.component'; +import {LinkInvoiceDialogComponent} from '../lineitem/link-invoice-dialog.component'; +import {LineitemAlertDialogComponent} from '../lineitem/lineitem-alert-dialog.component'; @Component({ selector: 'eg-lineitem-results', @@ -22,6 +34,25 @@ export class LineitemResultsComponent implements OnInit { gridSource: GridDataSource; @ViewChild('acqSearchForm', { static: true}) acqSearchForm: AcqSearchFormComponent; @ViewChild('acqSearchLineitemsGrid', { static: true }) lineitemResultsGrid: GridComponent; + @ViewChild('exportAttributesDialog') exportAttributesDialog: ExportAttributesDialogComponent; + @ViewChild('claimPolicyDialog') claimPolicyDialog: ClaimPolicyDialogComponent; + @ViewChild('cancelDialog') cancelDialog: CancelDialogComponent; + @ViewChild('addToPoDialog') addToPoDialog: AddToPoDialogComponent; + @ViewChild('deleteLineitemsDialog') deleteLineitemsDialog: DeleteLineitemsDialogComponent; + @ViewChild('linkInvoiceDialog') linkInvoiceDialog: LinkInvoiceDialogComponent; + @ViewChild('claimPolicyAppliedString', { static: false }) claimPolicyAppliedString: StringComponent; + @ViewChild('lineItemsReceivedString', { static: false }) lineItemsReceivedString: StringComponent; + @ViewChild('lineItemsUnReceivedString', { static: false }) lineItemsUnReceivedString: StringComponent; + @ViewChild('lineItemsCancelledString', { static: false }) lineItemsCancelledString: StringComponent; + @ViewChild('lineItemsAddedToPoString', { static: false }) lineItemsAddedToPoString: StringComponent; + @ViewChild('lineItemsDeletedString', { static: false }) lineItemsDeletedString: StringComponent; + @ViewChild('lineItemsUpdatedString', { static: false }) lineItemsUpdatedString: StringComponent; + @ViewChild('noActionableLIs', { static: true }) private noActionableLIs: AlertDialogComponent; + @ViewChild('selectorReadyConfirmDialog', { static: true }) selectorReadyConfirmDialog: ConfirmDialogComponent; + @ViewChild('orderReadyConfirmDialog', { static: true }) orderReadyConfirmDialog: ConfirmDialogComponent; + @ViewChild('confirmAlertsDialog') confirmAlertsDialog: LineitemAlertDialogComponent; + + noSelectedRows: (rows: IdlObject[]) => boolean; cellTextGenerator: GridCellTextGenerator; @@ -30,11 +61,14 @@ export class LineitemResultsComponent implements OnInit { private route: ActivatedRoute, private net: NetService, private auth: AuthService, + private toast: ToastService, + private liService: LineitemService, private acqSearch: AcqSearchService) { } ngOnInit() { this.gridSource = this.acqSearch.getAcqSearchDataSource('lineitem'); + this.noSelectedRows = (rows: IdlObject[]) => (rows.length === 0); this.cellTextGenerator = { id: row => row.id(), title: row => { @@ -68,10 +102,293 @@ export class LineitemResultsComponent implements OnInit { } showRow(row: any) { - window.open('/eg/staff/acq/legacy/lineitem/worksheet/' + row.id(), '_blank'); + window.open('/eg2/staff/acq/po/' + row.purchase_order().id() + + '/lineitem/' + row.id() + '/worksheet', '_blank'); + } + + addSelectedToPurchaseOrder(rows: IdlObject[]) { + // must not be already attached to a PO + // and be in a pre-order state + const lis = rows.filter( + l => !l.purchase_order() && + ['new', 'selector-ready', 'order-ready', 'approved'].includes(l.state()) + ); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + + this.addToPoDialog.ids = ids; + this.addToPoDialog.open().subscribe(poId => { + this.net.request('open-ils.acq', + 'open-ils.acq.purchase_order.add_lineitem', + this.auth.token(), poId, ids + ).toPromise().then(resp => { + window.open('/eg2/staff/acq/po/' + poId, '_blank'); + this.lineItemsAddedToPoString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + }); + } + + applyClaimPolicy(rows: IdlObject[]) { + // must be attached to a PO; while this is not + // strictly necessary, seems to make sense that + // a claim policy is relevant only once you know + // who the vendor is + const lis = rows.filter(l => l.purchase_order()); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + + this.claimPolicyDialog.ids = ids; + this.claimPolicyDialog.open().subscribe(claimPolicy => { + if (!claimPolicy) { return; } + + const lisToUpdate: IdlObject[] = []; + this.liService.getFleshedLineitems(ids, { fromCache: true }).subscribe( + liStruct => { + liStruct.lineitem.claim_policy(claimPolicy); + lisToUpdate.push(liStruct.lineitem); + }, + err => { }, + () => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lisToUpdate + ).toPromise().then(resp => { + this.claimPolicyAppliedString.current() + .then(str => this.toast.success(str)); + }); + } + ); + }); + } + + cancelLineitems(rows: IdlObject[]) { + // must be attached to a PO and have a state of + // either 'on-order' or 'cancelled' + const lis = rows.filter(l => + l.purchase_order() && ['on-order', 'cancelled'].includes(l.state()) + ); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + this.cancelDialog.open().subscribe(reason => { + if (!reason) { return; } + + this.net.request('open-ils.acq', + 'open-ils.acq.lineitem.cancel.batch', + this.auth.token(), ids, reason + ).toPromise().then(resp => { + this.lineItemsCancelledString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + }); + } + + createInvoiceFromSelected(rows: IdlObject[]) { + // must be attached to PO + const lis = rows.filter(l => l.purchase_order()); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const path = '/eg/staff/acq/legacy/invoice/view?create=1&' + + lis.map(x => 'attach_li=' + x.id()).join('&'); + window.location.href = path; + } + + createPurchaseOrder(rows: IdlObject[]) { + // must not be already attached to a PO + const lis = rows.filter(l => !l.purchase_order()); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + this.router.navigate(['/staff/acq/po/create'], { + queryParams: {li: ids} + }); + } + + deleteLineitems(rows: IdlObject[]) { + const lis = rows.filter(l => + l.picklist() || ( + l.purchase_order() && + ['new', 'selector-ready', 'order-ready', 'approved', 'pending-order'].includes(l.state()) + ) + ); + // TODO - if the LI somehow has a claim attached to it, lineitem.delete + // current crashes + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + this.deleteLineitemsDialog.ids = ids; + this.deleteLineitemsDialog.open().subscribe(doIt => { + if (!doIt) { return; } + + from(lis) + .pipe(concatMap(li => { + const method = li.purchase_order() ? + 'open-ils.acq.purchase_order.lineitem.delete' : + 'open-ils.acq.picklist.lineitem.delete'; + + return this.net.request('open-ils.acq', method, this.auth.token(), li.id()); + // TODO: cap parallelism + })) + .pipe(concatMap(_ => of(true) )) + .subscribe(r => {}, err => {}, () => { + this.lineItemsDeletedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + }); + } + + exportSingleAttributeList(rows: IdlObject[]) { + const ids = rows.map(x => Number(x.id())); + this.exportAttributesDialog.ids = ids; + this.exportAttributesDialog.open().subscribe(attr => { + if (!attr) { return; } + + this.liService.doExportSingleAttributeList(ids, attr); + }); + } + + linkInvoiceFromSelected(rows: IdlObject[]) { + // must be attached to PO + const lis = rows.filter(l => l.purchase_order()); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + + this.linkInvoiceDialog.liIds = lis.map(i => Number(i.id())); + this.linkInvoiceDialog.open().subscribe(invId => { + if (!invId) { return; } + + const path = '/eg/staff/acq/legacy/invoice/view/' + invId + '?' + + lis.map(x => 'attach_li=' + x.id()).join('&'); + window.location.href = path; + }); + } + + markOrderReady(rows: IdlObject[]) { + const lis = rows.filter(l => l.state() === 'selector-ready' || l.state() === 'new'); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + + this.orderReadyConfirmDialog.open().subscribe(doIt => { + if (!doIt) { return; } + const lisToUpdate: IdlObject[] = []; + this.liService.getFleshedLineitems(ids, { fromCache: true }).subscribe( + liStruct => { + liStruct.lineitem.state('order-ready'); + lisToUpdate.push(liStruct.lineitem); + }, + err => { }, + () => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lisToUpdate + ).toPromise().then(resp => { + this.lineItemsUpdatedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + } + ); + }); } - showExpAngLinks(): boolean { - return this.acqSearch.angSearchLinksEnabled; + markSelectorReady(rows: IdlObject[]) { + const lis = rows.filter(l => l.state() === 'new'); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + const ids = lis.map(x => Number(x.id())); + + this.selectorReadyConfirmDialog.open().subscribe(doIt => { + if (!doIt) { return; } + const lisToUpdate: IdlObject[] = []; + this.liService.getFleshedLineitems(ids, { fromCache: true }).subscribe( + liStruct => { + liStruct.lineitem.state('selector-ready'); + lisToUpdate.push(liStruct.lineitem); + }, + err => { }, + () => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.update', + this.auth.token(), lisToUpdate + ).toPromise().then(resp => { + this.lineItemsUpdatedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + } + ); + }); + } + + markReceived(rows: IdlObject[]) { + // must be on-order + const lis = rows.filter(l => l.state() === 'on-order'); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + + const ids = lis.map(x => Number(x.id())); + + this.liService.checkLiAlerts(lis, this.confirmAlertsDialog).then(ok => { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.receive.batch', + this.auth.token(), ids + ).toPromise().then(resp => { + this.lineItemsReceivedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + }, err => {}); // avoid console errors } + + markUnReceived(rows: IdlObject[]) { + // must be received + const lis = rows.filter(l => l.state() === 'received'); + if (lis.length === 0) { + this.noActionableLIs.open(); + return; + } + + const ids = lis.map(x => Number(x.id())); + this.net.request( + 'open-ils.acq', + 'open-ils.acq.lineitem.receive.rollback.batch', + this.auth.token(), ids + ).toPromise().then(resp => { + this.lineItemsUnReceivedString.current() + .then(str => this.toast.success(str)); + this.lineitemResultsGrid.reload(); + }); + } + } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html index 9aaeea048f..7d03199419 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.html @@ -13,17 +13,11 @@ - + {{selectionlist.name()}} - - - {{selectionlist.name()}} - - diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.ts index 4fafe8358a..65d27e8b5f 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/picklist-results.component.ts @@ -85,14 +85,6 @@ export class PicklistResultsComponent implements OnInit { }; } - showExpAngOptions(): boolean { - return this.acqSearch.angSelectionEnabled; - } - - showExpAngLinks(): boolean { - return this.acqSearch.angSearchLinksEnabled; - } - openCreateDialog() { this.picklistCreateDialog.open().subscribe( modified => { @@ -138,7 +130,7 @@ export class PicklistResultsComponent implements OnInit { } showRow(row: any) { - window.open('/eg/staff/acq/legacy/picklist/view/' + row.id(), '_blank'); + window.open('/eg2/staff/acq/picklist/' + row.id(), '_blank'); } doSearch(search: AcqSearch) { diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html index 679870803d..14f78de756 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.html @@ -4,17 +4,11 @@ defaultSearchSetting="eg.acq.search.default.purchaseorders"> - + {{purchaseorder.name()}} - - - {{purchaseorder.name()}} - - diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts index b4556d8136..254e124224 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/purchase-order-results.component.ts @@ -55,7 +55,7 @@ export class PurchaseOrderResultsComponent implements OnInit { } showRow(row: any) { - window.open('/eg/staff/acq/legacy/po/view/' + row.id(), '_blank'); + window.open('/eg2/staff/acq/po/' + row.id(), '_blank'); } doSearch(search: AcqSearch) { @@ -64,9 +64,4 @@ export class PurchaseOrderResultsComponent implements OnInit { this.purchaseOrderResultsGrid.reload(); }); } - - showExpAngLinks(): boolean { - return this.acqSearch.angSearchLinksEnabled; - } - } diff --git a/Open-ILS/src/eg2/src/app/staff/acq/search/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/acq/search/resolver.service.ts index c3b559d266..bdc46389e3 100644 --- a/Open-ILS/src/eg2/src/app/staff/acq/search/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/acq/search/resolver.service.ts @@ -2,7 +2,6 @@ import {Injectable} from '@angular/core'; import {Router, Resolve, RouterStateSnapshot, ActivatedRouteSnapshot} from '@angular/router'; import {AttrDefsService} from './attr-defs.service'; -import {AcqSearchService} from './acq-search.service'; @Injectable() export class AttrDefsResolver implements Resolve> { @@ -11,16 +10,16 @@ export class AttrDefsResolver implements Resolve> { constructor( private router: Router, - private attrDefs: AttrDefsService, - private acqSearch: AcqSearchService + private attrDefs: AttrDefsService ) {} resolve( route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { - return this.attrDefs.fetchAttrDefs() - .then(_ => this.acqSearch.loadUiPrefs()); + return Promise.all([ + this.attrDefs.fetchAttrDefs() + ]); } } diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html index ed3d7bf768..f1f5916e5a 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.html @@ -156,13 +156,13 @@ - + {{row.li_id}} - + {{row.po_name}} diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html index 839db085ef..fd5831fa27 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -316,21 +316,6 @@
    -
    -
    - - Acquisitions (Experimental) - -
    - - - Create Purchase Order - -
    -
    -
    -
    diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.ts b/Open-ILS/src/eg2/src/app/staff/nav.component.ts index 8257875853..cc7f4e0ec1 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.ts @@ -25,7 +25,6 @@ export class StaffNavComponent implements OnInit, OnDestroy { // When active, show a link to the experimental Angular staff catalog showAngularCatalog: boolean; - showAngularAcq: boolean; curbsideEnabled: boolean; @ViewChild('navOpChange', {static: false}) opChange: OpChangeComponent; @@ -65,10 +64,6 @@ export class StaffNavComponent implements OnInit, OnDestroy { .then(settings => this.showAngularCatalog = Boolean(settings['ui.staff.angular_catalog.enabled'])); - this.org.settings('ui.staff.angular_acq_selection.enabled') - .then(settings => this.showAngularAcq = - Boolean(settings['ui.staff.angular_acq_selection.enabled'])); - this.org.settings('circ.curbside') .then(settings => this.curbsideEnabled = Boolean(settings['circ.curbside'])); diff --git a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts index 13969a667d..0ce843cfd4 100644 --- a/Open-ILS/src/eg2/src/app/staff/resolver.service.ts +++ b/Open-ILS/src/eg2/src/app/staff/resolver.service.ts @@ -142,7 +142,6 @@ export class StaffResolver implements Resolve> { 'webstaff.format.date_and_time', 'ui.staff.max_recent_patrons', 'circ.curbside', // navbar - 'ui.staff.angular_acq_selection.enabled', // navbar 'ui.staff.angular_catalog.enabled' // navbar ]).then(settings => { // Avoid clobbering defaults diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index 7a39842b2a..67c20e0d6e 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -289,6 +289,16 @@ body>.dropdown-menu {z-index: 2100;} background-color: rgb(247, 247, 247); } +/** + * Similar to the CSS above for the search form, set some + * CSS for the line item worksheet. Ordinarily would be + * preferable to just add the CSS to the worksheet component, + * but untl a well-supported alternative to ng-deep comes along... + */ +#worksheet-outlet thead th { font-weight: bold; background-color: #ccc; text-align: center; border-bottom: 1px #000 solid; border-right: 1px #000 solid; padding: 0 +6px; } +#worksheet-outlet tbody td { text-align: left; vertical-align: top; border: 1px #999 inset; padding: 0 2px; } + /* style for negative monetary values */ .negative-money-amount { color: red; diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index bbea7c1394..87789fbd0f 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -21964,10 +21964,20 @@ VALUES ( INSERT INTO config.org_unit_setting_type (name, grp, datatype, label) VALUES ( - 'ui.staff.angular_acq_selection.enabled', 'gui', 'bool', + 'ui.staff.acq.show_deprecated_links', 'gui', 'bool', oils_i18n_gettext( - 'ui.staff.angular_acq_selection.enabled', - 'Enable Experimental ACQ Selection/Purchase Interfaces', + 'ui.staff.acq.show_deprecated_links', + 'Display Links to Deprecated Acquisitions Interfaces', + 'cwst', 'label' + ) +); + +INSERT INTO config.org_unit_setting_type (name, grp, datatype, label) +VALUES ( + 'ui.staff.acq.show_deprecated_links', 'gui', 'bool', + oils_i18n_gettext( + 'ui.staff.acq.show_deprecated_links', + 'Display Links to Deprecated Acquisitions Interfaces', 'cwst', 'label' ) ); diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.picklist-po-angular.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.picklist-po-angular.sql index 610adc3f51..7f8c492d66 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.picklist-po-angular.sql +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.picklist-po-angular.sql @@ -40,17 +40,6 @@ VALUES ( ) ); -INSERT INTO config.org_unit_setting_type (name, grp, datatype, label) -VALUES ( - 'ui.staff.angular_acq_selection.enabled', 'gui', 'bool', - oils_i18n_gettext( - 'ui.staff.angular_acq_selection.enabled', - 'Enable Experimental ACQ Selection/Purchase Interfaces', - 'cwst', 'label' - ) -); - - INSERT INTO config.print_template (id, name, label, owner, active, locale, template) VALUES ( diff --git a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.acq-sprint-4.sql b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.acq-sprint-4.sql index c9f9e4dca5..4f3d5567a2 100644 --- a/Open-ILS/src/sql/Pg/upgrade/YYYY.data.acq-sprint-4.sql +++ b/Open-ILS/src/sql/Pg/upgrade/YYYY.data.acq-sprint-4.sql @@ -12,4 +12,14 @@ VALUES ( ) ); +INSERT INTO config.org_unit_setting_type (name, grp, datatype, label) +VALUES ( + 'ui.staff.acq.show_deprecated_links', 'gui', 'bool', + oils_i18n_gettext( + 'ui.staff.acq.show_deprecated_links', + 'Display Links to Deprecated Acquisitions Interfaces', + 'cwst', 'label' + ) +); + COMMIT; diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2 index 6348603c10..5473cd534f 100644 --- a/Open-ILS/src/templates/staff/navbar.tt2 +++ b/Open-ILS/src/templates/staff/navbar.tt2 @@ -453,22 +453,6 @@ - -
  • - [% l('Acquisitions (Experimental)') %] - - -
    • - -
  • [% l('Booking') %] ${1}
    ${2}.
    Estimated Price: $${3}.
    Lineitem ID: ${4}
    PO: ${5}
    Order Date: ${6}", "INVOICE_CONFIRM_ITEM_DELETE" : "Remove this $${0} '${1}' charge from the invoice?", "INVOICE_CONFIRM_ENTRY_DETACH" : "Remove $${0} charge for item '${1}, ${2} [${3}] from the invoice?", - "LINEITEM_SUMMARY" : "
    ${0}, by ${1} (${2})
    \n
    \n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled, ${23} Delayed
    \n
    Estimated $${6}, Encumbered $${16}, Paid $${17}
    \n
    \n# ${10} ⌘ ${13} ${18}\n❖ ${15}
    ", + "LINEITEM_SUMMARY" : "
    ${0}, by ${1} (${2})
    \n
    \n${3} Ordered, ${4} Received, ${7} Invoiced, ${8} Claimed, ${9} Cancelled, ${23} Delayed
    \n
    Estimated $${6}, Encumbered $${16}, Paid $${17}
    \n
    \n# ${10} ⌘ ${13} ${18}\n❖ ${15}
    ", "INVOICE_CONFIRM_PRORATE" : "Prorate charges?\n\nAny subsequent changes to the invoice that would affect prorated amounts should be resolved manually.", "INVOICE_EXTRA_COPIES" : "You are attempting to invoice ${0} more copies than originally ordered.

    To add these items to the original order, select a fund and choose 'Add New Items' below.
    After saving the invoice, you may finish editing and importing the new copies from the lineitem details page.", - "INVOICE_ITEM_PO_DETAILS" : "${0}
    PO #${3} ${4}
    Total Estimated Cost: $${5}", - "INVOICE_ITEM_PO_LABEL" : "PO #${2} ${3}
    Total Estimated Cost: $${4}", + "INVOICE_ITEM_PO_DETAILS" : "${0}
    PO #${3} ${4}
    Total Estimated Cost: $${5}", + "INVOICE_ITEM_PO_LABEL" : "PO #${2} ${3}
    Total Estimated Cost: $${4}", "UNNAMED" : "Unnamed", "NO_FIND_INVOICE" : "Could not find that invoice.\nNote that the Invoice # field is case-sensitive.", "LI_BATCH_UPDATE": "Line item batch update", diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js index d024917f88..f7220130bd 100644 --- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js +++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js @@ -131,7 +131,7 @@ function($scope , $q , $window , $location , $timeout , egCore , egNet , egGridD if (acqData) { if (acqData.a) { acqData = egCore.idl.toHash(acqData); - var url = '/eg/acq/po/view/' + acqData.purchase_order + '/' + acqData.id; + var url = '/eg2/staff/acq/po/' + acqData.purchase_order + '#' + acqData.id; $timeout(function () { $window.open(url, '_blank') }); hasResults = true; } diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js index 34463d075f..58e2d3aaae 100644 --- a/Open-ILS/web/js/ui/default/staff/services/navbar.js +++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js @@ -123,7 +123,6 @@ angular.module('egCoreMod') egCore.org.settings([ 'ui.staff.max_recent_patrons', 'ui.staff.angular_catalog.enabled', - 'ui.staff.angular_acq_selection.enabled', 'circ.curbside' ]).then(function(s) { var val = s['ui.staff.max_recent_patrons']; @@ -132,8 +131,6 @@ angular.module('egCoreMod') $scope.showAngularCatalog = s['ui.staff.angular_catalog.enabled']; - $scope.showAngularAcq = - s['ui.staff.angular_acq_selection.enabled']; $scope.enableCurbside = s['circ.curbside']; }).then(function() {