WEB-813: Working Capital loan account creation

Author: alberto-art3ch

src/app/clients/clients-view/general-tab/general-tab.component.html

@@ -153,6 +153,12 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
           <mifosx-account-number accountNo="{{ element.accountNo }}"></mifosx-account-number>
         </td>
       </ng-container>
+      <ng-container matColumnDef="Product Type">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Product Type' | translate }}</th>
+        <td mat-cell *matCellDef="let element">
+          {{ loanProductTypeLabel(element.productType) | translate }}
+        </td>
+      </ng-container>
       <ng-container matColumnDef="Loan Account">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Loan Product' | translate }}</th>
         <td mat-cell *matCellDef="let element">
@@ -180,29 +186,19 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
       <ng-container matColumnDef="Type">
         <th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Type' | translate }}</th>
         <td mat-cell class="center" *matCellDef="let element">
-          <i
-            class="fa fa-large"
-            [ngClass]="element.loanType.value === 'Individual' ? 'fa-user' : 'fa-group'"
-            matTooltip="{{ element.loanType.value }}"
-            matTooltipPosition="above"
-          ></i>
+          @if (element.productType === 'loan') {
+            <i
+              class="fa fa-large"
+              [ngClass]="element.loanType.value === 'Individual' ? 'fa-user' : 'fa-group'"
+              matTooltip="{{ element.loanType.value }}"
+              matTooltipPosition="above"
+            ></i>
+          }
         </td>
       </ng-container>
       <ng-container matColumnDef="Actions">
         <th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
         <td mat-cell class="center" *matCellDef="let element">
-          <!-- Print Icon -->
-          <button
-            class="account-action-button"
-            mat-raised-button
-            color="accent"
-            matTooltip="{{ 'tooltips.Print Loan Application' | translate }}"
-            matTooltipPosition="above"
-            aria-label="{{ 'tooltips.Print Loan Application' | translate }}"
-            (click)="openLoanApplicationReport($event, element.id)"
-          >
-            <i class="fa fa-print"></i>
-          </button>
           @if (element.status.active) {
             <button
               class="account-action-button"
@@ -279,6 +275,7 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
         mat-row
         *matRowDef="let row; columns: openLoansColumns"
         [routerLink]="['../', 'loans-accounts', row.id, 'general']"
+        [queryParams]="{ productType: row.productType }"
         class="select-row"
       ></tr>
       <tr
@@ -307,6 +304,12 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
           <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
         </td>
       </ng-container>
+      <ng-container matColumnDef="Product Type">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Product Type' | translate }}</th>
+        <td mat-cell *matCellDef="let element">
+          {{ loanProductTypeLabel(element.productType) | translate }}
+        </td>
+      </ng-container>
       <ng-container matColumnDef="Original Loan">
         <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Original Loan' | translate }}</th>
         <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -340,19 +343,7 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
       </ng-container>
       <ng-container matColumnDef="Actions">
         <th mat-header-cell class="center" *matHeaderCellDef>{{ 'labels.inputs.Actions' | translate }}</th>
-        <td mat-cell class="center" *matCellDef="let element">
-          <!-- Print Icon -->
-          <button
-            class="account-action-button"
-            mat-raised-button
-            color="accent"
-            matTooltip="{{ 'tooltips.Print Loan Application' | translate }}"
-            matTooltipPosition="above"
-            (click)="openLoanApplicationReport($event, element.id)"
-          >
-            <i class="fa fa-print"></i>
-          </button>
-        </td>
+        <td mat-cell class="center" *matCellDef="let element"></td>
       </ng-container>
 
       <ng-container matColumnDef="no-data">
@@ -368,6 +359,7 @@ <h3>{{ 'labels.heading.Loan Accounts' | translate }}</h3>
         mat-row
         *matRowDef="let row; columns: closedLoansColumns"
         [routerLink]="['../', 'loans-accounts', row.id, 'general']"
+        [queryParams]="{ productType: row.productType }"
         class="select-row"
       ></tr>
       <tr

src/app/clients/clients-view/general-tab/general-tab.component.ts

@@ -7,8 +7,8 @@
  */
 
 /** Angular Imports */
-import { Component, OnInit, OnDestroy, inject } from '@angular/core';
-import { Router, ActivatedRoute, RouterLink } from '@angular/router';
+import { Component, OnDestroy, inject } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 
 /** Custom Services. */
@@ -45,6 +45,7 @@ import { Subject } from 'rxjs';
 import { takeUntil, catchError } from 'rxjs/operators';
 import { AlertService } from 'app/core/alert/alert.service';
 import { EMPTY } from 'rxjs';
+import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
 
 /**
  * General Tab component.
@@ -155,6 +156,7 @@ export class GeneralTabComponent implements OnDestroy {
   /** Open Loan Accounts Columns */
   openLoansColumns: string[] = [
     'Account No',
+    'Product Type',
     'Loan Account',
     'Original Loan',
     'Loan Balance',
@@ -165,6 +167,7 @@ export class GeneralTabComponent implements OnDestroy {
   /** Closed Loan Accounts Columns */
   closedLoansColumns: string[] = [
     'Account No',
+    'Product Type',
     'Loan Account',
     'Original Loan',
     'Loan Balance',
@@ -226,6 +229,7 @@ export class GeneralTabComponent implements OnDestroy {
   clientAccountData: any;
   /** Loan Accounts Data */
   loanAccounts: any[] = [];
+  workingCapitalLoanAccounts: any[] = [];
   /** Savings Accounts Data */
   savingAccounts: any[] = [];
   /** Shares Accounts Data */
@@ -273,7 +277,10 @@ export class GeneralTabComponent implements OnDestroy {
       (data: { clientAccountsData: any; clientChargesData: any; clientSummary: any; clientCollateralData: any }) => {
         this.clientAccountData = data.clientAccountsData;
         this.savingAccounts = data.clientAccountsData?.savingsAccounts ?? [];
-        this.loanAccounts = data.clientAccountsData?.loanAccounts ?? [];
+        this.loanAccounts = [];
+        this.processLoanAccounts(data.clientAccountsData?.loanAccounts ?? [], 'loan');
+        this.processLoanAccounts(data.clientAccountsData?.workingCapitalLoanAccounts ?? [], 'working-capital');
+        this.workingCapitalLoanAccounts = data.clientAccountsData?.workingCapitalLoanAccounts ?? [];
         this.shareAccounts = data.clientAccountsData?.shareAccounts ?? [];
 
         this.upcomingCharges = data.clientChargesData?.pageItems ?? [];
@@ -417,4 +424,17 @@ export class GeneralTabComponent implements OnDestroy {
       return 'labels.buttons.View Closed Accounts';
     }
   }
+
+  loanProductTypeLabel(productType: string): string {
+    return LoanProductService.productTypeLabel(productType);
+  }
+
+  private processLoanAccounts(accounts: any[], productType: string): void {
+    accounts.map((account: any) => {
+      this.loanAccounts.push({
+        productType: productType,
+        ...account
+      });
+    });
+  }
 }

src/app/core/shell/breadcrumb/breadcrumb.component.ts

@@ -8,7 +8,7 @@
 
 /** Angular Imports */
 import { Component, TemplateRef, ElementRef, ViewChild, AfterViewInit, OnDestroy, inject } from '@angular/core';
-import { ActivatedRoute, Router, NavigationEnd, Data, RouterLink } from '@angular/router';
+import { ActivatedRoute, Router, NavigationEnd, Data } from '@angular/router';
 
 /** rxjs Imports */
 import { filter, takeUntil } from 'rxjs/operators';
@@ -243,6 +243,9 @@ export class BreadcrumbComponent implements AfterViewInit, OnDestroy {
   }
 
   printableValue(value: string): string {
+    if (!value) {
+      return '';
+    }
     if (value.length <= 30) {
       return value;
     }

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

@@ -15,22 +15,33 @@ import { Observable } from 'rxjs';
 
 /** Custom Services */
 import { LoansService } from '../loans.service';
+import { LoanProductService } from 'app/products/loan-products/services/loan-product.service';
+import { LOAN_PRODUCT_TYPE } from 'app/products/loan-products/models/loan-product.model';
 
 /**
  * Clients data resolver.
  */
 @Injectable()
 export class LoanDetailsResolver {
   private loansService = inject(LoansService);
+  private loanProductService = inject(LoanProductService);
 
   /**
    * Returns the Loans with Association data.
    * @returns {Observable<any>}
    */
   resolve(route: ActivatedRouteSnapshot): Observable<any> {
     const loanId = route.paramMap.get('loanId') || route.parent.paramMap.get('loanId');
+    const productType = route.queryParams['productType'];
+    const resolvedProductType =
+      productType === LOAN_PRODUCT_TYPE.WORKING_CAPITAL ? LOAN_PRODUCT_TYPE.WORKING_CAPITAL : LOAN_PRODUCT_TYPE.LOAN;
+    this.loanProductService.initialize(resolvedProductType);
     if (!isNaN(+loanId)) {
-      return this.loansService.getLoanAccountAssociationDetails(loanId);
+      if (resolvedProductType === LOAN_PRODUCT_TYPE.LOAN) {
+        return this.loansService.getLoanAccountAssociationDetails(loanId);
+      } else {
+        return this.loansService.getWorkingCapitalLoannDetails(loanId);
+      }
     }
   }
 }

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

@@ -0,0 +1,33 @@
+/**
+ * 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/.
+ */
+
+/** Angular Imports */
+import { Injectable, inject } from '@angular/core';
+import { ActivatedRouteSnapshot } from '@angular/router';
+
+/** rxjs Imports */
+import { Observable } from 'rxjs';
+
+/** Custom Services */
+import { ProductsService } from 'app/products/products.service';
+
+/**
+ * Loan Product list data resolver.
+ */
+@Injectable()
+export class LoanProductsResolver {
+  private productsService = inject(ProductsService);
+
+  /**
+   * Returns the loan account template data.
+   * @returns {Observable<any>}
+   */
+  resolve(route: ActivatedRouteSnapshot): Observable<any> {
+    return this.productsService.getLoanProductsBasicDetails();
+  }
+}