Merge pull request #1534 from josehernandezfintecheandomx/enhancement/manage_loan_tranches

Management Loan tranches

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html

@@ -61,8 +61,7 @@
     <mat-form-field fxFlex="48%">
       <mat-label>Frequency</mat-label>
       <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 }}
         </mat-option>
       </mat-select>
@@ -71,8 +70,7 @@
     <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
       <mat-label>Select On</mat-label>
       <mat-select formControlName="repaymentFrequencyNthDayType">
-          <mat-option
+        <mat-option *ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData"
-            *ngFor="let repaymentFrequencyNthDayType of repaymentFrequencyNthDayTypeData"
           [value]="repaymentFrequencyNthDayType.id">
           {{ repaymentFrequencyNthDayType.value }}
         </mat-option>
@@ -82,8 +80,7 @@
     <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.repaymentFrequencyType.value == 2">
       <mat-label>Select Day</mat-label>
       <mat-select formControlName="repaymentFrequencyDayOfWeekType">
-          <mat-option
+        <mat-option *ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData"
-            *ngFor="let repaymentFrequencyDayOfWeekType of repaymentFrequencyDaysOfWeekTypeData"
           [value]="repaymentFrequencyDayOfWeekType.id">
           {{ repaymentFrequencyDayOfWeekType.value }}
         </mat-option>
@@ -108,8 +105,7 @@
       <mat-form-field fxFlex="48%">
         <mat-label>Interest method</mat-label>
         <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 }}
           </mat-option>
         </mat-select>
@@ -151,8 +147,7 @@
     <mat-form-field fxFlex="48%">
       <mat-label>Amortization</mat-label>
       <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 }}
         </mat-option>
       </mat-select>
@@ -166,8 +161,7 @@
     <mat-form-field fxFlex="48%">
       <mat-label>Interest calculation period</mat-label>
       <mat-select formControlName="interestCalculationPeriodType">
-        <mat-option
+        <mat-option *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData"
-          *ngFor="let interestCalculationPeriodType of interestCalculationPeriodTypeData"
           [value]="interestCalculationPeriodType.id">
           {{ interestCalculationPeriodType.value }}
         </mat-option>
@@ -192,8 +186,7 @@
     <mat-form-field fxFlex="48%">
       <mat-label>Repayment strategy</mat-label>
       <mat-select required formControlName="transactionProcessingStrategyId">
-        <mat-option
+        <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData"
-          *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData"
           [value]="transactionProcessingStrategy.id">
           {{ transactionProcessingStrategy.name }}
         </mat-option>
@@ -231,8 +224,7 @@
       <mat-form-field fxFlex="48%" *ngIf="loansAccountTermsForm.controls.isTopup.value">
         <mat-label>Loan closed with Topup</mat-label>
         <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 }}
           </mat-option>
         </mat-select>
@@ -270,7 +262,8 @@
 
       <div fxFlexFill>
         <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 fxFlexFill>
@@ -293,24 +286,30 @@
 
     </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="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationRestFrequencyInterval}}</span>
     </div>
 
     <ng-container *ngIf="multiDisburseLoan">
       <mat-divider fxFlex="98%"></mat-divider>
+      <div fxFlexFill *ngIf="allowAddDisbursementDetails()">
         <h4 fxFlex="98%" class="mat-h4">Loan Tranche Details</h4>
         <mat-form-field fxFlex="48%">
           <mat-label>Maximum allowed outstanding balance</mat-label>
           <input matInput required formControlName="maxOutstandingLoanBalance">
         </mat-form-field>
-      <span fxFlex *ngIf="!loansAccountTemplate?.product?.disallowExpectedDisbursements">
+        <span fxFlex>
           <button type="button" mat-icon-button color="primary" (click)="addDisbursementDataEntry(disbursementData)"
             [disabled]="isMultiDisbursedCompleted">
             <fa-icon icon="plus-circle" size="lg"></fa-icon>
           </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">
 
@@ -329,9 +328,8 @@
         <ng-container matColumnDef="actions">
           <th mat-header-cell *matHeaderCellDef> Actions </th>
           <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>
             </button>
           </td>
@@ -348,7 +346,8 @@
 
       <div fxFlexFill>
         <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 &&
             loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday != null">
             on {{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyWeekday.value}}
@@ -368,9 +367,11 @@
 
     </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="60%">{{ loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span>
+      <span fxFlex="60%">{{
+        loansAccountTemplate?.interestRecalculationData.recalculationCompoundingFrequencyInterval}}</span>
     </div>
 
     <mat-divider fxFlex="98%"></mat-divider>

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts

@@ -214,6 +214,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
     // this.setCustomValidators();
   }
 
+  allowAddDisbursementDetails() {
+    return (this.multiDisburseLoan && !this.loansAccountTermsData.disallowExpectedDisbursements);
+  }
+
   /** Custom Validators for the form */
   setCustomValidators() {
     const repaymentFrequencyNthDayType = this.loansAccountTermsForm.get('repaymentFrequencyNthDayType');

src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.ts

@@ -317,6 +317,7 @@ export class LoanProductSettingsStepComponent implements OnInit {
         } else {
           this.loanProductSettingsForm.removeControl('maxTrancheCount');
           this.loanProductSettingsForm.removeControl('outstandingLoanBalance');
+          this.loanProductSettingsForm.patchValue({'disallowExpectedDisbursements': false});
         }
       });