From c388160b1c5ad2542c56192cf7c8bbf35f03fd2d Mon Sep 17 00:00:00 2001 From: Patrick Sun Date: Wed, 28 Apr 2021 05:32:39 +1000 Subject: [PATCH] loan select incorporated --- src/app/list-income/list-income.component.ts | 4 ++-- src/app/loan-card/loan-card.component.html | 2 +- .../loan-select/loan-select.component.html | 2 +- .../loan-select/loan-select.component.scss | 4 ++-- src/app/loan-select/loan-select.component.ts | 12 +++++++--- src/app/pay-in/pay-in.component.html | 4 ++-- src/app/pay-in/pay-in.component.ts | 23 ++++++++++++++----- src/app/service/loan.single.service.ts | 5 ++-- 8 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/app/list-income/list-income.component.ts b/src/app/list-income/list-income.component.ts index 3e80720..a20b5d8 100644 --- a/src/app/list-income/list-income.component.ts +++ b/src/app/list-income/list-income.component.ts @@ -12,7 +12,7 @@ import {LoanSingleService} from '../service/loan.single.service'; export class ListIncomeComponent implements OnInit { public uploadMeta: UploadMetaModel = new UploadMetaModel({}); public Loan: LoanModel = new LoanModel({}); - public startLoad = false + public startLoad = false; private UploadMetaFilterIsReady = false; private LoanFilterIsReady = false; @@ -53,6 +53,6 @@ export class ListIncomeComponent implements OnInit { } private checkStartUpload(): void { - this.startLoad = this.UploadMetaFilterIsReady + this.startLoad = this.UploadMetaFilterIsReady && this.LoanFilterIsReady; } } diff --git a/src/app/loan-card/loan-card.component.html b/src/app/loan-card/loan-card.component.html index cc52765..82c04b7 100644 --- a/src/app/loan-card/loan-card.component.html +++ b/src/app/loan-card/loan-card.component.html @@ -1,4 +1,4 @@ -
+
{{Loan.Item}} Amount: {{Loan.Amount | currency }} Settlement: {{Loan.Settlement | date:'yyyy-mm-dd' }} diff --git a/src/app/loan-select/loan-select.component.html b/src/app/loan-select/loan-select.component.html index c3137e7..94c954a 100644 --- a/src/app/loan-select/loan-select.component.html +++ b/src/app/loan-select/loan-select.component.html @@ -4,7 +4,7 @@ [Loan]="Loan" [ShowCloseButton]="false">
- +
= new EventEmitter(); public Loan: LoanModel; // for multiple selection ,it has to be array; we don't support it now. // popup public showPopup = false; - public Offset = { left: 0, top: 0 }; + public Offset = { left: 10, top: 48 }; // formControl state private disabled = false; @@ -59,10 +60,15 @@ export class LoanSelectComponent implements OnInit, ControlValueAccessor { } onLoanSelected(loan: LoanModel): void { + if (this.Loan.Id !== loan.Id){ + this.valueChange.emit(loan); + this.onChange(loan); + this.Loan = loan; + } this.Loan = loan; this.markAsTouched(); this.onTouched(); - this.onChange(loan); + this.showPopup = false; } diff --git a/src/app/pay-in/pay-in.component.html b/src/app/pay-in/pay-in.component.html index 96b186b..3aeeff9 100644 --- a/src/app/pay-in/pay-in.component.html +++ b/src/app/pay-in/pay-in.component.html @@ -129,10 +129,10 @@ [editable]="true " [sortable]="false"> - + - diff --git a/src/app/pay-in/pay-in.component.ts b/src/app/pay-in/pay-in.component.ts index ff1c0f8..07d4868 100644 --- a/src/app/pay-in/pay-in.component.ts +++ b/src/app/pay-in/pay-in.component.ts @@ -53,7 +53,10 @@ export class PayInComponent implements OnInit { constructor(private pis: PayInService, private lss: LoanSingleService, private router: Router) { } ngOnInit(): void { - this.debouncedLoadFilteredData = debounce(this.loadFilteredData, 100); + this.debouncedLoadFilteredData = debounce(this.loadFilteredData, 500); + if (this.privateLoadDataNow) { // not in delayed loading mode + this.debouncedLoadFilteredData(); + } } public loadFilteredData(): void{ @@ -107,10 +110,11 @@ export class PayInComponent implements OnInit { } @Input() set LoadDataNow( value: boolean) { - this.privateLoadDataNow = value; - if ( value === true ) { + + if ( value === true && this.privateLoadDataNow === false) { this.debouncedLoadFilteredData(); } + this.privateLoadDataNow = value; } get LoadDataNow(): boolean { return this.privateLoadDataNow; @@ -172,9 +176,9 @@ export class PayInComponent implements OnInit { const pi = this.buildPayInForSave(v, isNew); this.lss.savePayIn(pi, isNew).subscribe( - (resp: PayInModel) => { - this.Loan.cuPayIn(resp); - this.updatePiInGrid(new PayInModel(resp)); + (resp: PayInModelEx) => { + this.Loan.cuPayIn( new PayInModel(resp)); + this.updatePiInGrid(new PayInModelEx(resp)); }, err => { // TODO: this.errorOccurred.emit('Error saving Income'); @@ -288,4 +292,11 @@ export class PayInComponent implements OnInit { this.filter.Sort = sort; this.loadFilteredData(); } + + public onLoanChange(loan: LoanModel): void { + if ( loan.Id !== '' ) { + this.incomeFormGroup.get('Lender').setValue(loan.Lender); + this.incomeFormGroup.get('Lender').disable({onlySelf: true, emitEvent: false}); + } + } } diff --git a/src/app/service/loan.single.service.ts b/src/app/service/loan.single.service.ts index 45054a0..57b7bb8 100644 --- a/src/app/service/loan.single.service.ts +++ b/src/app/service/loan.single.service.ts @@ -6,6 +6,7 @@ import {Injectable} from '@angular/core'; import {RewardModel} from '../models/reward.model'; import {ClonerService} from './clone.service'; import {PayInModel} from '../models/pay-in.model'; +import {PayInModelEx} from '../models/pay-in-ex.model'; @Injectable() export class LoanSingleService { @@ -37,8 +38,8 @@ export class LoanSingleService { ); } - public savePayIn(payIn: PayInModel, isNew: boolean): Observable { - return this.http.post(this.auth.getUrl('payIn/'), payIn); + public savePayIn(payIn: PayInModel, isNew: boolean): Observable { + return this.http.post(this.auth.getUrl('payIn/'), payIn); } public removePayIn(id: number): void {