WEB-813: Working Capital loan delinquency actions

Author: alberto-art3ch

src/app/core/utils/dates.ts

@@ -52,6 +52,14 @@ export class Dates {
     }
   }
 
+  public isBefore(date1: Date, date2: Date): boolean {
+    return date1 < date2;
+  }
+
+  public isAfter(date1: Date, date2: Date): boolean {
+    return date1 > date2;
+  }
+
   public parseDatetime(value: any): Date {
     return moment(value).toDate();
   }

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

@@ -0,0 +1,48 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { LOAN_PRODUCT_TYPE, LoanProductType } from 'app/products/loan-products/models/loan-product.model';
+import { ActivatedRouteSnapshot } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class LoanBaseResolver {
+  productType = new BehaviorSubject<LoanProductType>(LOAN_PRODUCT_TYPE.LOAN);
+
+  constructor() {}
+
+  protected initialize(route: ActivatedRouteSnapshot): void {
+    const productType = route.queryParams['productType'];
+    if (productType !== null) {
+      if (productType === 'loan') {
+        this.productType.next(LOAN_PRODUCT_TYPE.LOAN);
+      } else if (productType === 'working-capital') {
+        this.productType.next(LOAN_PRODUCT_TYPE.WORKING_CAPITAL);
+      }
+    }
+  }
+
+  get isWorkingCapital(): boolean {
+    return LOAN_PRODUCT_TYPE.WORKING_CAPITAL === this.productType.value;
+  }
+
+  get isLoanProduct(): boolean {
+    return LOAN_PRODUCT_TYPE.LOAN === this.productType.value;
+  }
+
+  get loanProductPath(): string {
+    return this.isLoanProduct ? 'loanproducts' : 'working-capital-loan-products';
+  }
+
+  get loanAccountPath(): string {
+    return this.isLoanProduct ? 'loans' : 'working-capital-loans';
+  }
+}

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

@@ -10,19 +10,27 @@ import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 @Injectable({
   providedIn: 'root'
 })
-export class LoanDelinquencyActionsResolver {
+export class LoanDelinquencyActionsResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
+
   /**
    * Returns the Loans with Association 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.loansService.getDelinquencyActions(loanId);
+    if (!isNaN(+loanId)) {
+      return this.loansService.getDelinquencyActions(this.loanAccountPath, loanId);
+    }
   }
 }

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

@@ -15,20 +15,29 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 /**
  * Loan Delinquency data resolver.
  */
 @Injectable()
-export class LoanDelinquencyDataResolver {
+export class LoanDelinquencyDataResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
   /**
    * Returns the Loans with Association 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.loansService.getDelinquencyData(loanId);
+    if (!isNaN(+loanId)) {
+      return this.isLoanProduct
+        ? this.loansService.getDelinquencyData(loanId)
+        : this.loansService.getWorkingCapitalLoanDetails(loanId);
+    }
   }
 }

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

@@ -15,20 +15,28 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanBaseResolver } from './loan-base.resolver';
 
 /**
- * Clients data resolver.
+ * Loan Delinquency Tags data resolver.
  */
 @Injectable()
-export class LoanDelinquencyTagsResolver {
+export class LoanDelinquencyTagsResolver extends LoanBaseResolver {
   private loansService = inject(LoansService);
 
+  constructor() {
+    super();
+  }
+
   /**
    * Returns the Loans with Association 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.loansService.getDelinquencyTags(loanId);
+    if (!isNaN(+loanId)) {
+      return this.loansService.getDelinquencyTags(loanId);
+    }
   }
 }

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

@@ -40,7 +40,7 @@ export class LoanDetailsResolver {
       if (resolvedProductType === LOAN_PRODUCT_TYPE.LOAN) {
         return this.loansService.getLoanAccountAssociationDetails(loanId);
       } else {
-        return this.loansService.getWorkingCapitalLoannDetails(loanId);
+        return this.loansService.getWorkingCapitalLoanDetails(loanId);
       }
     }
   }

src/app/loans/custom-dialog/loan-delinquency-action-reschedule-dialog/loan-delinquency-action-reschedule-dialog.component.html

@@ -0,0 +1,56 @@
+<!--
+  Copyright since 2025 Mifos Initiative
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<h2 mat-dialog-title>{{ 'labels.heading.Loan Delinquency Actions' | translate }}</h2>
+
+<div mat-dialog-content [formGroup]="delinquencyActionForm" class="layout-column">
+  <mat-form-field class="flex-28">
+    <mat-label>{{ 'labels.inputs.Minimum Payment' | translate }}</mat-label>
+    <input type="number" matInput formControlName="minimumPayment" />
+  </mat-form-field>
+
+  <mat-form-field class="flex-23">
+    <mat-label>{{ 'labels.inputs.Period Payment Frequency' | translate }}</mat-label>
+    <input
+      type="number"
+      matInput
+      required
+      formControlName="frequency"
+      matTooltip="{{ 'tooltips.Fields are input to calculating the repayment schedule' | translate }}"
+    />
+    @if (delinquencyActionForm.controls.frequency.hasError('required')) {
+      <mat-error>
+        {{ 'labels.inputs.Period Payment Frequency' | translate }} {{ 'labels.commons.is' | translate }}
+        <strong>{{ 'labels.commons.required' | translate }}</strong>
+      </mat-error>
+    }
+  </mat-form-field>
+
+  <mat-form-field class="flex-23">
+    <mat-label>{{ 'labels.inputs.Period Payment Frequency Type' | translate }}</mat-label>
+    <mat-select formControlName="frequencyType" required>
+      @for (frequencyType of frequencyTypeOptions; track frequencyType) {
+        <mat-option [value]="frequencyType.id">
+          {{ frequencyType.value | translateKey: 'catalogs' }}
+        </mat-option>
+      }
+    </mat-select>
+  </mat-form-field>
+</div>
+
+<mat-dialog-actions class="layout-row layout-xs-column layout-align-center gap-2percent">
+  <button mat-raised-button mat-dialog-close>{{ 'labels.buttons.Cancel' | translate }}</button>
+  <button
+    mat-raised-button
+    color="primary"
+    [mat-dialog-close]="{ data: delinquencyActionForm }"
+    [disabled]="!delinquencyActionForm.valid || delinquencyActionForm.pristine"
+  >
+    {{ 'labels.buttons.Reschedule' | translate }}
+  </button>
+</mat-dialog-actions>

src/app/loans/custom-dialog/loan-delinquency-action-reschedule-dialog/loan-delinquency-action-reschedule-dialog.component.scss

@@ -0,0 +1,7 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */

src/app/loans/custom-dialog/loan-delinquency-action-reschedule-dialog/loan-delinquency-action-reschedule-dialog.component.ts

@@ -0,0 +1,68 @@
+/**
+ * Copyright since 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Component, inject } from '@angular/core';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms';
+import {
+  MAT_DIALOG_DATA,
+  MatDialogRef,
+  MatDialogTitle,
+  MatDialogContent,
+  MatDialogActions,
+  MatDialogClose
+} from '@angular/material/dialog';
+import { CdkScrollable } from '@angular/cdk/scrolling';
+import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
+import { MatTooltip } from '@angular/material/tooltip';
+import { StringEnumOptionData } from 'app/shared/models/option-data.model';
+
+@Component({
+  selector: 'mifosx-loan-delinquency-action-reschedule-dialog',
+  templateUrl: './loan-delinquency-action-reschedule-dialog.component.html',
+  styleUrl: './loan-delinquency-action-reschedule-dialog.component.scss',
+  imports: [
+    ...STANDALONE_SHARED_IMPORTS,
+    MatDialogTitle,
+    CdkScrollable,
+    MatDialogContent,
+    MatDialogActions,
+    MatDialogClose,
+    MatTooltip
+  ]
+})
+export class LoanDelinquencyActionRescheduleDialogComponent {
+  dialogRef = inject<MatDialogRef<LoanDelinquencyActionRescheduleDialogComponent>>(MatDialogRef);
+  data = inject(MAT_DIALOG_DATA);
+  private formBuilder = inject(UntypedFormBuilder);
+
+  delinquencyActionForm: UntypedFormGroup;
+
+  frequencyTypeOptions: StringEnumOptionData[] = [];
+
+  constructor() {
+    this.createDelinquencyActionForm();
+    this.frequencyTypeOptions = this.data.frequencyTypeOptions;
+  }
+
+  createDelinquencyActionForm() {
+    this.delinquencyActionForm = this.formBuilder.group({
+      minimumPayment: [
+        '',
+        Validators.required
+      ],
+      frequency: [
+        '',
+        Validators.required
+      ],
+      frequencyType: [
+        '',
+        Validators.required
+      ]
+    });
+  }
+}

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

@@ -51,7 +51,7 @@ <h4 class="mat-h4 flex-98">
         />
         @if (loansAccountTermsForm.controls.repaymentEvery.hasError('required')) {
           <mat-error>
-            {{ 'labels.inputs.Repaid every' | translate }} {{ 'labels.commons.is' | translate }}
+            {{ 'labels.inputs.Period Payment Frequency' | translate }} {{ 'labels.commons.is' | translate }}
             <strong>{{ 'labels.commons.required' | translate }}</strong>
           </mat-error>
         }