From: Galen Charlton Date: Sun, 28 Mar 2021 22:37:59 +0000 (-0400) Subject: funds: add fund transfer modal X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=5c0a76a35805df76f1fdccade1e660b15687eaa2;p=working%2FEvergreen.git funds: add fund transfer modal Signed-off-by: Galen Charlton --- 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 1ee4a0f22c..98a8c3a129 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 @@ -13,7 +13,7 @@
-

Fund Details - {{fund?.name()}} ({{fund?.code()}} {{fund?.year()}})

+

Fund Details - {{fund?.name()}} ({{fund?.code()}} ({{fund?.year()}}) ({{fund?.org().shortname()}}))

-
- + +
+
+
@@ -145,3 +151,8 @@ [preloadLinkedValues]="true" [readonlyFields]="readonlyFields"> + + + + + diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts index 0c985db8b9..f6efc48ad2 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-details-dialog.component.ts @@ -14,6 +14,7 @@ import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {StringComponent} from '@eg/share/string/string.component'; import {ToastService} from '@eg/share/toast/toast.service'; import {FundTagsComponent} from './fund-tags.component'; +import {FundTransferDialogComponent} from './fund-transfer-dialog.component'; @Component({ selector: 'eg-fund-details-dialog', @@ -32,6 +33,8 @@ export class FundDetailsDialogComponent acqfdebDataSource: GridDataSource @ViewChild('editDialog', { static: true }) editDialog: FmRecordEditorComponent; + @ViewChild('transferDialog', { static: false }) transferDialog: FundTransferDialogComponent; + @ViewChild('allocateToFundDialog', { static: true }) allocateToFundDialog: FmRecordEditorComponent; @ViewChild('successString', { static: true }) successString: StringComponent; @ViewChild('updateFailedString', { static: false }) updateFailedString: StringComponent; @@ -158,6 +161,35 @@ export class FundDetailsDialogComponent ); } + allocateToFund() { + const allocation = this.idl.create('acqfa'); + allocation.fund(this.fundId); + allocation.allocator(this.auth.user().id()); + this.allocateToFundDialog.defaultNewRecord = allocation; + this.allocateToFundDialog.mode = 'create'; + + this.allocateToFundDialog.hiddenFieldsList = ['id', 'fund', 'allocator', 'create_time']; + this.allocateToFundDialog.fieldOrder = 'funding_source,amount,note'; + this.allocateToFundDialog.open().subscribe( + result => { + this.successString.current() + .then(str => this.toast.success(str)); + this._initRecord(); + }, + error => { + this.updateFailedString.current() + .then(str => this.toast.danger(str)); + } + ); + } + + doTransfer() { + this.transferDialog.sourceFund = this.fund; + this.transferDialog.open().subscribe( + ok => this._initRecord() + ) + } + setDefaultTab() { this.defaultTabType = this.activeTab; this.store.setLocalItem('eg.acq.fund_details.default_tab', this.activeTab); diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html new file mode 100644 index 0000000000..fa9b6c9eb9 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.html @@ -0,0 +1,50 @@ + + + + +
+

Transfer from Fund {{sourceFund?.name()}} ({{sourceFund?.code()}} ({{sourceFund?.year()}}) ({{sourceFund?.org().shortname()}}))

+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ Amount to transfer from {{sourceFund?.name()}} ({{sourceFund?.code()}} ({{sourceFund?.year()}}) ({{sourceFund?.org().shortname()}})) +
+
+
+ +
+ +
+
+
+
+
+ + +
+ diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.ts new file mode 100644 index 0000000000..85ad875689 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/fund-transfer-dialog.component.ts @@ -0,0 +1,112 @@ +import {Component, Input, ViewChild, TemplateRef, OnInit} from '@angular/core'; +import {DialogComponent} from '@eg/share/dialog/dialog.component'; +import {NgForm} from '@angular/forms'; +import {IdlService, IdlObject} from '@eg/core/idl.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 {GridDataSource} from '@eg/share/grid/grid'; +import {Pager} from '@eg/share/util/pager'; +import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; +import {StringComponent} from '@eg/share/string/string.component'; +import {ToastService} from '@eg/share/toast/toast.service'; +import {PermService} from '@eg/core/perm.service'; +import {ComboboxComponent} from '@eg/share/combobox/combobox.component'; +import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; +import {Observable} from 'rxjs'; +import {map} from 'rxjs/operators'; + +@Component({ + selector: 'eg-fund-transfer-dialog', + templateUrl: './fund-transfer-dialog.component.html' +}) + +export class FundTransferDialogComponent + extends DialogComponent implements OnInit { + + @Input() sourceFund: IdlObject; + doneLoading: boolean = false; + + @ViewChild('successString', { static: true }) successString: StringComponent; + @ViewChild('updateFailedString', { static: false }) updateFailedString: StringComponent; + @ViewChild('fundSelector', { static: false }) tagSelector: ComboboxComponent; + + fundDataSource: (term: string) => Observable; + destFund: ComboboxEntry = null; + sourceAmount: number = 0.0; + note = null; + + constructor( + private idl: IdlService, + private evt: EventService, + private net: NetService, + private auth: AuthService, + private pcrud: PcrudService, + private perm: PermService, + private toast: ToastService, + private modal: NgbModal + ) { + super(modal); + } + + ngOnInit() { + this.destFund = null; + this.onOpen$.subscribe(() => this._initRecord()); + this.fundDataSource = term => { + const field = 'code'; + const args = {}; + const extra_args = { order_by : {} }; + args[field] = {'ilike': `%${term}%`}; // could -or search on label + args['active'] = 't'; + extra_args['order_by']['acqf'] = field; + extra_args['limit'] = 100; + extra_args['flesh'] = 1; + const flesh_fields: Object = {}; + flesh_fields['acqf'] = ['org']; + extra_args['flesh_fields'] = flesh_fields; + return this.pcrud.search('acqf', args, extra_args).pipe(map(data => { + return { + id: data.id(), + label: data.code() + + ' (' + data.year() + ')' + + ' (' + data.org().shortname() + ')', + fm: data + }; + })); + }; + } + + private _initRecord() { + this.doneLoading = false; + this.destFund = null; + this.sourceAmount = 0; + this.note = null; + this.doneLoading = true; + } + + transfer() { + this.net.request( + 'open-ils.acq', + 'open-ils.acq.funds.transfer_money', + this.auth.token(), + this.sourceFund.id(), + this.sourceAmount, + this.destFund.id, + null, + this.note + ).subscribe( + res => { + this.successString.current() + .then(str => this.toast.success(str)); + this.close(true); + }, + res => { + this.updateFailedString.current() + .then(str => this.toast.danger(str)); + this.close(false); + } + ) + } + +} diff --git a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funds.module.ts b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funds.module.ts index 5f3892bf3b..3c7d82beba 100644 --- a/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funds.module.ts +++ b/Open-ILS/src/eg2/src/app/staff/admin/acq/funds/funds.module.ts @@ -8,6 +8,7 @@ import {FundDetailsDialogComponent} from './fund-details-dialog.component'; import {FundingSourcesComponent} from './funding-sources.component'; import {FundingSourceTransactionsDialogComponent} from './funding-source-transactions-dialog.component'; import {FundTagsComponent} from './fund-tags.component'; +import {FundTransferDialogComponent} from './fund-transfer-dialog.component'; @NgModule({ declarations: [ @@ -16,7 +17,8 @@ import {FundTagsComponent} from './fund-tags.component'; FundDetailsDialogComponent, FundingSourcesComponent, FundingSourceTransactionsDialogComponent, - FundTagsComponent + FundTagsComponent, + FundTransferDialogComponent ], imports: [ StaffCommonModule,