WEB-670: Working Capital loan delinquency grace days

Author: alberto-art3ch

src/app/directives/positive-number.directive.ts

@@ -8,7 +8,7 @@
 
 import { Directive, ElementRef, HostListener, inject } from '@angular/core';
 
-@Directive({ selector: '[mifosxPositiveNumber]' })
+@Directive({ selector: '[mifosxPositiveNumber]', standalone: true })
 export class PositiveNumberDirective {
   private el = inject(ElementRef);
 

src/app/loans/common-resolvers/loan-delinquency-data.resolver.ts

@@ -27,6 +27,7 @@ export class LoanDelinquencyDataResolver extends LoanBaseResolver {
   constructor() {
     super();
   }
+
   /**
    * Returns the Loans with Association data.
    * @returns {Observable<any>}

src/app/loans/common-resolvers/loan-originators.resolver.ts

@@ -9,13 +9,15 @@
 import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { LoansService } from 'app/loans/loans.service';
+import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
 import { Observable, throwError } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class LoanOriginatorsResolver {
   private loansService = inject(LoansService);
+  private loanProductService = inject(LoanProductService);
 
   /**
    * Returns the Loans data.
@@ -26,6 +28,8 @@ export class LoanOriginatorsResolver {
     if (!loanId) {
       return throwError(() => new Error('Missing loanId route param'));
     }
-    return this.loansService.getLoanOriginators(loanId);
+    if (this.loanProductService.isLoanProduct) {
+      return this.loansService.getLoanOriginators(loanId);
+    }
   }
 }

src/app/loans/common-resolvers/loans-account-and-template.resolver.ts

@@ -11,28 +11,35 @@ import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 
 /** rxjs Imports */
-import { Observable } from 'rxjs';
+import { EMPTY, Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
-import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 /**
  * Loan accounts template data resolver.
  */
 @Injectable()
-export class LoansAccountAndTemplateResolver {
+export class LoansAccountAndTemplateResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
-  private loanProductService = inject(LoanProductService);
+
+  constructor() {
+    super();
+  }
 
   /**
    * Returns the loan account template data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    this.initialize(route);
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
-    return this.loanProductService.isLoanProduct
-      ? this.loansService.getLoansAccountAndTemplateResource(loanId)
-      : this.loansService.getWorkingCapitalLoanDetails(loanId);
+    if (!isNaN(+loanId)) {
+      return this.isLoanProduct
+        ? this.loansService.getLoansAccountAndTemplateResource(loanId)
+        : this.loansService.getWorkingCapitalLoanDetails(loanId);
+    }
+    return EMPTY;
   }
 }

src/app/loans/create-loans-account/create-loans-account.component.ts

@@ -124,7 +124,8 @@ export class CreateLoansAccountComponent extends LoanProductBaseComponent implem
       this.loansAccountProductTemplate.options = {
         delinquencyBucketOptions: templateData.delinquencyBucketOptions,
         fundOptions: templateData.fundOptions,
-        periodFrequencyTypeOptions: templateData.periodFrequencyTypeOptions
+        periodFrequencyTypeOptions: templateData.periodFrequencyTypeOptions,
+        delinquencyStartTypeOptions: templateData.delinquencyStartTypeOptions
       };
     }
     this.currencyCode = this.loansAccountProductTemplate.currency.code;
@@ -290,6 +291,11 @@ export class CreateLoansAccountComponent extends LoanProductBaseComponent implem
       }
     }
 
+    // No Empty discount value to be sent
+    if (payload['discount'] == null || payload['discount'] === '') {
+      delete payload['discount'];
+    }
+
     this.loansService
       .createLoansAccount(this.loanProductService.loanAccountPath, payload)
       .subscribe((response: any) => {

src/app/loans/edit-loans-account/edit-loans-account.component.ts

@@ -109,7 +109,8 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
       this.loansAccountProductTemplate.options = {
         delinquencyBucketOptions: templateData.delinquencyBucketOptions,
         fundOptions: templateData.fundOptions,
-        periodFrequencyTypeOptions: templateData.periodFrequencyTypeOptions
+        periodFrequencyTypeOptions: templateData.periodFrequencyTypeOptions,
+        delinquencyStartTypeOptions: templateData.delinquencyStartTypeOptions
       };
     }
     if (this.loansAccountProductTemplate.loanProductId) {
@@ -313,6 +314,11 @@ export class EditLoansAccountComponent extends LoanProductBaseComponent {
       }
     }
 
+    // No Empty discount value to be sent
+    if (payload['discount'] == null || payload['discount'] === '') {
+      delete payload['discount'];
+    }
+
     this.loansService
       .updateLoansAccount(this.loanProductService.loanAccountPath, this.loanId, payload)
       .subscribe((response: any) => {

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

@@ -107,6 +107,20 @@ <h3 class="mat-h3 margin-t flex-fill">{{ 'labels.heading.Terms' | translate }}</
       </div>
     }
 
+    @if (loansAccount.delinquencyGraceDays) {
+      <div class="flex-fill">
+        <span class="flex-30">{{ 'labels.inputs.Delinquency Grace Days' | translate }}:</span>
+        <span class="flex-70"> {{ loansAccount.delinquencyGraceDays | formatNumber }}</span>
+      </div>
+    }
+
+    @if (loansAccount.delinquencyStartType) {
+      <div class="flex-fill">
+        <span class="flex-30">{{ 'labels.inputs.Delinquency Start Type' | translate }}:</span>
+        <span class="flex-60">{{ camalize(loansAccount.delinquencyStartType) | translateKey: 'catalogs' }}</span>
+      </div>
+    }
+
     <div class="flex-fill">
       <span class="flex-30">{{ 'labels.inputs.Period Payment Rate' | translate }}:</span>
       <span class="flex-70"> {{ loansAccount.periodPaymentRate | formatNumber }} % </span>

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

@@ -36,17 +36,17 @@ <h4 class="mat-h4 flex-98">
         }
       </mat-form-field>
 
-      <mat-form-field class="flex-48">
+      <mat-form-field class="flex-23">
         <mat-label>{{ 'labels.inputs.Discount' | translate }}</mat-label>
         <input type="number" matInput mifosxPositiveNumber min="0" formControlName="discount" />
       </mat-form-field>
 
-      <mat-form-field class="flex-48">
+      <mat-form-field class="flex-23">
         <mat-label>{{ 'labels.inputs.Period Payment Rate' | translate }}</mat-label>
         <input type="number" matInput mifosxPositiveNumber min="0" formControlName="periodPaymentRate" />
       </mat-form-field>
 
-      <mat-form-field class="flex-24">
+      <mat-form-field class="flex-23">
         <mat-label>{{ 'labels.inputs.Period Payment Frequency' | translate }}</mat-label>
         <input
           type="number"
@@ -65,7 +65,7 @@ <h4 class="mat-h4 flex-98">
         }
       </mat-form-field>
 
-      <mat-form-field class="flex-24">
+      <mat-form-field class="flex-23">
         <mat-label>{{ 'labels.inputs.Period Payment Frequency Type' | translate }}</mat-label>
         <mat-select formControlName="repaymentFrequencyType" required>
           @for (repaymentFrequencyType of termFrequencyTypeData; track repaymentFrequencyType) {
@@ -75,6 +75,22 @@ <h4 class="mat-h4 flex-98">
           }
         </mat-select>
       </mat-form-field>
+
+      <mat-form-field class="flex-23">
+        <mat-label>{{ 'labels.inputs.Delinquency Grace Days' | translate }}</mat-label>
+        <input type="number" min="0" matInput formControlName="delinquencyGraceDays" />
+      </mat-form-field>
+
+      <mat-form-field class="flex-23">
+        <mat-label>{{ 'labels.inputs.Delinquency Start Type' | translate }}</mat-label>
+        <mat-select formControlName="delinquencyStartType">
+          @for (delinquencyStartType of delinquencyStartTypeOptions; track delinquencyStartType) {
+            <mat-option [value]="delinquencyStartType.id">
+              {{ delinquencyStartType.value | translateKey: 'catalogs' }}
+            </mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
     }
 
     @if (loanProductService.isLoanProduct) {

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

@@ -21,7 +21,7 @@ import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicke
 import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
 import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
 import { Currency } from 'app/shared/models/general.model';
-import { CodeName, OptionData } from 'app/shared/models/option-data.model';
+import { CodeName, OptionData, StringEnumOptionData } from 'app/shared/models/option-data.model';
 import { InputAmountComponent } from '../../../shared/input-amount/input-amount.component';
 import { MatTooltip } from '@angular/material/tooltip';
 import { MatCheckbox } from '@angular/material/checkbox';
@@ -174,6 +174,8 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
 
   allowAttributeOverrides: any | null = null;
 
+  delinquencyStartTypeOptions: StringEnumOptionData[] = [];
+
   constructor() {
     super();
     this.createloansAccountTermsForm();
@@ -319,6 +321,7 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
       this.loansAccountTermsData = this.loansAccountProductTemplate;
       this.currency = this.loansAccountTermsData.currency;
       this.termFrequencyTypeData = this.loansAccountTermsData.options?.periodFrequencyTypeOptions;
+      this.delinquencyStartTypeOptions = this.loansAccountTermsData.options?.delinquencyStartTypeOptions;
       if (this.loanId != null && 'accountNo' in this.loansAccountTemplate) {
         this.loansAccountTermsData = this.loansAccountTemplate;
         this.loansAccountTermsForm.patchValue({
@@ -327,11 +330,16 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
           periodPaymentRate: this.loansAccountTermsData.periodPaymentRate,
           totalPayment: this.loansAccountTermsData.balance?.totalPayment,
           repaymentEvery: this.loansAccountTermsData.repaymentEvery,
-          repaymentFrequencyType: this.loansAccountTermsData.repaymentFrequencyType?.id
+          repaymentFrequencyType: this.loansAccountTermsData.repaymentFrequencyType?.id,
+          delinquencyGraceDays: this.loansAccountTermsData.delinquencyGraceDays,
+          delinquencyStartType: this.loansAccountTermsData.delinquencyStartType?.code
         });
       } else {
         this.loansAccountTermsForm.patchValue({
-          principalAmount: this.loansAccountTermsData.product.principal
+          discount: this.loansAccountTermsData.product.discount || '',
+          principalAmount: this.loansAccountTermsData.product.principal,
+          delinquencyGraceDays: this.loansAccountTermsData.product.delinquencyGraceDays || '',
+          delinquencyStartType: this.loansAccountTermsData.product.delinquencyStartType?.code || ''
         });
       }
       this.allowAttributeOverrides = this.loansAccountProductTemplate.product.allowAttributeOverrides;
@@ -436,7 +444,12 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
           principalAmount: this.loansAccountTermsData.principal || this.loansAccountTermsData.product.principal,
           periodPaymentRate: this.loansAccountTermsData.periodPaymentRate,
           repaymentEvery: this.loansAccountTermsData.repaymentEvery,
-          repaymentFrequencyType: this.loansAccountTermsData.repaymentFrequencyType.id
+          repaymentFrequencyType: this.loansAccountTermsData.repaymentFrequencyType.id,
+          delinquencyGraceDays:
+            this.loansAccountTermsData.delinquencyGraceDays || this.loansAccountTermsData.product.delinquencyGraceDays,
+          delinquencyStartType:
+            this.loansAccountTermsData.delinquencyStartType?.id ||
+            this.loansAccountTermsData.product.delinquencyStartType?.id
         });
       }
     }
@@ -628,7 +641,14 @@ export class LoansAccountTermsStepComponent extends LoanProductBaseComponent imp
         repaymentFrequencyType: [
           '',
           Validators.required
-        ]
+        ],
+        delinquencyGraceDays: [
+          '',
+          [
+            Validators.min(0)
+          ]
+        ],
+        delinquencyStartType: ['']
       });
     }
   }

src/app/loans/loans-view/account-details/account-details.component.html

@@ -39,6 +39,16 @@ <h3>{{ 'labels.heading.Loan Details' | translate }}</h3>
           <span class="flex-50">{{ loanDetails.discount | formatNumber }}</span>
         </div>
       }
+
+      <div class="flex-fill layout-row">
+        <span class="flex-50"> {{ 'labels.inputs.Delinquency Grace Days' | translate }} </span>
+        <span class="flex-50">{{ loanDetails.delinquencyGraceDays | formatNumber }}</span>
+      </div>
+
+      <div class="flex-fill layout-row">
+        <span class="flex-50"> {{ 'labels.inputs.Delinquency Start Type' | translate }} </span>
+        <span class="flex-50">{{ loanDetails.delinquencyStartType?.value | translateKey: 'catalogs' }}</span>
+      </div>
     }
 
     @if (loanProductService.isLoanProduct) {