CBSNexora/cbsnexora
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1534 from josehernandezfintecheandomx/enhancement/manage_loan_tranches

Browse Source 
Management Loan tranches
This commit is contained in:
Adam Saghy
2022-09-14 17:29:28 +02:00
committed by GitHub
parent 7ba59bf486 ad0a055fcf
commit 3de61b8f37
3 changed files with 149 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html
+144 -143
View File
@@ -1,102 +1,99 @@
<form [formGroup]="loansAccountTermsForm"> <form [formGroup]="loansAccountTermsForm">
<div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column"> <div fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Principal {{currencyDisplaySymbol}}</mat-label> <mat-label>Principal {{currencyDisplaySymbol}}</mat-label>
<input type="number" matInput formControlName="principalAmount"> <input type="number" matInput formControlName="principalAmount">
<mat-error *ngIf="loansAccountTermsForm.controls.principalAmount.hasError('required')"> <mat-error *ngIf="loansAccountTermsForm.controls.principalAmount.hasError('required')">
Principal is <strong>required</strong> Principal is <strong>required</strong>
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<h4 fxFlex="98%" class="mat-h4">Term Options</h4> <h4 fxFlex="98%" class="mat-h4">Term Options</h4>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Loan Term</mat-label> <mat-label>Loan Term</mat-label>
<input matInput required formControlName="loanTermFrequency"> <input matInput required formControlName="loanTermFrequency">
<mat-error *ngIf="loansAccountTermsForm.controls.loanTermFrequency.hasError('required')"> <mat-error *ngIf="loansAccountTermsForm.controls.loanTermFrequency.hasError('required')">
Loan Term is <strong>required</strong> Loan Term is <strong>required</strong>
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Frequency</mat-label> <mat-label>Frequency</mat-label>
<mat-select required formControlName="loanTermFrequencyType"> <mat-select required formControlName="loanTermFrequencyType">
<mat-option *ngFor="let type of termFrequencyTypeData" [value]="type.id"> <mat-option *ngFor="let type of termFrequencyTypeData" [value]="type.id">
{{ type.value }} {{ type.value }}
</mat-option> </mat-option>
</mat-select> </mat-select>
<mat-error *ngIf="loansAccountTermsForm.controls.loanTermFrequencyType.hasError('required')"> <mat-error *ngIf="loansAccountTermsForm.controls.loanTermFrequencyType.hasError('required')">
Frequency is <strong>required</strong> Frequency is <strong>required</strong>
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Number of repayments</mat-label> <mat-label>Number of repayments</mat-label>
<input type="number" matInput formControlName="numberOfRepayments"> <input type="number" matInput formControlName="numberOfRepayments">
<mat-error *ngIf="loansAccountTermsForm.controls.numberOfRepayments.hasError('required')"> <mat-error *ngIf="loansAccountTermsForm.controls.numberOfRepayments.hasError('required')">
Number of repayments is <strong>required</strong> Number of repayments is <strong>required</strong>
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="48%" (click)="repaymentsPicker.open()"> <mat-form-field fxFlex="48%" (click)="repaymentsPicker.open()">
<mat-label>First repayment on</mat-label> <mat-label>First repayment on</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="repaymentsPicker" <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="repaymentsPicker"
formControlName="repaymentsStartingFromDate"> formControlName="repaymentsStartingFromDate">
<mat-datepicker-toggle matSuffix [for]="repaymentsPicker"></mat-datepicker-toggle> <mat-datepicker-toggle matSuffix [for]="repaymentsPicker"></mat-datepicker-toggle>
<mat-datepicker #repaymentsPicker></mat-datepicker> <mat-datepicker #repaymentsPicker></mat-datepicker>
</mat-form-field> </mat-form-field>
<h4 fxFlex="98%" class="mat-h4">Repaid Every</h4> <h4 fxFlex="98%" class="mat-h4">Repaid Every</h4>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Repaid every</mat-label> <mat-label>Repaid every</mat-label>
<input matInput required formControlName="repaymentEvery" > <input matInput required formControlName="repaymentEvery">
<mat-error *ngIf="loansAccountTermsForm.controls.repaymentEvery.hasError('required')"> <mat-error *ngIf="loansAccountTermsForm.controls.repaymentEvery.hasError('required')">
Repaid every is <strong>required</strong> Repaid every is <strong>required</strong>
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Frequency</mat-label> <mat-label>Frequency</mat-label>
<mat-select formControlName="repaymentFrequencyType" required > <mat-select formControlName="repaymentFrequencyType" required>
<mat-option *ngFor="let repaymentFrequencyType of termFrequencyTypeData" <mat-option *ngFor="let repaymentFrequencyType of termFrequencyTypeData" [value]="repaymentFrequencyType.id">
[value]="repaymentFrequencyType.id"> {{ repaymentFrequencyType.value }}
{{ repaymentFrequencyType.value }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
<mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2"> <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
<mat-label>Select On</mat-label> <mat-label>Select On</mat-label>
<mat-select formControlName="repaymentFrequencyNthDayType"> <mat-select formControlName="repaymentFrequencyNthDayType">
<mat-option <mat-option *ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData"
*ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData" [value]="repaymentFrequencyNthDayType.id">
[value]="repaymentFrequencyNthDayType.id"> {{ repaymentFrequencyNthDayType.value }}
{{ repaymentFrequencyNthDayType.value }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
<mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2"> <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
<mat-label>Select Day</mat-label> <mat-label>Select Day</mat-label>
<mat-select formControlName="repaymentFrequencyDayOfWeekType"> <mat-select formControlName="repaymentFrequencyDayOfWeekType">
<mat-option <mat-option *ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData"
*ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData" [value]="repaymentFrequencyDayOfWeekType.id">
[value]="repaymentFrequencyDayOfWeekType.id"> {{ repaymentFrequencyDayOfWeekType.value }}
{{ repaymentFrequencyDayOfWeekType.value }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
<mat-form-field fxFlex="48%" (click)="interestPicker.open()"> <mat-form-field fxFlex="48%" (click)="interestPicker.open()">
<mat-label>Interest charged from</mat-label> <mat-label>Interest charged from</mat-label>
<input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="interestPicker" <input matInput [min]="minDate" [max]="maxDate" [matDatepicker]="interestPicker"
formControlName="interestChargedFromDate"> formControlName="interestChargedFromDate">
<mat-datepicker-toggle matSuffix [for]="interestPicker"></mat-datepicker-toggle> <mat-datepicker-toggle matSuffix [for]="interestPicker"></mat-datepicker-toggle>
<mat-datepicker #interestPicker></mat-datepicker> <mat-datepicker #interestPicker></mat-datepicker>
</mat-form-field> </mat-form-field>
<ng-container *ngIf="!loansAccountTemplate?.isLoanProductLinkedToFloatingRate"> <ng-container *ngIf="!loansAccountTemplate?.isLoanProductLinkedToFloatingRate">
@@ -105,20 +102,19 @@
<input type="number" matInput formControlName="interestRatePerPeriod"> <input type="number" matInput formControlName="interestRatePerPeriod">
</mat-form-field> </mat-form-field>
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Interest method</mat-label> <mat-label>Interest method</mat-label>
<mat-select formControlName="interestType"> <mat-select formControlName="interestType">
<mat-option *ngFor="let interestType of interestTypeData" <mat-option *ngFor="let interestType of interestTypeData" [value]="interestType.id">
[value]="interestType.id"> {{ interestType.value }}
{{ interestType.value }} </mat-option>
</mat-option> </mat-select>
</mat-select> </mat-form-field>
</mat-form-field>
<mat-checkbox fxFlex="48%" formControlName="isEqualAmortization" <mat-checkbox fxFlex="48%" formControlName="isEqualAmortization"
[checked]="loansAccountTemplate?.isEqualAmortization"> [checked]="loansAccountTemplate?.isEqualAmortization">
<p>Is Equal Amortization</p> <p>Is Equal Amortization</p>
</mat-checkbox> </mat-checkbox>
</ng-container> </ng-container>
@@ -151,8 +147,7 @@
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Amortization</mat-label> <mat-label>Amortization</mat-label>
<mat-select required formControlName="amortizationType"> <mat-select required formControlName="amortizationType">
<mat-option *ngFor="let amortizationType of amortizationTypeData" <mat-option *ngFor="let amortizationType of amortizationTypeData" [value]="amortizationType.id">
[value]="amortizationType.id">
{{ amortizationType.value }} {{ amortizationType.value }}
</mat-option> </mat-option>
</mat-select> </mat-select>
@@ -166,8 +161,7 @@
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Interest calculation period</mat-label> <mat-label>Interest calculation period</mat-label>
<mat-select formControlName="interestCalculationPeriodType"> <mat-select formControlName="interestCalculationPeriodType">
<mat-option <mat-option *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData"
*ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData"
[value]="interestCalculationPeriodType.id"> [value]="interestCalculationPeriodType.id">
{{ interestCalculationPeriodType.value }} {{ interestCalculationPeriodType.value }}
</mat-option> </mat-option>
@@ -175,7 +169,7 @@
</mat-form-field> </mat-form-field>
<!-- <mat-checkbox *ngIf="interestCalculationPeriodType != 0" fxFlex="48%" --> <!-- <mat-checkbox *ngIf="interestCalculationPeriodType != 0" fxFlex="48%" -->
<mat-checkbox fxFlex="48%" formControlName="allowPartialPeriodInterestCalcualtion" > <mat-checkbox fxFlex="48%" formControlName="allowPartialPeriodInterestCalcualtion">
<p>Calculate interest for exact days in partial period</p> <p>Calculate interest for exact days in partial period</p>
</mat-checkbox> </mat-checkbox>
@@ -192,8 +186,7 @@
<mat-form-field fxFlex="48%"> <mat-form-field fxFlex="48%">
<mat-label>Repayment strategy</mat-label> <mat-label>Repayment strategy</mat-label>
<mat-select required formControlName="transactionProcessingStrategyId"> <mat-select required formControlName="transactionProcessingStrategyId">
<mat-option <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData"
*ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData"
[value]="transactionProcessingStrategy.id"> [value]="transactionProcessingStrategy.id">
{{ transactionProcessingStrategy.name }} {{ transactionProcessingStrategy.name }}
</mat-option> </mat-option>
@@ -205,15 +198,15 @@
<h4 fxFlex="98%" class="mat-h4">Moratorium</h4> <h4 fxFlex="98%" class="mat-h4">Moratorium</h4>
<mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnPrincipalPayment" class="margin-v" > <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnPrincipalPayment" class="margin-v">
On Principal Payment On Principal Payment
</mat-checkbox> </mat-checkbox>
<mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnInterestPayment" class="margin-v" > <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnInterestPayment" class="margin-v">
On Interest Payment On Interest Payment
</mat-checkbox> </mat-checkbox>
<mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnArrearsAgeing" class="margin-v" > <mat-checkbox fxFlex="23%" labelPosition="before" formControlName="graceOnArrearsAgeing" class="margin-v">
On Arreas Aging On Arreas Aging
</mat-checkbox> </mat-checkbox>
@@ -231,8 +224,7 @@
<mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.isTopup.value"> <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.isTopup.value">
<mat-label>Loan closed with Topup</mat-label> <mat-label>Loan closed with Topup</mat-label>
<mat-select formControlName="loanIdToClose"> <mat-select formControlName="loanIdToClose">
<mat-option *ngFor="let clientActiveLoan of clientActiveLoanData" <mat-option *ngFor="let clientActiveLoan of clientActiveLoanData" [value]="clientActiveLoan.id">
[value]="clientActiveLoan.id">
{{ clientActiveLoan.accountNo }} {{ clientActiveLoan.accountNo }}
</mat-option> </mat-option>
</mat-select> </mat-select>
@@ -270,7 +262,8 @@
<div fxFlexFill> <div fxFlexFill>
<span fxFlex="40%">Interest recalculation compounding on</span> <span fxFlex="40%">Interest recalculation compounding on</span>
<span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.value }}</span> <span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.value
}}</span>
</div> </div>
<div fxFlexFill> <div fxFlexFill>
@@ -293,24 +286,30 @@
</ng-container> </ng-container>
<div fxFlexFill *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id != 1"> <div fxFlexFill
*ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyType.id != 1">
<span fxFlex="40%">Frequency Interval for recalculation</span> <span fxFlex="40%">Frequency Interval for recalculation</span>
<span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyInterval}}</span> <span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyInterval}}</span>
</div> </div>
<ng-container *ngIf="multiDisburseLoan"> <ng-container *ngIf="multiDisburseLoan">
<mat-divider fxFlex="98%"></mat-divider> <mat-divider fxFlex="98%"></mat-divider>
<h4 fxFlex="98%" class="mat-h4">Loan Tranche Details</h4> <div fxFlexFill *ngIf="allowAddDisbursementDetails()">
<mat-form-field fxFlex="48%"> <h4 fxFlex="98%" class="mat-h4">Loan Tranche Details</h4>
<mat-label>Maximum allowed outstanding balance</mat-label> <mat-form-field fxFlex="48%">
<input matInput required formControlName="maxOutstandingLoanBalance"> <mat-label>Maximum allowed outstanding balance</mat-label>
</mat-form-field> <input matInput required formControlName="maxOutstandingLoanBalance">
<span fxFlex *ngIf="!loansAccountTemplate?.product?.disallowExpectedDisbursements"> </mat-form-field>
<button type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)" <span fxFlex>
[disabled]="isMultiDisbursedCompleted"> <button type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)"
<fa-icon icon="plus-circle" size="lg"></fa-icon> [disabled]="isMultiDisbursedCompleted">
</button> <fa-icon icon="plus-circle" size="lg"></fa-icon>
</span> </button>
</span>
</div>
<div fxFlexFill *ngIf="!allowAddDisbursementDetails()">
<h4 fxFlex="98%" class="mat-h4">Loan Tranche Details are not allowed for this Loan Product</h4>
</div>
<table mat-table [dataSource]="disbursementDataSource" [hidden]="disbursementDataSource.length === 0"> <table mat-table [dataSource]="disbursementDataSource" [hidden]="disbursementDataSource.length === 0">
@@ -329,9 +328,8 @@
<ng-container matColumnDef="actions"> <ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef> Actions </th> <th mat-header-cell *matHeaderCellDef> Actions </th>
<td mat-cell *matCellDef="let row; let rowIndex = index"> <td mat-cell *matCellDef="let row; let rowIndex = index">
<button type="button" mat-icon-button color="warn" <button type="button" mat-icon-button color="warn" (click)="removeDisbursementDataEntry(rowIndex)"
(click)="removeDisbursementDataEntry(rowIndex)" matTooltip="Delete" matTooltip="Delete" matTooltipPosition="left">
matTooltipPosition="left">
<fa-icon icon="trash"></fa-icon> <fa-icon icon="trash"></fa-icon>
</button> </button>
</td> </td>
@@ -348,7 +346,8 @@
<div fxFlexFill> <div fxFlexFill>
<span fxFlex="40%">Frequency for compounding</span> <span fxFlex="40%">Frequency for compounding</span>
<span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.value}} <span fxFlex="60%">{{
loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.value}}
<span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id == 3 && <span *ngIf="loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id == 3 &&
loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday != null"> loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday != null">
on {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}} on {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
@@ -368,9 +367,11 @@
</ng-container> </ng-container>
<div fxFlexFill *ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.id != 0 && loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id != 1"> <div fxFlexFill
*ngIf="loansAccountTemplate?.isInterestRecalculationEnabled && loansAccountTemplate?.interestRecalculationData.interestRecalculationCompoundingType.id != 0 && loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyType.id != 1">
<span fxFlex="40%">Frequency Interval for compounding</span> <span fxFlex="40%">Frequency Interval for compounding</span>
<span fxFlex="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span> <span fxFlex="60%">{{
loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span>
</div> </div>
<mat-divider fxFlex="98%"></mat-divider> <mat-divider fxFlex="98%"></mat-divider>
@@ -423,19 +424,19 @@
<tr mat-row *matRowDef="let row; columns: loanCollateralDisplayedColumns;"></tr> <tr mat-row *matRowDef="let row; columns: loanCollateralDisplayedColumns;"></tr>
</table> </table>
</div> </div>
<div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%"> <div fxLayout="row" class="margin-t" fxLayout.xs="column" fxLayoutAlign="center" fxLayoutGap="2%">
<button mat-raised-button matStepperPrevious> <button mat-raised-button matStepperPrevious>
<fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp; <fa-icon icon="arrow-left"></fa-icon>&nbsp;&nbsp;
Previous Previous
</button> </button>
<button mat-raised-button matStepperNext> <button mat-raised-button matStepperNext>
Next&nbsp;&nbsp; Next&nbsp;&nbsp;
<fa-icon icon="arrow-right"></fa-icon> <fa-icon icon="arrow-right"></fa-icon>
</button> </button>
<button mat-raised-button *ngIf="loanId" [routerLink]="['../', 'general']"> <button mat-raised-button *ngIf="loanId" [routerLink]="['../', 'general']">
Cancel Cancel
</button> </button>
</div> </div>
</form> </form>
src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts
+4
View File
@@ -214,6 +214,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
// this.setCustomValidators(); // this.setCustomValidators();
} }
allowAddDisbursementDetails() {
return (this.multiDisburseLoan && !this.loansAccountTermsData.disallowExpectedDisbursements);
}
/** Custom Validators for the form */ /** Custom Validators for the form */
setCustomValidators() { setCustomValidators() {
const repaymentFrequencyNthDayType = this.loansAccountTermsForm.get('repaymentFrequencyNthDayType'); const repaymentFrequencyNthDayType = this.loansAccountTermsForm.get('repaymentFrequencyNthDayType');
src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts
+1
View File
@@ -317,6 +317,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
} else { } else {
this.loanProductSettingsForm.removeControl('maxTrancheCount'); this.loanProductSettingsForm.removeControl('maxTrancheCount');
this.loanProductSettingsForm.removeControl('outstandingLoanBalance'); this.loanProductSettingsForm.removeControl('outstandingLoanBalance');
this.loanProductSettingsForm.patchValue({'disallowExpectedDisbursements': false});
} }
}); });