| {{ row.label }} |
- {{ row.targetPct | number: '1.0-0' }}% |
+ {{ row.targetPct | number: '1.0-1' }}% |
{{ row.actualPct | number: '1.1-1' }}% |
{{ row.variancePct > 0 ? '+' : '' }}{{ row.variancePct | number: '1.1-1' }} pp
diff --git a/src/app/loan-origination/loan-pipeline/loan-pipeline.component.ts b/src/app/loan-origination/loan-pipeline/loan-pipeline.component.ts
index 382d07888..a4f0be20d 100644
--- a/src/app/loan-origination/loan-pipeline/loan-pipeline.component.ts
+++ b/src/app/loan-origination/loan-pipeline/loan-pipeline.component.ts
@@ -71,6 +71,9 @@ interface MixTargetRow {
actualPct: number;
variancePct: number;
status: TargetStatus;
+ /** True only for the two rows whose target is an actual RBI PSL sub-target (Agriculture 18% /
+ * Micro Enterprises 7.5% of ANBC) rather than an internal business-plan assumption. */
+ isRbiMandated: boolean;
}
type ViewId = 'pipeline' | 'new' | 'channel' | 'bc' | 'share' | 'target';
@@ -389,7 +392,8 @@ export class LoanPipelineComponent implements OnInit {
targetPct,
actualPct,
variancePct: actualPct - targetPct,
- status: targetStatus(actualPct, targetPct, 3)
+ status: targetStatus(actualPct, targetPct, 3),
+ isRbiMandated: p.code === 'KCC' || p.code === 'CC'
};
});
}
@@ -413,7 +417,8 @@ export class LoanPipelineComponent implements OnInit {
targetPct,
actualPct,
variancePct: actualPct - targetPct,
- status: targetStatus(actualPct, targetPct, 3)
+ status: targetStatus(actualPct, targetPct, 3),
+ isRbiMandated: false
};
});
}
@@ -626,6 +631,7 @@ export class LoanPipelineComponent implements OnInit {
subtitle,
headers: [
'Mix',
+ 'Target Basis',
'Target %',
'Actual %',
'Variance (pp)',
@@ -633,6 +639,7 @@ export class LoanPipelineComponent implements OnInit {
],
widths: [
26,
+ 18,
12,
12,
14,
@@ -641,6 +648,7 @@ export class LoanPipelineComponent implements OnInit {
rows: [
...this.productTargetRows.map((r) => [
`Product — ${r.label}`,
+ r.isRbiMandated ? 'RBI PSL Sub-Target' : 'Internal Target',
r.targetPct,
Number(r.actualPct.toFixed(1)),
Number(r.variancePct.toFixed(1)),
@@ -648,6 +656,7 @@ export class LoanPipelineComponent implements OnInit {
]),
...this.channelTargetRows.map((r) => [
`Channel — ${r.label}`,
+ 'Internal Target',
r.targetPct,
Number(r.actualPct.toFixed(1)),
Number(r.variancePct.toFixed(1)),
diff --git a/src/app/npa/npa-reports/npa-reports.component.html b/src/app/npa/npa-reports/npa-reports.component.html
index 98aaee3e4..e0303b092 100644
--- a/src/app/npa/npa-reports/npa-reports.component.html
+++ b/src/app/npa/npa-reports/npa-reports.component.html
@@ -264,16 +264,22 @@
Record a Recovery Against an NPA Account
+
-
- NPA Recovery Register — ₹{{ totalRecoveredAmount | number: '1.0-0' }} recovered against ₹{{
- gnpaAmount | number: '1.0-0'
- }}
- GNPA outstanding
+
+
+ NPA Recovery Register — ₹{{ totalRecoveredAmount | number: '1.0-0' }} recovered against ₹{{
+ gnpaAmount | number: '1.0-0'
+ }}
+ GNPA outstanding
+
+ @if (recoveryProductFilter) {
+ Filtered: {{ recoveryProductFilter }}
+ }
+
+ Target Recovery is the account's contractual due this month (EMI / interest-servicing / bullet amount) — same
+ basis as the Recovery Management Dashboard.
+
| Date |
+ Account Type |
+ NPA Category |
Account No |
Customer |
Branch |
Mode |
- Recovered Amount |
+ Target Recovery |
+ Recovered Amount (Actual) |
@for (r of paged(recoveryRows); track r.accountNo + r.date + r.amount) {
| {{ r.date }} |
+ {{ r.productName }} |
+
+ {{ r.npaCategory }}
+ |
{{ r.accountNo }}
|
{{ r.customerName }} |
{{ r.branchName }} |
{{ r.mode }} |
+ ₹{{ r.targetRecovery | number: '1.0-0' }} |
₹{{ r.amount | number: '1.0-0' }} |
} @empty {
- | No recoveries recorded yet. |
+ No recoveries recorded yet. |
}
- | Total Recovered |
- ₹{{ totalRecoveredAmount | number: '1.0-0' }} |
+ Total (Target once per account · Actual across all entries shown) |
+ ₹{{ recoveryTargetTotal | number: '1.0-0' }} |
+ ₹{{ recoveryActualTotal | number: '1.0-0' }} |
diff --git a/src/app/npa/npa-reports/npa-reports.component.ts b/src/app/npa/npa-reports/npa-reports.component.ts
index 6bf33e1f5..85345cf52 100644
--- a/src/app/npa/npa-reports/npa-reports.component.ts
+++ b/src/app/npa/npa-reports/npa-reports.component.ts
@@ -14,6 +14,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { Subscription } from 'rxjs';
import { AuthenticationService } from '../../core/authentication/authentication.service';
import { ExportSheetSpec, exportWorkbook } from '../../cashier/cashier-export';
+import { SearchSelectComponent, SearchSelectOption } from '../search-select/search-select.component';
import {
LOAN_ACCOUNTS,
BRANCHES,
@@ -79,9 +80,16 @@ interface RecoveryRow {
accountNo: string;
customerName: string;
branchName: string;
+ productName: string;
+ npaCategory: string;
+ npaCategoryClass: string;
date: string;
amount: number;
mode: string;
+ /** What the account was contractually due to pay this month (EMI / interest-servicing /
+ * bullet), the same "Target" basis used by the Recovery Management Dashboard — shown
+ * alongside the actual recovered amount so a desk can see over/under-achievement per entry. */
+ targetRecovery: number;
}
interface RepaymentTypeSummaryRow {
@@ -119,7 +127,8 @@ interface AgeingBucketRow {
CommonModule,
FormsModule,
RouterModule,
- FontAwesomeModule
+ FontAwesomeModule,
+ SearchSelectComponent
]
})
export class NpaReportsComponent implements OnInit, OnDestroy {
@@ -457,25 +466,75 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
return this.npaAccounts.filter((a) => a.recoveries.length > 0);
}
+ /** '' = All Account Types. One shared filter drives both the "NPA Account" picker above (so
+ * it's quicker to find the right account when adding a new entry) and the Recovery Register
+ * below — a single control instead of two that could drift out of sync. */
+ recoveryProductFilter = '';
+
+ get recoveryProductOptions(): string[] {
+ return [...new Set(this.npaAccounts.map((a) => a.productName))].sort();
+ }
+
+ setRecoveryProductFilter(productName: string): void {
+ this.recoveryProductFilter = productName;
+ this.currentPage = 1;
+ if (!this.recoveryOptions.some((a) => a.accountNo === this.newRecovery.accountNo)) {
+ this.newRecovery.accountNo = '';
+ }
+ }
+
+ /** NPA accounts selectable in "Record a Recovery", narrowed by the Account Type filter. */
get recoveryOptions(): LoanAccount[] {
- return this.npaAccounts;
+ return this.npaAccounts.filter((a) => !this.recoveryProductFilter || a.productName === this.recoveryProductFilter);
+ }
+
+ /** recoveryOptions, reshaped for the searchable NPA Account picker — matches on account no,
+ * customer name and branch, not just the collapsed label text. */
+ get recoveryAccountSearchOptions(): SearchSelectOption[] {
+ return this.recoveryOptions.map((a) => ({
+ value: a.accountNo,
+ label: `${a.accountNo} — ${a.customerName} (${this.stageLabel(this.stage(a))})`,
+ searchText: `${a.accountNo} ${a.customerName} ${a.productName} ${a.branchName}`
+ }));
}
get recoveryRows(): RecoveryRow[] {
return this.recoveryAccounts
+ .filter((a) => !this.recoveryProductFilter || a.productName === this.recoveryProductFilter)
.flatMap((a) =>
a.recoveries.map((r) => ({
accountNo: a.accountNo,
customerName: a.customerName,
branchName: a.branchName,
+ productName: a.productName,
+ npaCategory: this.stageLabel(this.stage(a)),
+ npaCategoryClass: this.badgeClass(this.stage(a)),
date: r.date,
amount: r.amount,
- mode: r.mode
+ mode: r.mode,
+ targetRecovery: expectedRecoveryThisMonth(a)
}))
)
.sort((a, b) => b.amount - a.amount);
}
+ /** The accounts behind recoveryRows, honouring the Account Type filter — used to total the
+ * monthly Target once per account rather than once per recovery transaction (an account with
+ * two recovery entries must not have its target counted twice). */
+ get recoveryFilteredAccounts(): LoanAccount[] {
+ return this.recoveryAccounts.filter(
+ (a) => !this.recoveryProductFilter || a.productName === this.recoveryProductFilter
+ );
+ }
+
+ get recoveryTargetTotal(): number {
+ return this.recoveryFilteredAccounts.reduce((s, a) => s + expectedRecoveryThisMonth(a), 0);
+ }
+
+ get recoveryActualTotal(): number {
+ return this.recoveryRows.reduce((s, r) => s + r.amount, 0);
+ }
+
// -------------------- Portfolio-wide KPIs (shown on every screen) --------------------
get totalAdvances(): number {
return this.allAccounts.reduce((s, a) => s + a.outstandingBalance, 0);
@@ -616,8 +675,11 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
}
// -------------------- NPA Summary Report: stage-wise + branch-wise cuts --------------------
+ /** SMA-0/1/2 are early-warning "special mention" buckets, not NPA stages — this report only
+ * shows Standard vs the actual NPA classification ladder (Sub-Standard through Loss). SMA
+ * accounts still have their own dedicated Day-wise Overdue report. */
get stageSummary(): StageSummaryRow[] {
- return STAGE_ORDER.map((stage) => {
+ return STAGE_ORDER.filter((stage) => !isSmaStage(stage)).map((stage) => {
const accts = this.allAccounts.filter((a) => this.stage(a) === stage);
return {
stage,
@@ -649,15 +711,15 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
}
get grandTotalAccounts(): number {
- return this.allAccounts.length;
+ return this.stageSummary.reduce((s, row) => s + row.count, 0);
}
get grandTotalOutstanding(): number {
- return this.allAccounts.reduce((s, a) => s + a.outstandingBalance, 0);
+ return this.stageSummary.reduce((s, row) => s + row.outstanding, 0);
}
get grandTotalProvision(): number {
- return this.allAccounts.reduce((s, a) => s + this.provisionReq(a), 0);
+ return this.stageSummary.reduce((s, row) => s + row.provisionReq, 0);
}
get bankWideTotalAccounts(): number {
@@ -865,39 +927,53 @@ export class NpaReportsComponent implements OnInit, OnDestroy {
{
sheetName: 'NPA Recovery',
title: 'NPA Recovery Register',
- subtitle,
+ subtitle: this.recoveryProductFilter
+ ? `${subtitle} · Account Type: ${this.recoveryProductFilter}`
+ : subtitle,
headers: [
'Date',
+ 'Account Type',
+ 'NPA Category',
'Account No',
'Customer',
'Branch',
'Mode',
- 'Recovered Amount'
+ 'Target Recovery',
+ 'Recovered Amount (Actual)'
],
widths: [
12,
+ 18,
+ 14,
16,
22,
16,
18,
- 18
+ 16,
+ 20
],
rows: [
...this.recoveryRows.map((r) => [
r.date,
+ r.productName,
+ r.npaCategory,
r.accountNo,
r.customerName,
r.branchName,
r.mode,
+ r.targetRecovery,
r.amount
]),
[
- 'Total Recovered',
+ 'Total (Target once per account · Actual across all entries)',
'',
'',
'',
'',
- this.totalRecoveredAmount
+ '',
+ '',
+ this.recoveryTargetTotal,
+ this.recoveryActualTotal
]
]
}
diff --git a/src/app/npa/search-select/search-select.component.ts b/src/app/npa/search-select/search-select.component.ts
new file mode 100644
index 000000000..a79d2c266
--- /dev/null
+++ b/src/app/npa/search-select/search-select.component.ts
@@ -0,0 +1,237 @@
+/**
+ * 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, ElementRef, forwardRef, HostListener, Input, ViewChild } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
+
+export interface SearchSelectOption {
+ value: string;
+ label: string;
+ /** What typed text is matched against — defaults to `label` when omitted, but a caller can
+ * pass a richer string (e.g. account no + customer name + branch) so a search hits fields
+ * that aren't all visible in the collapsed label. */
+ searchText?: string;
+}
+
+/**
+ * Drop-in replacement for a plain ` |