From a4f96ad2d493084c578456793245f3947a08d40e Mon Sep 17 00:00:00 2001 From: Ramveer Date: Tue, 16 Aug 2022 11:25:42 +0530 Subject: [PATCH] fix: collateral fixes --- .../create-loans-account.component.html | 7 +- .../create-loans-account.component.ts | 1 + .../edit-loans-account.component.html | 4 +- .../loans-account-charges-step.component.html | 51 ------------ .../loans-account-charges-step.component.ts | 57 ------------- .../loans-account-terms-step.component.html | 50 ++++++++++++ .../loans-account-terms-step.component.ts | 79 ++++++++++++++++++- 7 files changed, 135 insertions(+), 114 deletions(-) diff --git a/src/app/loans/create-loans-account/create-loans-account.component.html b/src/app/loans/create-loans-account/create-loans-account.component.html index 1ac7fadd5..41a2112aa 100644 --- a/src/app/loans/create-loans-account/create-loans-account.component.html +++ b/src/app/loans/create-loans-account/create-loans-account.component.html @@ -36,7 +36,8 @@ TERMS + [loansAccountTemplate] = "loansAccountTemplate" [multiDisburseLoan] = "multiDisburseLoan" [collateralOptions]="collateralOptions" + [loansAccountFormValid]="loansAccountFormValid" [loanPrincipal]="loanPrincipal"> @@ -46,8 +47,8 @@ CHARGES + [loansAccountTemplate]="loansAccountTemplate" + [loansAccountFormValid]="loansAccountFormValid"> diff --git a/src/app/loans/create-loans-account/create-loans-account.component.ts b/src/app/loans/create-loans-account/create-loans-account.component.ts index e8ce57038..f67418998 100644 --- a/src/app/loans/create-loans-account/create-loans-account.component.ts +++ b/src/app/loans/create-loans-account/create-loans-account.component.ts @@ -110,6 +110,7 @@ export class CreateLoansAccountComponent implements OnInit { ...this.loansAccountDetailsStep.loansAccountDetails, ...this.loansAccountTermsStep.loansAccountTerms, ...this.loansAccountChargesStep.loansAccountCharges, + ...this.loansAccountTermsStep.loanCollateral }; } diff --git a/src/app/loans/edit-loans-account/edit-loans-account.component.html b/src/app/loans/edit-loans-account/edit-loans-account.component.html index 22e28307f..a9e48d15f 100644 --- a/src/app/loans/edit-loans-account/edit-loans-account.component.html +++ b/src/app/loans/edit-loans-account/edit-loans-account.component.html @@ -36,7 +36,7 @@ TERMS + [loansAccountTemplate]="loansAccountAndTemplate" [collateralOptions]="collateralOptions"> @@ -46,7 +46,7 @@ CHARGES diff --git a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html index ed18669b2..025b4dbeb 100644 --- a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.html @@ -116,57 +116,6 @@ - - -
-
-

Collaterals Data

-
- -
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Name {{ ele.type.name }} Quantity {{ ele.value }} Total Value {{ ele.type.basePrice*ele.value }} Total Collateral Value {{ ele.type.pctToBase*ele.type.basePrice*ele.value/100 }} Actions - -
-
diff --git a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts index c0553a86c..3e8524e8e 100644 --- a/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts +++ b/src/app/loans/loans-account-stepper/loans-account-charges-step/loans-account-charges-step.component.ts @@ -31,10 +31,6 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges { @Input() loansAccountTemplate: any; // @Input() loansAccountFormValid: LoansAccountFormValid @Input() loansAccountFormValid: boolean; - // @Input collateralOptions: Collateral Options - @Input() collateralOptions: any; - // @Input loanPrincipal: Loan Principle - @Input() loanPrincipal: any; /** Charges Data */ chargeData: any; @@ -48,8 +44,6 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges { chargesDisplayedColumns: string[] = ['name', 'chargeCalculationType', 'amount', 'chargeTimeType', 'date', 'action']; /** Columns to be displayed in overdue charges table. */ overdueChargesDisplayedColumns: string[] = ['name', 'type', 'amount', 'collectedon']; - /** Columns to be displayed in collateral table. */ - loanCollateralDisplayedColumns: string[] = ['type', 'value', 'totalValue', 'totalCollateralValue', 'action']; /** Component is pristine if there has been no changes by user interaction */ pristine = true; /** Check if value of collateral added is more than principal amount */ @@ -213,56 +207,6 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges { }); } - /** - * Add a Collateral to the loan - */ - addCollateral() { - const addCollateralDialogRef = this.dialog.open(LoansAccountAddCollateralDialogComponent, { - data: { collateralOptions: this.collateralOptions } - }); - console.log(this.collateralOptions); - addCollateralDialogRef.afterClosed().subscribe((response: any) => { - console.log(this.loanPrincipal); - if (response.data) { - const collateralData = { - type: response.data.value.collateral, - value: response.data.value.quantity, - }; - - this.totalCollateralValue += collateralData.type.pctToBase * collateralData.type.basePrice * collateralData.value / 100; - this.collateralDataSource = this.collateralDataSource.concat(collateralData); - this.collateralOptions = this.collateralOptions.filter((user: any) => user.collateralId !== response.data.value.collateral.collateralId); - if (this.loanPrincipal < this.totalCollateralValue) { - this.isCollateralSufficient = true; - } else { - this.isCollateralSufficient = false; - } - } - }); - } - /** - * Delete a added collateral from loan - * @param id ID od the collateral to be deleted - */ - deleteCollateral(id: any) { - const deleteCollateralDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: `collateral` } - }); - deleteCollateralDialogRef.afterClosed().subscribe((response: any) => { - if (response.delete) { - const removed: any = this.collateralDataSource.splice(id, 1); - this.collateralOptions = this.collateralOptions.concat(removed[0].type); - this.totalCollateralValue -= removed[0].type.pctToBase * removed[0].type.basePrice * removed[0].value / 100; - this.collateralDataSource = this.collateralDataSource.concat([]); - this.pristine = false; - if (this.loanPrincipal < this.totalCollateralValue) { - this.isCollateralSufficient = true; - } else { - this.isCollateralSufficient = false; - } - } - }); - } /** * Returns Loans Account Charges and Collateral Form @@ -270,7 +214,6 @@ export class LoansAccountChargesStepComponent implements OnInit, OnChanges { get loansAccountCharges() { return { charges: this.chargesDataSource, - collateral: this.collateralDataSource }; } diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html index d0b07a085..2d201d198 100644 --- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html @@ -393,6 +393,56 @@ {{ loansAccountProductTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}
+ + +
+
+

Collaterals Data

+
+ +
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Name {{ ele.type.name }} Quantity {{ ele.value }} Total Value {{ ele.type.basePrice*ele.value }} Total Collateral Value {{ ele.type.pctToBase*ele.type.basePrice*ele.value/100 }} Actions + +
+