From d61584f291dd89c31b3bbf91288f9e0593935ba5 Mon Sep 17 00:00:00 2001 From: Sonali Likhitkar Date: Thu, 8 Oct 2026 17:22:59 +0530 Subject: [PATCH 1/3] feat(loan-products): wire GL mapping, checker diff view, and approval flow for loan interest rate register - Add GL account picker (gl-picker.component.ts) for mapping each product row to a GL account - Extract shared diff logic into rate-register-diff.util.ts + loan-rate-register-diff.util.ts - Add rate-register-diff component to render before/after changes for checker approval - Rewire checker-inbox and view-checker-inbox to show loan interest rate register diffs - Refactor rate-register.service.ts (mock-to-real HTTP wiring, GL-aware payload mapping) - Simplify preview-register component, moving diff rendering into the shared diff component - Add glAccountId field to RateChartRow model Co-Authored-By: Claude Sonnet 5 --- .../cibil-adjustment.component.ts | 7 +- .../edit-register.component.html | 48 +- .../edit-register.component.scss | 73 ++ .../edit-register/edit-register.component.ts | 96 ++- .../gl-picker/gl-picker.component.ts | 135 +++ ...loan-interest-rate-register.component.html | 8 +- ...loan-interest-rate-register.component.scss | 16 + .../loan-interest-rate-register.component.ts | 15 +- .../models/rate-register.model.ts | 8 + .../preview-register.component.html | 122 +-- .../preview-register.component.scss | 177 ---- .../preview-register.component.ts | 133 +-- .../rate-register-diff.util.ts | 48 ++ .../rate-register-diff.component.html | 118 +++ .../rate-register-diff.component.scss | 206 +++++ .../rate-register-diff.component.ts | 121 +++ .../rate-register.service.ts | 766 +++++++----------- src/app/products/products.service.ts | 22 + .../checker-inbox/checker-inbox.component.ts | 5 +- src/app/tasks/loan-rate-register-diff.util.ts | 169 ++++ .../view-checker-inbox.component.html | 26 +- .../view-checker-inbox.component.scss | 5 + .../view-checker-inbox.component.ts | 91 ++- src/environments/.env.ts | 4 +- 24 files changed, 1510 insertions(+), 909 deletions(-) create mode 100644 src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts create mode 100644 src/app/products/loan-interest-rate-register/rate-register-diff.util.ts create mode 100644 src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html create mode 100644 src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.scss create mode 100644 src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.ts create mode 100644 src/app/tasks/loan-rate-register-diff.util.ts diff --git a/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.ts b/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.ts index 244bca647..701b5667c 100644 --- a/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.ts +++ b/src/app/products/loan-interest-rate-register/cibil-adjustment/cibil-adjustment.component.ts @@ -41,7 +41,12 @@ export class CibilAdjustmentComponent implements OnInit { const idParam = this.route.snapshot.queryParamMap.get('id'); const id = idParam ? Number(idParam) : null; this.service.list().subscribe((all) => { - this.register = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + const found = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + if (!found) { + this.router.navigate(['/products/loan-interest-rate-register']); + return; + } + this.register = found; this.active = this.service.getActive(); }); } diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html index 8db7e5e86..0ec403f4b 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html @@ -55,6 +55,9 @@ {{ rows.length }} products × {{ slabs.length }} amount slabs · click any cell to edit · read-only view + · {{ unmappedCount() }} without GL — map every product's GL before submitting
+
+
Add product
+
+
+ + +
+
+ + +
+ + +
+
{{ addProductError }}
+
@@ -82,6 +101,25 @@ diff --git a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.scss b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.scss index 0756a126f..13cad796d 100644 --- a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.scss +++ b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.scss @@ -424,6 +424,22 @@ } } + &__gl-tag { + display: inline-block; + margin-left: 8px; + font-size: 10px; + font-weight: 600; + color: #475569; + background: #f1f5f9; + border-radius: 999px; + padding: 1px 8px; + + &--unmapped { + color: #92400e; + background: #fef3c7; + } + } + &__history-foot { padding: 10px 20px; border-top: 1px solid #f1f5f9; diff --git a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.ts b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.ts index 2f4265b80..2fc9f859b 100644 --- a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.ts +++ b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.ts @@ -38,9 +38,15 @@ export class LoanInterestRateRegisterComponent implements OnInit { active?: RateRegister; ngOnInit(): void { + // Load the GL list once so mapped particulars show a readable label instead of "GL #id". + this.service.getGlOptions().subscribe(); this.reload(); } + glLabel(id: number | null | undefined): string | null { + return this.service.glLabel(id); + } + private reload(): void { this.service.list().subscribe((rows) => { this.registers = rows; @@ -168,10 +174,11 @@ export class LoanInterestRateRegisterComponent implements OnInit { /** Scaffold the very first version — used only when the register has no versions at all. */ createFirstVersion(): void { - const draft = this.service.createFirstVersion(); - this.snack.open('Blank draft created — fill in rates and submit for approval', 'OK', { duration: 3000 }); - this.reload(); - this.edit(draft); + this.service.createFirstVersion().subscribe((draft) => { + this.snack.open('Draft created — fill in rates and submit for approval', 'OK', { duration: 3000 }); + this.reload(); + this.edit(draft); + }); } /** Open the Compare screen for a pending register (checker view). */ diff --git a/src/app/products/loan-interest-rate-register/models/rate-register.model.ts b/src/app/products/loan-interest-rate-register/models/rate-register.model.ts index 943cc6029..8f25e359f 100644 --- a/src/app/products/loan-interest-rate-register/models/rate-register.model.ts +++ b/src/app/products/loan-interest-rate-register/models/rate-register.model.ts @@ -21,9 +21,17 @@ export interface RateChartRow { srNo: number; particulars: string; isFormula?: boolean; + /** GL account this particular is mapped to. null/undefined = "GL not mapped". */ + glAccountId?: number | null; rates: RateCell[]; } +/** One selectable GL account for the particular-to-GL mapping. */ +export interface GlOption { + id: number; + label: string; +} + export type RiskTier = 'V. Poor' | 'Poor' | 'Fair' | 'Good' | 'Excellent'; export interface CibilSlab { diff --git a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.html b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.html index a7262b2a9..8f258ebdf 100644 --- a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.html +++ b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.html @@ -48,121 +48,23 @@ - -
-
-
-
Rate chart — inline diff
-
Changed cells highlighted · unchanged cells show single value
-
- - Show only changed rows - -
- -
- -
No changes detected
-
- Draft is identical to the current Active register. Edit the Draft first to see diffs here. -
-
- -
-
{{ row.srNo }}{{ row.particulars }} +
+ {{ row.glAccountId == null ? 'GL not mapped' : glLabel(row) }} +
+ 		{{ canEdit ? 'Cancel' : 'Back to list' }}
Rates in % p.a. · N.A. = slab not offered · formulas resolved at sanction
- - +
diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss index 78c8ccc5b..476337e6e 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss @@ -70,6 +70,79 @@ } } + &__gl { + margin: 3px 0 0 30px; + } + + &__gl-tag { + display: inline-block; + font-size: 10px; + font-weight: 600; + color: #475569; + background: #f1f5f9; + border-radius: 999px; + padding: 1px 8px; + white-space: nowrap; + + &--unmapped { + color: #92400e; + background: #fef3c7; + } + + &--editable { + cursor: pointer; + + &:hover { + outline: 1px solid #94a3b8; + } + } + } + + &__gl-select { + display: block; + margin: 4px 0 0 30px; + max-width: 340px; + } + + &__gl-warn { + color: #b45309; + font-weight: 600; + } + + &__add-panel { + padding: 14px 18px; + border-bottom: 1px solid #f1f5f9; + background: #f8fafc; + } + + &__add-title { + font-size: 13px; + font-weight: 600; + color: #0f172a; + margin-bottom: 10px; + } + + &__add-fields { + display: flex; + align-items: flex-end; + gap: 12px; + flex-wrap: wrap; + + .er__field { + min-width: 240px; + } + + .er__field--gl { + min-width: 320px; + } + } + + &__add-error { + margin-top: 8px; + font-size: 12px; + color: #b91c1c; + } + &__readonly-banner { display: flex; align-items: center; diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts index 329cdd8f7..95472abde 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts @@ -6,7 +6,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core'; +import { Component, ElementRef, OnDestroy, OnInit, ViewChild, inject } from '@angular/core'; +import { MatSnackBar } from '@angular/material/snack-bar'; import { CommonModule } from '@angular/common'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { FormsModule } from '@angular/forms'; @@ -18,7 +19,8 @@ import { MatIconModule } from '@angular/material/icon'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatNativeDateModule } from '@angular/material/core'; import { RateRegisterService } from '../rate-register.service'; -import { RateCell, RateChartRow, RateRegister, SlabColumn } from '../models/rate-register.model'; +import { GlOption, RateCell, RateChartRow, RateRegister, SlabColumn } from '../models/rate-register.model'; +import { GlPickerComponent } from '../gl-picker/gl-picker.component'; /** * Grid editor for one Loan Interest Rate Register — Excel-shaped: 34 products as rows and 10 @@ -39,10 +41,13 @@ import { RateCell, RateChartRow, RateRegister, SlabColumn } from '../models/rate MatSelectModule, MatIconModule, MatDatepickerModule, - MatNativeDateModule + MatNativeDateModule, + GlPickerComponent ] }) -export class EditRegisterComponent implements OnInit { +export class EditRegisterComponent implements OnInit, OnDestroy { + private readonly snack = inject(MatSnackBar); + private readonly service = inject(RateRegisterService); private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); @@ -58,11 +63,42 @@ export class EditRegisterComponent implements OnInit { @ViewChild('cellInput') cellInput?: ElementRef; + /** Leaving the page keeps the draft: edits are saved so a reload or a trip to Compare does not lose them. */ + ngOnDestroy(): void { + if (this.canEdit) { + this.service.saveDrafts(); + } + } + + saveDraft(): void { + this.service.saveDrafts(); + this.snack.open('Draft saved', 'OK', { duration: 2000 }); + } + + /** Posting GL accounts for the particular → GL mapping. */ + glOptions: GlOption[] = []; + + /** "Add product" panel state. A new product needs a name and a GL before it can be added. */ + addingProduct = false; + newProductName = ''; + newProductGl: number | null = null; + addProductError = ''; + + /** Index of the row whose GL is being changed inline, or null. */ + glEditRow: number | null = null; + ngOnInit(): void { + this.service.getGlOptions().subscribe((options) => (this.glOptions = options)); const idParam = this.route.snapshot.queryParamMap.get('id'); const id = idParam ? Number(idParam) : null; this.service.list().subscribe((all) => { - this.register = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + const found = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + if (!found) { + // e.g. a reload on an unsaved local draft: nothing to edit, go back to the list. + this.router.navigate(['/products/loan-interest-rate-register']); + return; + } + this.register = found; this.active = this.service.getActive(); this.slabs = this.register.slabs; this.rows = this.register.rows; @@ -173,22 +209,66 @@ export class EditRegisterComponent implements OnInit { this.editing = null; } - /** Append a new empty product row at the bottom of the grid. */ + glLabel(row: RateChartRow): string | null { + return this.service.glLabel(row.glAccountId); + } + + unmappedCount(): number { + return this.rows.filter((r) => r.glAccountId == null).length; + } + + /** Submit is blocked until every product has a GL. */ + get canSubmit(): boolean { + return this.unmappedCount() === 0; + } + + /** Opens the Add product panel. */ addProduct(): void { if (!this.canEdit) { return; } - const name = window.prompt('New product name', 'New product'); + this.addingProduct = true; + this.newProductName = ''; + this.newProductGl = null; + this.addProductError = ''; + } + + cancelAddProduct(): void { + this.addingProduct = false; + this.addProductError = ''; + } + + /** Append the new product row at the bottom of the grid. Name and GL are both mandatory. */ + confirmAddProduct(): void { + const name = this.newProductName.trim(); if (!name) { + this.addProductError = 'Enter the product name.'; + return; + } + if (this.rows.some((r) => r.particulars.trim().toLowerCase() === name.toLowerCase())) { + this.addProductError = 'A product with this name already exists.'; + return; + } + if (this.newProductGl == null) { + this.addProductError = 'Select the GL account for this product.'; return; } const next = this.rows.length > 0 ? Math.max(...this.rows.map((r) => r.srNo)) + 1 : 1; this.rows.push({ srNo: next, - particulars: name.trim(), + particulars: name, + glAccountId: this.newProductGl, rates: Array(this.slabs.length).fill(null), isFormula: false }); + this.cancelAddProduct(); + } + + /** Toggle the inline GL selector on an existing row (Draft only). */ + editGl(rowIdx: number): void { + if (this.canEdit) { + this.glEditRow = this.glEditRow === rowIdx ? null : rowIdx; + } } /** Append a new amount slab column; every existing row grows by one blank cell. */ diff --git a/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts b/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts new file mode 100644 index 000000000..c58959fb2 --- /dev/null +++ b/src/app/products/loan-interest-rate-register/gl-picker/gl-picker.component.ts @@ -0,0 +1,135 @@ +/** + * 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 { + AfterViewInit, + Component, + EventEmitter, + Input, + OnChanges, + OnDestroy, + OnInit, + Output, + SimpleChanges, + ViewChild +} from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { ReactiveFormsModule, UntypedFormControl } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelect, MatSelectModule } from '@angular/material/select'; +import { NgxMatSelectSearchModule } from 'ngx-mat-select-search'; +import { Subject, takeUntil } from 'rxjs'; +import { GlOption } from '../models/rate-register.model'; + +/** + * Compact searchable GL account dropdown. Typing in the search box filters by GL code or name. + * Emits the chosen GL id; with allowClear a "GL not mapped" entry emits null. + */ +@Component({ + selector: 'mifosx-gl-picker', + imports: [ + CommonModule, + ReactiveFormsModule, + MatFormFieldModule, + MatSelectModule, + NgxMatSelectSearchModule + ], + template: ` + + + + + + GL not mapped + {{ o.label }} + + + `, + styles: [ + ` + .gl-picker { + width: 100%; + min-width: 260px; + font-size: 12px; + } + ` + ] +}) +export class GlPickerComponent implements OnInit, OnChanges, AfterViewInit, OnDestroy { + @Input() options: GlOption[] = []; + @Input() value: number | null = null; + @Input() placeholder = 'Select GL account'; + @Input() allowClear = false; + /** Open the dropdown as soon as it is rendered (used for inline row editing). */ + @Input() openOnInit = false; + + @Output() valueChange = new EventEmitter(); + /** Fired when the dropdown panel closes, whether or not a value was picked. */ + @Output() closed = new EventEmitter(); + + @ViewChild(MatSelect) private select?: MatSelect; + + filterCtrl = new UntypedFormControl(''); + filtered: GlOption[] = []; + + private readonly destroy$ = new Subject(); + + ngOnInit(): void { + this.filterCtrl.valueChanges.pipe(takeUntil(this.destroy$)).subscribe(() => this.applyFilter()); + } + + ngOnChanges(changes: SimpleChanges): void { + if (changes['options'] || changes['value']) { + this.applyFilter(); + } + } + + ngAfterViewInit(): void { + if (this.openOnInit) { + setTimeout(() => this.select?.open()); + } + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } + + onOpenedChange(opened: boolean): void { + if (opened) { + this.filterCtrl.setValue(''); + } else { + this.closed.emit(); + } + } + + /** Filter by code or name; the currently selected option always stays in the list so its label shows. */ + private applyFilter(): void { + const q = ((this.filterCtrl.value as string) ?? '').trim().toLowerCase(); + const all = this.options ?? []; + if (!q) { + this.filtered = all.slice(); + return; + } + const matches = all.filter((o) => o.label.toLowerCase().includes(q)); + const selected = all.find((o) => o.id === this.value); + this.filtered = selected && !matches.includes(selected) ? [ + selected, + ...matches + ] : matches; + } +} diff --git a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html index ab378875c..dd57f3b14 100644 --- a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html +++ b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html @@ -54,9 +54,8 @@
No rate register versions yet
- Create the first version to publish rates for all loan products. The template comes pre-filled from the bank's - approved Excel chart (34 products × 10 amount slabs + 5 CIBIL bands) — you can edit everything before - submitting for approval. + Create the first version to publish rates for all loan products. It starts with the standard loan types (rates + blank) and 5 CIBIL bands — fill in the rates, add any bank-specific products, and submit for approval.
{{ row.srNo }}{{ row.particulars }} + {{ + row.glAccountId == null ? 'GL not mapped' : glLabel(row.glAccountId) + }} {{ display(cell) }}
- - - - - - - - - - - - -
Particulars{{ s.label }}
- {{ row.srNo }}{{ row.particulars }} - - - {{ display(baselineCell(row.srNo, j)) }} - → - {{ display(draftCell(row.srNo, j)) }} - - {{ display(draftCell(row.srNo, j)) }} -
-
- - - -
-
-
-
CIBIL slabs — inline diff
-
Changed fields shown as OLD → NEW · unchanged fields render once
-
-
- - - - - - - - - - - - - - - - - - - -
#Score fromScore toTierAdjustment
{{ i + 1 }} - - {{ baselineCibil[i]?.from ?? '—' }} - → - {{ slab.from }} - - {{ slab.from }} - - - {{ baselineCibil[i]?.to ?? '—' }} - → - {{ slab.to }} - - {{ slab.to }} - - - {{ baselineCibil[i]?.tier ?? '—' }} - → - {{ slab.tier }} - - {{ slab.tier }} - - - {{ formatPct(baselineCibil[i]?.adjustmentPct ?? 0) }} - → - {{ formatPct(slab.adjustmentPct) }} - - {{ formatPct(slab.adjustmentPct) }} -
-
+
Submission will create a maker-checker request · the register becomes effective only after a checker approves it.
+
+ {{ unmappedCount() }} product(s) have no GL account. Go back to edit and map a GL for every product before + submitting. +
Review-only — this version has already been submitted ({{ draft.status }}).
@@ -172,7 +74,7 @@ color="primary" class="pr__submit" (click)="submit()" - [disabled]="submitting || changedCellCount() + changedCibilCount() === 0" + [disabled]="submitting || unmappedCount() > 0 || changedCellCount() + changedCibilCount() === 0" > {{ submitting ? 'Submitting…' : 'Submit for approval' }} diff --git a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.scss b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.scss index 9cec3e421..70d019be0 100644 --- a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.scss +++ b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.scss @@ -159,183 +159,6 @@ font-weight: 700; } - // ---- Card wrapper ----------------------------------------------------- - - &__card { - background: white; - border: 1px solid #e2e8f0; - border-radius: 12px; - overflow: hidden; - } - - &__card-head { - display: flex; - align-items: flex-start; - justify-content: space-between; - gap: 12px; - padding: 16px 20px; - border-bottom: 1px solid #f1f5f9; - } - - &__card-title { - font-size: 15px; - font-weight: 600; - color: #0f172a; - } - - &__card-sub { - margin-top: 2px; - font-size: 12px; - color: #64748b; - } - - &__toggle { - font-size: 12px; - font-weight: 500; - } - - // ---- Empty state (no changes) ----------------------------------------- - - &__empty { - display: flex; - flex-direction: column; - align-items: center; - gap: 8px; - padding: 48px 20px; - color: #64748b; - - i { - font-size: 28px; - color: #94a3b8; - } - } - - &__empty-title { - font-size: 15px; - font-weight: 600; - color: #0f172a; - } - - &__empty-sub { - font-size: 12px; - text-align: center; - max-width: 420px; - } - - // ---- Scrollable rate chart -------------------------------------------- - - &__scroll { - overflow: auto; - max-height: 520px; - } - - &__grid { - width: 100%; - border-collapse: collapse; - font-size: 12px; - - thead th { - position: sticky; - top: 0; - background: #f8fafc; - color: #64748b; - font-size: 10px; - text-transform: uppercase; - font-weight: 600; - letter-spacing: 0.3px; - padding: 10px; - text-align: right; - border-bottom: 1px solid #e2e8f0; - white-space: nowrap; - } - - thead th.pr__col-particulars { - text-align: left; - } - - tbody td { - padding: 8px 10px; - border-bottom: 1px solid #f1f5f9; - text-align: right; - font-variant-numeric: tabular-nums; - color: #0f172a; - white-space: nowrap; - } - - tbody td.pr__col-particulars { - text-align: left; - font-weight: 500; - max-width: 240px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - } - - &__srno { - display: inline-block; - min-width: 24px; - color: #94a3b8; - font-weight: 600; - margin-right: 6px; - } - - // ---- Row & cell highlights -------------------------------------------- - - &__row--changed { - background: #fffbeb; - } - - &__cell-changed { - background: #fef3c7 !important; - font-weight: 700; - } - - &__old { - color: #991b1b; - font-weight: 500; - text-decoration: line-through; - text-decoration-color: #dc2626; - text-decoration-thickness: 1px; - } - - &__arrow { - color: #94a3b8; - margin: 0 4px; - font-weight: 700; - } - - &__new { - color: #065f46; - font-weight: 700; - } - - // ---- CIBIL inline-diff table ------------------------------------------ - - &__cibil { - width: 100%; - border-collapse: collapse; - font-size: 12px; - - thead th { - background: #f8fafc; - color: #64748b; - font-size: 10px; - text-transform: uppercase; - font-weight: 600; - letter-spacing: 0.3px; - padding: 10px 14px; - text-align: left; - border-bottom: 1px solid #e2e8f0; - } - - tbody td { - padding: 10px 14px; - border-bottom: 1px solid #f1f5f9; - color: #0f172a; - } - } - // ---- Footer ----------------------------------------------------------- &__footer { diff --git a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts index 267aad786..6614572f5 100644 --- a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts +++ b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts @@ -8,13 +8,13 @@ import { Component, OnInit, inject } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { MatButtonModule } from '@angular/material/button'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatSnackBar } from '@angular/material/snack-bar'; import { RateRegisterService } from '../rate-register.service'; -import { CibilSlab, RateCell, RateRegister, SlabColumn } from '../models/rate-register.model'; +import { CibilSlab, RateChartRow, RateRegister, SlabColumn } from '../models/rate-register.model'; +import { RateRegisterDiffComponent } from '../rate-register-diff/rate-register-diff.component'; +import { countChangedCells, countChangedCibil } from '../rate-register-diff.util'; /** * Inline-diff Compare screen for a Loan Interest Rate Register draft. @@ -32,9 +32,8 @@ import { CibilSlab, RateCell, RateRegister, SlabColumn } from '../models/rate-re styleUrls: ['./preview-register.component.scss'], imports: [ CommonModule, - FormsModule, MatButtonModule, - MatSlideToggleModule + RateRegisterDiffComponent ] }) export class PreviewRegisterComponent implements OnInit { @@ -47,25 +46,33 @@ export class PreviewRegisterComponent implements OnInit { active?: RateRegister; slabs: SlabColumn[] = []; - draftRows: { srNo: number; particulars: string; rates: RateCell[] }[] = []; - baselineRows: { srNo: number; particulars: string; rates: RateCell[] }[] = []; + draftRows: RateChartRow[] = []; + baselineRows: RateChartRow[] = []; draftCibil: CibilSlab[] = []; baselineCibil: CibilSlab[] = []; submitting = false; - /** User toggle to collapse the chart to only the rows that changed. */ - showOnlyChanged = true; /** Submit button is live only for a Draft. A Pending Approval or Active register is review-only here. */ get canSubmit(): boolean { return this.draft?.status === 'Draft'; } + /** Products still without a GL; the backend rejects the save while any remain. */ + unmappedCount(): number { + return this.draftRows.filter((r) => r.glAccountId == null).length; + } + ngOnInit(): void { const idParam = this.route.snapshot.queryParamMap.get('id'); const id = idParam ? Number(idParam) : null; this.service.list().subscribe((all) => { - this.draft = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + const found = (id ? all.find((r) => r.id === id) : undefined) ?? this.service.getActiveOrFirstDraft(); + if (!found) { + this.router.navigate(['/products/loan-interest-rate-register']); + return; + } + this.draft = found; this.active = this.service.getActive(); this.slabs = this.draft.slabs; this.draftRows = this.draft.rows; @@ -78,97 +85,12 @@ export class PreviewRegisterComponent implements OnInit { }); } - display(cell: RateCell): string { - if (cell === null) { - return 'N.A.'; - } - if (typeof cell === 'string') { - return cell; - } - return cell.toFixed(2); - } - - /** The baseline (OLD) value of a cell — null if the row did not exist in the baseline. */ - baselineCell(srNo: number, colIdx: number): RateCell { - return this.baselineRows.find((r) => r.srNo === srNo)?.rates[colIdx] ?? null; - } - - /** The draft (NEW) value of a cell. */ - draftCell(srNo: number, colIdx: number): RateCell { - return this.draftRows.find((r) => r.srNo === srNo)?.rates[colIdx] ?? null; - } - - /** True when the same {product, amount-slab} cell differs between baseline and draft. */ - cellChanged(srNo: number, colIdx: number): boolean { - return !this.sameCell(this.baselineCell(srNo, colIdx), this.draftCell(srNo, colIdx)); - } - - /** True when a product row has at least one changed cell — used by the "show only changed" filter. */ - rowHasChanges(srNo: number): boolean { - for (let j = 0; j < this.slabs.length; j++) { - if (this.cellChanged(srNo, j)) { - return true; - } - } - return false; - } - - /** Rows the chart should actually render — all rows, or only the ones with any diff. */ - get visibleRows(): { srNo: number; particulars: string; rates: RateCell[] }[] { - if (!this.showOnlyChanged || this.changedCellCount() === 0) { - return this.draftRows; - } - return this.draftRows.filter((r) => this.rowHasChanges(r.srNo)); - } - - cibilChanged(index: number): boolean { - const a = this.baselineCibil[index]; - const d = this.draftCibil[index]; - if (!a || !d) { - return true; - } - return a.from !== d.from || a.to !== d.to || a.tier !== d.tier || a.adjustmentPct !== d.adjustmentPct; - } - - /** Which CIBIL field(s) differ between baseline and draft — drives per-field highlight. */ - cibilFieldChanged(index: number, field: 'from' | 'to' | 'tier' | 'adjustmentPct'): boolean { - const a = this.baselineCibil[index]; - const d = this.draftCibil[index]; - if (!a || !d) { - return true; - } - return a[field] !== d[field]; - } - changedCellCount(): number { - let n = 0; - for (const row of this.draftRows) { - for (let j = 0; j < this.slabs.length; j++) { - if (this.cellChanged(row.srNo, j)) { - n++; - } - } - } - return n; + return countChangedCells(this.draftRows, this.baselineRows, this.slabs.length); } changedCibilCount(): number { - let n = 0; - const max = Math.max(this.draftCibil.length, this.baselineCibil.length); - for (let i = 0; i < max; i++) { - if (this.cibilChanged(i)) { - n++; - } - } - return n; - } - - formatPct(pct: number): string { - if (pct === 0) { - return '0.00%'; - } - const sign = pct > 0 ? '+' : '−'; - return `${sign}${Math.abs(pct).toFixed(2)}%`; + return countChangedCibil(this.draftCibil, this.baselineCibil); } /** Opens the mock backend call. `rollbackTransaction:true` → row sits in checker inbox. */ @@ -189,7 +111,12 @@ export class PreviewRegisterComponent implements OnInit { // we still unlock the UI so the user can retry instead of staring at a spinner forever. this.submitting = false; console.error('[PreviewRegister] submit failed', err); - this.snack.open('Submit failed — check backend status and try again', 'Dismiss', { duration: 4500 }); + const reason = + err?.error?.errors?.[0]?.defaultUserMessage || + err?.error?.defaultUserMessage || + err?.error?.message || + 'check backend status and try again'; + this.snack.open(`Submit failed — ${reason}`, 'Dismiss', { duration: 8000 }); } }); } @@ -197,14 +124,4 @@ export class PreviewRegisterComponent implements OnInit { backToEdit(): void { this.router.navigate(['/products/loan-interest-rate-register/edit'], { queryParams: { id: this.draft.id } }); } - - private sameCell(a: RateCell, b: RateCell): boolean { - if (a === null && b === null) { - return true; - } - if (typeof a === 'number' && typeof b === 'number') { - return Math.abs(a - b) < 1e-9; - } - return a === b; - } } diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff.util.ts b/src/app/products/loan-interest-rate-register/rate-register-diff.util.ts new file mode 100644 index 000000000..6a8ac8920 --- /dev/null +++ b/src/app/products/loan-interest-rate-register/rate-register-diff.util.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 { CibilSlab, RateCell, RateChartRow } from './models/rate-register.model'; + +/** Two chart cells are the same when both are N.A., both the same formula, or numerically equal. */ +export function sameCell(a: RateCell, b: RateCell): boolean { + if (a === null && b === null) { + return true; + } + if (typeof a === 'number' && typeof b === 'number') { + return Math.abs(a - b) < 1e-9; + } + return a === b; +} + +/** Number of {product, amount-slab} cells whose value differs between the draft and the baseline. */ +export function countChangedCells(draft: RateChartRow[], baseline: RateChartRow[], slabCount: number): number { + let n = 0; + for (const row of draft) { + const base = baseline.find((r) => r.srNo === row.srNo); + for (let j = 0; j < slabCount; j++) { + if (!sameCell(base?.rates[j] ?? null, row.rates[j] ?? null)) { + n++; + } + } + } + return n; +} + +/** Number of CIBIL bands that differ (by position) between the draft and the baseline. */ +export function countChangedCibil(draft: CibilSlab[], baseline: CibilSlab[]): number { + let n = 0; + const max = Math.max(draft.length, baseline.length); + for (let i = 0; i < max; i++) { + const a = baseline[i]; + const d = draft[i]; + if (!a || !d || a.from !== d.from || a.to !== d.to || a.tier !== d.tier || a.adjustmentPct !== d.adjustmentPct) { + n++; + } + } + return n; +} diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html new file mode 100644 index 000000000..7e421085b --- /dev/null +++ b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.html @@ -0,0 +1,118 @@ + + + +
+
+
+
Rate chart — inline diff
+
Changed cells highlighted · unchanged cells show single value
+
+ + Show only changed rows + +
+ +
+ +
No changes detected
+
The proposed version is identical to the current Active register.
+
+ +
+ + + + + + + + + + + + + +
Particulars{{ s.label }}
+ {{ row.srNo }}{{ row.particulars }} +
+ {{ glText(row) }} +
+ 		+ + {{ display(baselineCell(row.srNo, j)) }} + → + {{ display(draftCell(row.srNo, j)) }} + + {{ display(draftCell(row.srNo, j)) }} +
+
+
+ + +
+
+
+
CIBIL slabs — inline diff
+
Changed fields shown as OLD → NEW · unchanged fields render once
+
+
+ + + + + + + + + + + + + + + + + + + +
#Score fromScore toTierAdjustment
{{ i + 1 }} + + {{ baselineCibil[i]?.from ?? '—' }} + → + {{ slab.from }} + + {{ slab.from }} + + + {{ baselineCibil[i]?.to ?? '—' }} + → + {{ slab.to }} + + {{ slab.to }} + + + {{ baselineCibil[i]?.tier ?? '—' }} + → + {{ slab.tier }} + + {{ slab.tier }} + + + {{ formatPct(baselineCibil[i]?.adjustmentPct ?? 0) }} + → + {{ formatPct(slab.adjustmentPct) }} + + {{ formatPct(slab.adjustmentPct) }} +
+
diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.scss b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.scss new file mode 100644 index 000000000..9cb68adaf --- /dev/null +++ b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.scss @@ -0,0 +1,206 @@ +/** + * 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/. + */ + +:host { + display: flex; + flex-direction: column; + gap: 16px; +} + +.rd { + &__card { + background: white; + border: 1px solid #e2e8f0; + border-radius: 12px; + overflow: hidden; + } + + &__card-head { + display: flex; + align-items: flex-start; + justify-content: space-between; + gap: 12px; + padding: 16px 20px; + border-bottom: 1px solid #f1f5f9; + } + + &__card-title { + font-size: 15px; + font-weight: 600; + color: #0f172a; + } + + &__card-sub { + margin-top: 2px; + font-size: 12px; + color: #64748b; + } + + &__toggle { + font-size: 12px; + font-weight: 500; + } + + // ---- Empty state (no changes) ----------------------------------------- + + &__empty { + display: flex; + flex-direction: column; + align-items: center; + gap: 8px; + padding: 48px 20px; + color: #64748b; + + i { + font-size: 28px; + color: #94a3b8; + } + } + + &__empty-title { + font-size: 15px; + font-weight: 600; + color: #0f172a; + } + + &__empty-sub { + font-size: 12px; + text-align: center; + max-width: 420px; + } + + // ---- Scrollable rate chart -------------------------------------------- + + &__scroll { + overflow: auto; + max-height: 520px; + } + + &__grid { + width: 100%; + border-collapse: collapse; + font-size: 12px; + + thead th { + position: sticky; + top: 0; + background: #f8fafc; + color: #64748b; + font-size: 10px; + text-transform: uppercase; + font-weight: 600; + letter-spacing: 0.3px; + padding: 10px; + text-align: right; + border-bottom: 1px solid #e2e8f0; + white-space: nowrap; + } + + thead th.rd__col-particulars { + text-align: left; + } + + tbody td { + padding: 8px 10px; + border-bottom: 1px solid #f1f5f9; + text-align: right; + font-variant-numeric: tabular-nums; + color: #0f172a; + white-space: nowrap; + } + + tbody td.rd__col-particulars { + text-align: left; + font-weight: 500; + max-width: 240px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + } + + &__srno { + display: inline-block; + min-width: 24px; + color: #94a3b8; + font-weight: 600; + margin-right: 6px; + } + + &__gl-tag { + display: inline-block; + margin-left: 30px; + font-size: 10px; + font-weight: 600; + color: #475569; + background: #f1f5f9; + border-radius: 999px; + padding: 1px 8px; + + &--unmapped { + color: #92400e; + background: #fef3c7; + } + } + + // ---- Row & cell highlights -------------------------------------------- + + &__row--changed { + background: #fffbeb; + } + + &__cell-changed { + background: #fef3c7 !important; + font-weight: 700; + } + + &__old { + color: #991b1b; + font-weight: 500; + text-decoration: line-through; + text-decoration-color: #dc2626; + text-decoration-thickness: 1px; + } + + &__arrow { + color: #94a3b8; + margin: 0 4px; + font-weight: 700; + } + + &__new { + color: #065f46; + font-weight: 700; + } + + // ---- CIBIL inline-diff table ------------------------------------------ + + &__cibil { + width: 100%; + border-collapse: collapse; + font-size: 12px; + + thead th { + background: #f8fafc; + color: #64748b; + font-size: 10px; + text-transform: uppercase; + font-weight: 600; + letter-spacing: 0.3px; + padding: 10px 14px; + text-align: left; + border-bottom: 1px solid #e2e8f0; + } + + tbody td { + padding: 10px 14px; + border-bottom: 1px solid #f1f5f9; + color: #0f172a; + } + } +} diff --git a/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.ts b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.ts new file mode 100644 index 000000000..9df948b0f --- /dev/null +++ b/src/app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component.ts @@ -0,0 +1,121 @@ +/** + * 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, Input, OnInit, inject } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { MatSlideToggleModule } from '@angular/material/slide-toggle'; +import { RateRegisterService } from '../rate-register.service'; +import { CibilSlab, RateCell, RateChartRow, SlabColumn } from '../models/rate-register.model'; +import { countChangedCells, countChangedCibil, sameCell } from '../rate-register-diff.util'; + +/** + * Inline-diff view of a proposed Loan Interest Rate Register version against a baseline: one rate + * chart where every changed cell reads OLD -> NEW, plus the CIBIL bands. Shared by the Compare + * screen (before submitting) and the Approvals dialog (before approving), so both show the same thing. + */ +@Component({ + selector: 'mifosx-rate-register-diff', + templateUrl: './rate-register-diff.component.html', + styleUrls: ['./rate-register-diff.component.scss'], + imports: [ + CommonModule, + FormsModule, + MatSlideToggleModule + ] +}) +export class RateRegisterDiffComponent implements OnInit { + private readonly service = inject(RateRegisterService); + + @Input() slabs: SlabColumn[] = []; + @Input() draftRows: RateChartRow[] = []; + @Input() baselineRows: RateChartRow[] = []; + @Input() draftCibil: CibilSlab[] = []; + @Input() baselineCibil: CibilSlab[] = []; + + /** User toggle to collapse the chart to only the rows that changed. */ + showOnlyChanged = true; + + ngOnInit(): void { + // Loads the GL list so mapped particulars show a readable label; the cache is shared. + this.service.getGlOptions().subscribe(); + } + + glText(row: RateChartRow): string { + return row.glAccountId == null ? 'GL not mapped' : (this.service.glLabel(row.glAccountId) ?? 'GL not mapped'); + } + + display(cell: RateCell): string { + if (cell === null) { + return 'N.A.'; + } + if (typeof cell === 'string') { + return cell; + } + return cell.toFixed(2); + } + + /** The baseline (OLD) value of a cell; null when the row did not exist in the baseline. */ + baselineCell(srNo: number, colIdx: number): RateCell { + return this.baselineRows.find((r) => r.srNo === srNo)?.rates[colIdx] ?? null; + } + + draftCell(srNo: number, colIdx: number): RateCell { + return this.draftRows.find((r) => r.srNo === srNo)?.rates[colIdx] ?? null; + } + + cellChanged(srNo: number, colIdx: number): boolean { + return !sameCell(this.baselineCell(srNo, colIdx), this.draftCell(srNo, colIdx)); + } + + rowHasChanges(srNo: number): boolean { + for (let j = 0; j < this.slabs.length; j++) { + if (this.cellChanged(srNo, j)) { + return true; + } + } + return false; + } + + /** Rows to render: all of them, or only those with a change when the toggle is on. */ + get visibleRows(): RateChartRow[] { + if (!this.showOnlyChanged || this.changedCellCount() === 0) { + return this.draftRows; + } + return this.draftRows.filter((r) => this.rowHasChanges(r.srNo)); + } + + changedCellCount(): number { + return countChangedCells(this.draftRows, this.baselineRows, this.slabs.length); + } + + changedCibilCount(): number { + return countChangedCibil(this.draftCibil, this.baselineCibil); + } + + cibilChanged(index: number): boolean { + const a = this.baselineCibil[index]; + const d = this.draftCibil[index]; + return !a || !d || a.from !== d.from || a.to !== d.to || a.tier !== d.tier || a.adjustmentPct !== d.adjustmentPct; + } + + /** Per-field highlight inside a CIBIL row. */ + cibilFieldChanged(index: number, field: 'from' | 'to' | 'tier' | 'adjustmentPct'): boolean { + const a = this.baselineCibil[index]; + const d = this.draftCibil[index]; + return !a || !d || a[field] !== d[field]; + } + + formatPct(pct: number): string { + if (pct === 0) { + return '0.00%'; + } + const sign = pct > 0 ? '+' : '−'; + return `${sign}${Math.abs(pct).toFixed(2)}%`; + } +} diff --git a/src/app/products/loan-interest-rate-register/rate-register.service.ts b/src/app/products/loan-interest-rate-register/rate-register.service.ts index 7e1f50486..9230ad7a5 100644 --- a/src/app/products/loan-interest-rate-register/rate-register.service.ts +++ b/src/app/products/loan-interest-rate-register/rate-register.service.ts @@ -7,10 +7,11 @@ */ import { inject, Injectable } from '@angular/core'; -import { Observable, catchError, map, of, tap } from 'rxjs'; +import { Observable, catchError, forkJoin, map, of, switchMap, tap } from 'rxjs'; import { ProductsService } from '../products.service'; import { CibilSlab, + GlOption, RateCell, RateChartRow, RateRegister, @@ -21,10 +22,9 @@ import { /** * Central Loan Interest Rate Register service. * - * Primary data path is HTTP (/loanproducts/baseinterestrates). On HTTP failure (backend not yet - * deployed, network error) the service transparently falls back to in-memory seeded data so the UI - * never breaks during development. Local Drafts (not-yet-submitted new versions) live only in - * memory and are merged in front of server data on every list(). + * Data comes from HTTP (/loanproducts/baseinterestrates); there is no built-in sample data. If the + * backend cannot be reached the list is empty apart from local Drafts (not-yet-submitted new + * versions), which live only in memory and are merged in front of server data on every list(). */ @Injectable({ providedIn: 'root' }) export class RateRegisterService { @@ -37,7 +37,100 @@ export class RateRegisterService { private cache: RateRegister[] = []; /** In-memory drafts the maker has created but not yet submitted. Preserved across list() refreshes. */ - private localDrafts: RateRegister[] = []; + private localDrafts: RateRegister[] = this.loadDrafts(); + + private static readonly DRAFTS_KEY = 'cbsLoanRateRegisterDrafts'; + + /** Drafts are kept in this browser's localStorage so a reload does not lose the maker's work. */ + private loadDrafts(): RateRegister[] { + try { + const raw = localStorage.getItem(RateRegisterService.DRAFTS_KEY); + const parsed = raw ? (JSON.parse(raw) as RateRegister[]) : []; + return Array.isArray(parsed) ? parsed.filter((d) => d?.status === 'Draft') : []; + } catch { + return []; + } + } + + /** Persist the current drafts (call after any edit the user should not lose). */ + saveDrafts(): void { + try { + localStorage.setItem( + RateRegisterService.DRAFTS_KEY, + JSON.stringify(this.localDrafts.filter((d) => d.status === 'Draft')) + ); + } catch { + /* storage unavailable (private mode / quota): the draft just stays in memory */ + } + } + + /** Base for the synthetic ids of pending server entries: -(base + commandId). Local drafts count down from -1. */ + private static readonly PENDING_ID_BASE = 1_000_000; + + /** One maker-checker entry (with its commandAsJson) as a read-only register, e.g. for the Approvals dialog. */ + registerFromPendingEntry(entry: any): RateRegister | null { + return this.pendingToRegisters([entry])[0] ?? null; + } + + /** A version as the backend returns it, as a UI register; used as the "old" side of a comparison. */ + registerFromServerDto(dto: any): RateRegister { + return this.fromBackend(dto, new Map()); + } + + /** Turn the maker-checker entries awaiting a checker into read-only "Pending Approval" registers. */ + private pendingToRegisters(entries: any): RateRegister[] { + const items: any[] = Array.isArray(entries) ? entries : (entries?.pageItems ?? []); + const out: RateRegister[] = []; + for (const e of items) { + if ((e?.entityName ?? '').toUpperCase() !== 'LOANBASEINTERESTRATE' || !e?.commandAsJson) { + continue; + } + let payload: any; + try { + payload = JSON.parse(e.commandAsJson); + } catch { + continue; + } + const glBySrNo = new Map(); + for (const p of payload.products ?? []) { + glBySrNo.set(p.srNo, p.glAccountId ?? null); + } + const madeOn = + typeof e.madeOnDate === 'number' + ? new Date(e.madeOnDate < 1e12 ? e.madeOnDate * 1000 : e.madeOnDate).toISOString().slice(0, 10) + : String(e.madeOnDate ?? '').slice(0, 10); + const reg = this.fromBackend( + { + id: -(RateRegisterService.PENDING_ID_BASE + e.id), + name: payload.name, + effectiveFromDate: payload.effectiveFromDate ?? madeOn, + effectiveToDate: null, + currencyCode: payload.currencyCode, + isActive: false, + fallbackNoCibilSlab: payload.fallbackNoCibilSlab, + fallbackBelowMin: payload.fallbackBelowMin, + note: payload.note, + createdDate: madeOn, + slabs: payload.slabs, + cibilSlabs: payload.cibilSlabs + }, + glBySrNo + ); + reg.status = 'Pending Approval'; + reg.createdBy = e.maker ?? 'Maker'; + reg.lastModified = madeOn; + // With no Active register to diff against, the Compare screen falls back to this blank baseline. + reg.baselineRows = reg.rows.map((r) => ({ + srNo: r.srNo, + particulars: r.particulars, + glAccountId: r.glAccountId ?? null, + rates: new Array(r.rates.length).fill(null) + })); + reg.baselineCibilSlabs = []; + out.push(reg); + } + return out; + } private readonly slabs: SlabColumn[] = [ { key: 's1', label: 'Upto 10,000', amountUpto: 10000 }, @@ -52,304 +145,6 @@ export class RateRegisterService { { key: 's10', label: '> 25,00,000', amountUpto: null } ]; - // Values taken from the bank's approved Interest Rate of Loans register. - private readonly rows: RateChartRow[] = [ - this.row(1, 'Consumer Loan', [ - 18, - 18, - 15, - 13, - null, - null, - null, - null, - null, - null - ]), - this.row( - 2, - 'Self Employment Loan', - [ - 18, - 18, - 15, - 13, - 12.5, - 12, - 11.5, - 11, - 10.5, - 10.5 - ] - ), - this.row( - 3, - 'Business Term Loan for running business', - [ - 18, - 18, - 15, - 13, - 12.5, - 11, - 10.5, - 10, - 9.5, - 9.5 - ] - ), - this.row( - 4, - 'Cash Credit', - [ - 18, - 18, - 15, - 13, - 13, - 11, - 10.5, - 10, - 9.5, - 9.5 - ] - ), - this.row( - 5, - 'Limit (OD) on property — MSME', - [ - 18, - 18, - 15, - 13, - 13, - 11, - 10.5, - 10, - 9.5, - 9.5 - ] - ), - this.row( - 6, - 'Limit (OD) on property — Personal', - [ - 18, - 18, - 15, - 14, - 13.5, - 12, - 11.5, - 11, - 10.5, - 10.5 - ] - ), - this.row(7, 'House Purchase / Construction', [ - null, - null, - 15, - 12, - 12, - 9.25, - 8.75, - 8.25, - 8, - 8 - ]), - this.row(8, 'House Repairing, Renovation & Expansion Loan', [ - null, - null, - 15, - 14, - 14, - 13, - 12, - 11, - 10.5, - 10 - ]), - this.row( - 9, - 'Commercial Real Estate Loan', - [ - 18, - 18, - 15, - 13, - 12.5, - 12, - 11, - 10.5, - 10.5, - 10 - ] - ), - this.row(10, 'Loan against Jewellery', this.flat(10.8)), - this.row(11, 'Loan against Warehouse Receipt (Farmers)', this.flat(13)), - this.row( - 12, - 'Loan against Warehouse Receipt (Traders)', - [ - 10.5, - 10.5, - 10.5, - 10.5, - 10.5, - 10.5, - 10, - 10, - 10, - 9 - ] - ), - this.row(13, 'Agriculture Loan', [ - null, - null, - 15, - 12, - 12, - 12, - 11.75, - 11.5, - 11.25, - 11 - ]), - this.row(14, 'Personal Loan (Unsecured)', [ - 18, - 18, - 16, - 15, - null, - null, - null, - null, - null, - null - ]), - this.row( - 15, - 'Personal Loan (Secured / Property)', - [ - 18, - 18, - 16, - 15, - 15, - 13, - 12, - 11.5, - 11, - 11 - ] - ), - this.row(16, 'Two Wheeler Loan', this.flat(13)), - this.row(17, 'Car Loan (4-Wheel Domestic)', [ - null, - null, - 10, - 9.5, - 9.5, - 8.75, - 8.5, - 8.35, - 8.25, - 8.25 - ]), - this.row(18, 'Old Car Loan (4-Wheel Domestic) & Refinance', [ - null, - null, - 13, - 12.5, - 12.5, - 12, - 11.5, - 11, - 10.5, - 10.5 - ]), - this.row(19, 'Vehicle Loan (Commercial & Three-wheeler)', [ - null, - null, - 13, - 12, - 12, - 10.5, - 10, - 10, - 10, - 10 - ]), - this.row(20, 'Old Vehicle Loan (Commercial & Three-wheeler)', [ - null, - null, - 15, - 14, - 14, - 13.5, - 13.5, - 13, - 12.5, - 12.5 - ]), - this.row( - 21, - 'Machinery & Plant Loan', - [ - 18, - 18, - 15, - 13, - 12.5, - 12, - 11, - 10.5, - 10.5, - 10 - ] - ), - this.row( - 22, - 'Office Chamber / Equipment Loan', - [ - 18, - 18, - 15, - 13, - 12.5, - 12, - 11, - 10.5, - 10.5, - 10 - ] - ), - this.formulaRow(23, 'Loan against F.D.R.', [ - '1% + FD', - '1% + FD', - '1% + FD', - '1% + FD', - '1% + FD', - '1% + FD', - '0.75% + FD', - '0.50% + FD', - '0.50% + FD', - '0.50% + FD' - ]), - this.row(24, 'Loan against Daily Deposit & Gullak Scheme', this.flat(10)), - this.formulaRow(25, 'Loan against Recurring Deposit', Array(10).fill('1% + RD')), - this.row(26, 'Loan against Staff Service Fund', this.flat(7)), - this.row(27, 'Over Draft A/c', this.flat(null)), - this.row(28, 'Loan on LIC Policy', this.flat(null)), - this.row(29, 'Loan on KVP / NSC', this.flat(null)), - this.row(30, 'Bill Discount', this.flat(null)), - this.row(31, 'Temporary Limit', this.flat(15)), - this.row(32, 'Bank Guarantee (commission)', this.flat(0.25)), - this.row(33, 'Sugam Vyapar Loan', this.flat(null)), - this.row(34, 'OD to Staff (upto 2 lakh)', this.flat(null)) - ]; - // Credit-score bands per the bank's approved register: // above 700 = base rate (no change), below that stepped up by 0.5% per band. // No discount band — the register never gives a negative adjustment. @@ -361,86 +156,81 @@ export class RateRegisterService { { from: 701, to: 900, tier: 'Excellent', type: 'Flat', adjustmentPct: 0 } ]; - // Seed data used ONLY when the HTTP backend is unreachable (dev fallback). Each entry has its own - // deep-cloned rows & CIBIL slabs so edits to one register do not mutate another. - private readonly seedRegisters: RateRegister[] = [ - this.seedRegister({ - id: 1001, - name: 'Interest Rate of Loans — Effective 01 April 2027', - effectiveFrom: '2027-04-01', - effectiveTo: '2028-03-31', - status: 'Draft', - createdBy: 'Sonali', - lastModified: '2026-10-01', - note: 'Scheduled · future effective' - // No pre-seeded deltas — Draft starts identical to the Active register. - // Only edits made in the UI will show as diffs on the Compare screen. - }), - this.seedRegister({ - id: 1002, - name: 'Interest Rate of Loans — Effective 01 April 2026', - effectiveFrom: '2026-04-01', - effectiveTo: '2027-03-31', - status: 'Active', - createdBy: 'Admin', - lastModified: '2026-03-25', - note: 'Approved by Board · Nagrik Sahakari Bank Maryadit Vidisha' - }), - this.seedRegister({ - id: 1003, - name: 'Interest Rate of Loans — Effective 01 April 2025', - effectiveFrom: '2025-04-01', - effectiveTo: '2026-03-31', - status: 'Expired', - createdBy: 'Admin', - lastModified: '2025-03-20' - }), - this.seedRegister({ - id: 1004, - name: 'Interest Rate of Loans — Effective 01 April 2024', - effectiveFrom: '2024-04-01', - effectiveTo: '2025-03-31', - status: 'Expired', - createdBy: 'Admin', - lastModified: '2024-03-18' - }), - this.seedRegister({ - id: 1005, - name: 'Interest Rate of Loans — Effective 01 April 2023', - effectiveFrom: '2023-04-01', - effectiveTo: '2024-03-31', - status: 'Expired', - createdBy: 'Admin', - lastModified: '2023-03-22' - }) + /** + * The standard loan types every bank offers. Same list the backend seeds into + * m_loan_rate_register_product; used only if that endpoint cannot be reached when the first + * version is created. Any other particular is added by the bank itself. + */ + private readonly defaultParticulars: { srNo: number; name: string }[] = [ + { srNo: 1, name: 'Housing Loan (Purchase/Construction)' }, + { srNo: 2, name: 'Home Repair/Renovation' }, + { srNo: 3, name: 'Personal Loan (Unsecured)' }, + { srNo: 4, name: 'Personal Loan (Secured/Property)' }, + { srNo: 5, name: 'Two Wheeler Loan' }, + { srNo: 6, name: 'Car Loan (New)' }, + { srNo: 7, name: 'Used Car/Vehicle Loan' }, + { srNo: 8, name: 'Commercial Vehicle Loan' }, + { srNo: 9, name: 'Gold Loan' }, + { srNo: 10, name: 'Business Term Loan' }, + { srNo: 11, name: 'Machinery & Equipment Loan' }, + { srNo: 12, name: 'Cash Credit' }, + { srNo: 13, name: 'Overdraft' }, + { srNo: 14, name: 'Agriculture Loan' }, + { srNo: 15, name: 'Loan against FDR' }, + { srNo: 16, name: 'Loan against RD' } ]; /** - * List all registers (local drafts + server versions). Tries HTTP first; on failure OR when - * the server returns an empty collection (fresh DB, nothing seeded yet) falls back to the - * built-in seed registers so the UI always has something to show in development. + * List all registers (local drafts + server versions). If the backend cannot be reached only the + * local drafts are returned: there is no built-in sample data. A successful but empty response is a + * genuinely empty register and shows the "Create first version" state. */ list(): Observable { if (!this.useHttp) { - this.cache = [ - ...this.localDrafts, - ...this.seedRegisters - ]; + this.cache = [...this.localDrafts]; return of(this.cache); } - return this.productsService.getLoanBaseInterestRates().pipe( - map((dtos: any[]) => (dtos ?? []).map((d) => this.fromBackend(d))), - catchError((err) => { - console.warn('[RateRegisterService] HTTP unavailable, using seeded data —', err?.message ?? err); - this.useHttp = false; - return of([...this.seedRegisters]); - }), - map((serverVersions) => { - if (serverVersions.length === 0) { - console.info('[RateRegisterService] Backend returned no versions — using seeded demo data.'); - return [...this.seedRegisters]; + // Approved versions, the particulars master (each row's GL) and the versions still awaiting a + // checker. A failure of the master or the pending lookup must not hide the approved versions. + return forkJoin({ + versions: this.productsService.getLoanBaseInterestRates(), + products: this.productsService.getLoanRateRegisterProducts().pipe(catchError(() => of([]))), + pending: this.productsService.getPendingLoanRateRegisters().pipe( + // The list omits each entry's payload, so fetch the detail of every pending entry. + switchMap((entries: any) => { + const items: any[] = (Array.isArray(entries) ? entries : (entries?.pageItems ?? [])).filter( + (e: any) => (e?.entityName ?? '').toUpperCase() === 'LOANBASEINTERESTRATE' + ); + if (items.length === 0) { + return of([] as any[]); + } + return forkJoin( + items.map((e) => + this.productsService.getLoanRateRegisterAuditDetail(e.id).pipe( + map((detail: any) => ({ ...detail, ...e })), + catchError(() => of(null)) + ) + ) + ).pipe(map((all) => all.filter((x) => x !== null))); + }), + catchError(() => of([] as any[])) + ) + }).pipe( + map(({ versions, products, pending }) => { + const glBySrNo = new Map(); + for (const p of (products as any[]) ?? []) { + glBySrNo.set(p.srNo, p.glAccountId ?? null); } - return serverVersions; + const approved = ((versions as any[]) ?? []).map((d) => this.fromBackend(d, glBySrNo)); + return [ + ...this.pendingToRegisters(pending), + ...approved + ]; + }), + catchError((err) => { + console.warn('[RateRegisterService] Backend unavailable —', err?.message ?? err); + this.useHttp = false; + return of([] as RateRegister[]); }), tap((effectiveVersions) => { this.cache = [ @@ -462,10 +252,10 @@ export class RateRegisterService { return of(this.localDrafts.find((r) => r.id === id)); } if (!this.useHttp) { - return of(this.seedRegisters.find((r) => r.id === id)); + return of(undefined); } return this.productsService.getLoanBaseInterestRateById(id).pipe( - map((d: any) => (d ? this.fromBackend(d) : undefined)), + map((d: any) => (d ? this.fromBackend(d, new Map()) : undefined)), catchError(() => of(undefined)) ); } @@ -476,12 +266,9 @@ export class RateRegisterService { } /** The one shown by default on list → edit navigation. */ - getActiveOrFirstDraft(): RateRegister { + getActiveOrFirstDraft(): RateRegister | undefined { return ( - this.cache.find((r) => r.status === 'Draft') ?? - this.cache.find((r) => r.status === 'Active') ?? - this.cache[0] ?? - this.seedRegisters[0] + this.cache.find((r) => r.status === 'Draft') ?? this.cache.find((r) => r.status === 'Active') ?? this.cache[0] ); } @@ -507,37 +294,20 @@ export class RateRegisterService { return of({ rollbackTransaction: false }); } - if (!this.useHttp) { - // Dev fallback — flip status locally so the UI can still demo the flow. - draft.status = 'Pending Approval'; - draft.lastModified = new Date().toISOString().slice(0, 10); - return of({ rollbackTransaction: true, commandId: Math.floor(Math.random() * 100000) }); - } - const payload = this.toBackend(draft); return this.productsService.saveLoanBaseInterestRate(payload).pipe( map((res: any) => { const rollback = res?.rollbackTransaction === true; const commandId = res?.commandId; - if (rollback) { - // Keep the local Draft visible as "Pending Approval" until the checker acts. - draft.status = 'Pending Approval'; - draft.lastModified = new Date().toISOString().slice(0, 10); - } else { - // Direct commit — drop the local draft; the server now owns the new Active version. - this.localDrafts = this.localDrafts.filter((d) => d.id !== id); - this.cache = this.cache.filter((c) => c.id !== id); - } + // Either way the server now owns this version (a pending maker-checker entry, or the new + // Active one), so the local draft goes. list() brings the server copy back on its next call. + this.localDrafts = this.localDrafts.filter((d) => d.id !== id); + this.cache = this.cache.filter((c) => c.id !== id); + this.saveDrafts(); return { rollbackTransaction: rollback, commandId }; - }), - catchError((err) => { - // HTTP failed (backend down, 4xx/5xx). Mark the draft as locally Pending so the UI isn't - // stuck on "Submitting…", and surface the failure to the caller for toast handling. - console.warn('[RateRegisterService] POST failed, keeping draft in local Pending state —', err?.message ?? err); - draft.status = 'Pending Approval'; - draft.lastModified = new Date().toISOString().slice(0, 10); - return of({ rollbackTransaction: true, commandId: undefined }); }) + // No catchError: a rejected submit (e.g. a product without GL, backend down) must reach the + // caller so it can show the reason instead of pretending the request was sent. ); } @@ -569,16 +339,51 @@ export class RateRegisterService { } /** - * Scaffold a brand-new local Draft when the backend has no versions yet. Uses the Excel-sourced - * template (34 products × 10 slabs + 5 CIBIL bands) so the user has a sensible starting point to - * tweak and submit as the first-ever Active version. Carries a negative id like other local drafts. + * Scaffold the first-ever Draft. Rows come from the backend's master list of particulars + * (/loanproducts/baseinterestrates/products) with every rate blank, so the bank fills in its own + * rates. If the backend is unreachable, the same standard loan types come from a built-in list. + * Carries a negative id like other local drafts. */ - createFirstVersion(): RateRegister { - const template = this.seedRegisters.find((r) => r.status === 'Active') ?? this.seedRegisters[0]; - const newId = this.nextLocalDraftId(); + createFirstVersion(): Observable { + const fromTemplate = (): RateRegister => + this.scaffoldFirstDraft( + this.defaultParticulars.map( + (p): RateChartRow => ({ + srNo: p.srNo, + particulars: p.name, + glAccountId: null, + rates: new Array(this.slabs.length).fill(null) + }) + ), + 'First version — standard loan types, rates to be filled' + ); + + if (!this.useHttp) { + return of(fromTemplate()); + } + return this.productsService.getLoanRateRegisterProducts().pipe( + map((products: any[]) => { + const rows: RateChartRow[] = (products ?? []).map( + (p): RateChartRow => ({ + srNo: p.srNo, + particulars: p.name, + glAccountId: p.glAccountId ?? null, + rates: new Array(this.slabs.length).fill(null) + }) + ); + return rows.length > 0 + ? this.scaffoldFirstDraft(rows, 'First version — standard loan types, rates to be filled') + : fromTemplate(); + }), + catchError(() => of(fromTemplate())) + ); + } + + private scaffoldFirstDraft(rows: RateChartRow[], note: string): RateRegister { + const cibilTemplate = this.cibilSlabs; const today = new Date().toISOString().slice(0, 10); const draft: RateRegister = { - id: newId, + id: this.nextLocalDraftId(), name: 'Interest Rate of Loans — new version', effectiveFrom: today, effectiveTo: null, @@ -586,22 +391,23 @@ export class RateRegisterService { status: 'Draft', createdBy: 'Current User', lastModified: today, - note: 'First Loan Interest Rate Register — seeded from Excel template', - slabs: template.slabs, - rows: this.cloneRows(template.rows), - cibilSlabs: this.cloneCibilSlabs(template.cibilSlabs), - // Baseline is empty rows for the first version — compare screen will show every cell as "new". - baselineRows: template.rows.map((r) => ({ + note, + slabs: this.slabs, + rows, + cibilSlabs: this.cloneCibilSlabs(cibilTemplate), + // Baseline is blank for a first version, so Compare shows every filled cell as new. + baselineRows: rows.map((r) => ({ srNo: r.srNo, particulars: r.particulars, rates: new Array(r.rates.length).fill(null) })), baselineCibilSlabs: [], - fallbackNoCibilSlab: template.fallbackNoCibilSlab, - fallbackBelowMin: template.fallbackBelowMin + fallbackNoCibilSlab: 2, + fallbackBelowMin: 'block' }; this.localDrafts.unshift(draft); this.cache.unshift(draft); + this.saveDrafts(); return draft; } @@ -611,7 +417,7 @@ export class RateRegisterService { * with server-assigned ids. */ duplicateAsDraft(sourceId: number): RateRegister | undefined { - const source = this.cache.find((r) => r.id === sourceId) ?? this.seedRegisters.find((r) => r.id === sourceId); + const source = this.cache.find((r) => r.id === sourceId); if (!source) { return undefined; } @@ -637,6 +443,7 @@ export class RateRegisterService { }; this.localDrafts.unshift(copy); this.cache.unshift(copy); + this.saveDrafts(); return copy; } @@ -656,76 +463,12 @@ export class RateRegisterService { return (minId <= 0 ? minId : 0) - 1; } - private row(srNo: number, particulars: string, rates: (number | null)[]): RateChartRow { - return { srNo, particulars, rates }; - } - - private formulaRow(srNo: number, particulars: string, rates: string[]): RateChartRow { - return { srNo, particulars, isFormula: true, rates }; - } - - private flat(value: number | null): (number | null)[] { - return Array(10).fill(value); - } - - /** - * Build a register with its OWN deep-cloned rows and CIBIL slabs — editing one register must - * not mutate another. Optional overrides let a Draft start with real diffs vs the Active one. - */ - private seedRegister(spec: { - id: number; - name: string; - effectiveFrom: string; - effectiveTo: string | null; - status: RateRegister['status']; - createdBy: string; - lastModified: string; - note?: string; - rateOverrides?: { srNo: number; colIdx: number; value: number | string | null }[]; - cibilOverrides?: { index: number; adjustmentPct: number }[]; - }): RateRegister { - const rows = this.cloneRows(this.rows); - const cibilSlabs = this.cloneCibilSlabs(this.cibilSlabs); - for (const o of spec.rateOverrides ?? []) { - const r = rows.find((x) => x.srNo === o.srNo); - if (r) { - r.rates[o.colIdx] = o.value; - } - } - for (const o of spec.cibilOverrides ?? []) { - const s = cibilSlabs[o.index]; - if (s) { - s.adjustmentPct = o.adjustmentPct; - } - } - return { - id: spec.id, - name: spec.name, - effectiveFrom: spec.effectiveFrom, - effectiveTo: spec.effectiveTo, - currency: 'INR', - status: spec.status, - createdBy: spec.createdBy, - lastModified: spec.lastModified, - note: spec.note, - slabs: this.slabs, // slab columns are structural; safe to share - rows, - cibilSlabs, - // Frozen baseline (last-approved state). Lives separately from `rows`/`cibilSlabs` so edits - // to the register are visible as diffs on the Compare screen, even when the register being - // edited happens to be the one that is currently Active. - baselineRows: this.cloneRows(rows), - baselineCibilSlabs: this.cloneCibilSlabs(cibilSlabs), - fallbackNoCibilSlab: 2, - fallbackBelowMin: 'block' - }; - } - private cloneRows(src: RateChartRow[]): RateChartRow[] { return src.map((r) => ({ srNo: r.srNo, particulars: r.particulars, isFormula: r.isFormula, + glAccountId: r.glAccountId ?? null, rates: [...r.rates] })); } @@ -740,7 +483,7 @@ export class RateRegisterService { // that gap. /** Map a backend {@code LoanRateRegisterData} payload into a UI RateRegister. */ - private fromBackend(d: any): RateRegister { + private fromBackend(d: any, glBySrNo: Map): RateRegister { // Rebuild the slab columns from unique slabOrders. const slabByOrder = new Map(); for (const cell of d.slabs ?? []) { @@ -766,7 +509,12 @@ export class RateRegisterService { for (const cell of d.slabs ?? []) { let row = rowByProduct.get(cell.productSrNo); if (!row) { - row = { srNo: cell.productSrNo, particulars: cell.productName, rates: new Array(slabs.length).fill(null) }; + row = { + srNo: cell.productSrNo, + particulars: cell.productName, + glAccountId: glBySrNo.get(cell.productSrNo) ?? null, + rates: new Array(slabs.length).fill(null) + }; rowByProduct.set(cell.productSrNo, row); } let value: RateCell; @@ -851,8 +599,48 @@ export class RateRegisterService { fallbackNoCibilSlab: r.fallbackNoCibilSlab, fallbackBelowMin: r.fallbackBelowMin, note: r.note, + products: r.rows.map((row) => ({ + srNo: row.srNo, + name: row.particulars, + glAccountId: row.glAccountId ?? null + })), slabs, cibilSlabs }; } + + // ---- GL accounts for the particular → GL mapping ------------------------------ + + private glOptionsCache: GlOption[] | null = null; + + /** Posting GL accounts the user can map a particular to. Cached after the first successful load. */ + getGlOptions(): Observable { + if (this.glOptionsCache) { + return of(this.glOptionsCache); + } + return this.productsService.getLoanRegisterGlAccounts().pipe( + map((accounts: any[]) => + (accounts ?? []) + // The server filters on type=1 (ASSET); this keeps asset-only even if that param is ignored. + .filter((a) => a.type == null || a.type.value === 'ASSET' || a.type.id === 1) + .sort((a, b) => String(a.glCode ?? '').localeCompare(String(b.glCode ?? ''))) + .map((a) => ({ + id: a.id, + label: a.glCode ? `${a.glCode} - ${a.name}` : a.name + })) + ), + tap((options) => { + this.glOptionsCache = options; + }), + catchError(() => of([] as GlOption[])) + ); + } + + /** Display label for a mapped GL id, or null when unmapped or the account list is not loaded. */ + glLabel(id: number | null | undefined): string | null { + if (id == null) { + return null; + } + return this.glOptionsCache?.find((o) => o.id === id)?.label ?? `GL #${id}`; + } } diff --git a/src/app/products/products.service.ts b/src/app/products/products.service.ts index 658f39ab5..8c5759a99 100644 --- a/src/app/products/products.service.ts +++ b/src/app/products/products.service.ts @@ -824,6 +824,28 @@ export class ProductsService { return this.http.get(`/loanproducts/baseinterestrates/${id}`, this.silentCtx()); } + /** Submitted Loan Rate Register versions still awaiting a checker (maker-checker entries with their payload). */ + getPendingLoanRateRegisters(): Observable { + const params = new HttpParams().set('entityName', 'LOANBASEINTERESTRATE'); + return this.http.get('/makercheckers', { params, context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); + } + + /** Full maker-checker entry, including the submitted payload (commandAsJson), which the list call omits. */ + getLoanRateRegisterAuditDetail(id: number): Observable { + return this.http.get(`/audits/${id}`, { context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); + } + + /** GL accounts a particular can be mapped to: asset (type 1) posting (detail) accounts that are not disabled. */ + getLoanRegisterGlAccounts(): Observable { + const params = new HttpParams().set('type', '1').set('usage', '1').set('disabled', 'false'); + return this.http.get('/glaccounts', { params, context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); + } + + /** Returns the master list of particulars (loan types) that make up the Loan Rate Register chart rows. */ + getLoanRateRegisterProducts(): Observable { + return this.http.get('/loanproducts/baseinterestrates/products', this.silentCtx()); + } + /** Submits a new Loan Rate Register version. If maker-checker is enabled, the response's * `rollbackTransaction` flag is true and the row sits in the Approvals tab until a checker approves. */ saveLoanBaseInterestRate(payload: any): Observable { diff --git a/src/app/tasks/checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component.ts b/src/app/tasks/checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component.ts index e05e8aa64..6d64536f9 100644 --- a/src/app/tasks/checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component.ts +++ b/src/app/tasks/checker-inbox-and-tasks-tabs/checker-inbox/checker-inbox.component.ts @@ -343,10 +343,13 @@ export class CheckerInboxComponent implements OnInit { // resourceId is absent (CREATE rows: entity does not exist yet until approved), // or entityName is unmapped — fall back to the detail dialog so the checker // can still view the command payload and action the entry. + // A Loan Base Interest Rate request carries a 10-column rate chart, which needs a wide dialog. + const wide = (row.entityName ?? '').toUpperCase() === 'LOANBASEINTERESTRATE'; this.dialog .open(ViewCheckerInboxComponent, { data: { checkerId: row.id }, - autoFocus: false + autoFocus: false, + ...(wide ? { width: '1200px', maxWidth: '95vw' } : {}) }) .afterClosed() .subscribe((result: any) => { diff --git a/src/app/tasks/loan-rate-register-diff.util.ts b/src/app/tasks/loan-rate-register-diff.util.ts new file mode 100644 index 000000000..5f2a89d9a --- /dev/null +++ b/src/app/tasks/loan-rate-register-diff.util.ts @@ -0,0 +1,169 @@ +/** + * 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 { ChangeKind, CommandChange } from './command-diff.util'; + +/** Entity name the maker-checker queue uses for Loan Base Interest Rate submissions. */ +export const LOAN_BASE_INTEREST_RATE_ENTITY = 'LOANBASEINTERESTRATE'; + +export function isLoanBaseInterestRateCreate(entityName?: string | null, actionName?: string | null): boolean { + return ( + (entityName ?? '').toUpperCase() === LOAN_BASE_INTEREST_RATE_ENTITY && (actionName ?? '').toUpperCase() === 'CREATE' + ); +} + +const HEADER_FIELDS: { key: string; label: string }[] = [ + { key: 'name', label: 'Name' }, + { key: 'effectiveFromDate', label: 'Effective From Date' }, + { key: 'currencyCode', label: 'Currency Code' }, + { key: 'fallbackNoCibilSlab', label: 'Fallback No CIBIL Slab' }, + { key: 'fallbackBelowMin', label: 'Fallback Below Min' }, + { key: 'note', label: 'Note' } +]; + +const NA = 'N.A.'; +const EMPTY = '—'; + +/** One chart cell as the checker reads it: a % rate, a formula, or N.A. */ +function cellText(cell: any): string { + if (!cell || cell.isNa) { + return NA; + } + if (cell.isFormula && cell.rateFormula) { + return String(cell.rateFormula); + } + return cell.rateValue === null || cell.rateValue === undefined ? NA : `${Number(cell.rateValue)}%`; +} + +function plain(value: any): string { + return value === null || value === undefined || value === '' ? EMPTY : String(value); +} + +function kindOf(oldText: string, newText: string, emptyTexts: string[]): ChangeKind { + const oldEmpty = emptyTexts.includes(oldText); + const newEmpty = emptyTexts.includes(newText); + if (oldEmpty && !newEmpty) { + return 'ADDED'; + } + if (!oldEmpty && newEmpty) { + return 'REMOVED'; + } + return 'MODIFIED'; +} + +/** + * Compares a submitted Loan Base Interest Rate version against the version currently in force and + * returns only the values that differ: header fields, individual rate cells (per loan type and + * amount slab) and CIBIL adjustment bands. + */ +export function diffLoanRateRegister(submitted: any, active: any): CommandChange[] { + const changes: CommandChange[] = []; + + for (const { key, label } of HEADER_FIELDS) { + if (submitted?.[key] === undefined) { + continue; + } + const oldText = plain(active?.[key]); + const newText = plain(submitted[key]); + if (oldText !== newText) { + changes.push({ label, kind: kindOf(oldText, newText, [EMPTY]), oldValue: oldText, newValue: newText }); + } + } + + // Rate cells, keyed by loan type + slab order. + const cellKey = (c: any) => `${c.productSrNo}|${c.slabOrder}`; + const oldCells = new Map( + (active?.slabs ?? []).map((c: any): [string, any] => [ + cellKey(c), + c + ]) + ); + const newCells = new Map( + (submitted?.slabs ?? []).map((c: any): [string, any] => [ + cellKey(c), + c + ]) + ); + const names = new Map(); + for (const c of active?.slabs ?? []) { + if (c.productName) { + names.set(c.productSrNo, c.productName); + } + } + for (const p of submitted?.products ?? []) { + names.set(p.srNo, p.name); + } + + const allKeys = new Set([ + ...newCells.keys(), + ...oldCells.keys() + ]); + const cellChanges = [...allKeys] + .map((k) => { + const before = oldCells.get(k); + const after = newCells.get(k); + const ref = after ?? before; + return { + srNo: Number(ref.productSrNo), + slabOrder: Number(ref.slabOrder), + label: `${names.get(ref.productSrNo) ?? `Loan type ${ref.productSrNo}`} — ${ref.slabLabel ?? `Slab ${ref.slabOrder + 1}`}`, + oldText: before ? cellText(before) : EMPTY, + newText: after ? cellText(after) : EMPTY + }; + }) + // A cell that is N.A. in the submission and was never in the old version is not a change. + .filter((c) => c.oldText !== c.newText && !(c.oldText === EMPTY && c.newText === NA)) + .sort((a, b) => a.srNo - b.srNo || a.slabOrder - b.slabOrder); + for (const c of cellChanges) { + changes.push({ + label: c.label, + kind: kindOf(c.oldText, c.newText, [ + EMPTY, + NA + ]), + oldValue: c.oldText, + newValue: c.newText + }); + } + + // CIBIL bands, matched by their score range, so a re-ordered list is not reported as a change. + const bandKey = (b: any) => `${b.scoreFrom}-${b.scoreTo}`; + const bandText = (b: any) => `${Number(b.adjustmentPct)}% (${b.slabType ?? 'Flat'})`; + const oldBands = new Map( + (active?.cibilSlabs ?? []).map((b: any): [string, any] => [ + bandKey(b), + b + ]) + ); + const newBands = new Map( + (submitted?.cibilSlabs ?? []).map((b: any): [string, any] => [ + bandKey(b), + b + ]) + ); + for (const k of new Set([ + ...newBands.keys(), + ...oldBands.keys() + ])) { + const before = oldBands.get(k); + const after = newBands.get(k); + const oldText = before ? bandText(before) : EMPTY; + const newText = after ? bandText(after) : EMPTY; + if (oldText !== newText) { + const ref = after ?? before; + changes.push({ + label: `CIBIL ${ref.scoreFrom}–${ref.scoreTo}${ref.tier ? ` (${ref.tier})` : ''} — Adjustment`, + kind: kindOf(oldText, newText, [EMPTY]), + oldValue: oldText, + newValue: newText + }); + } + } + + return changes; +} diff --git a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.html b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.html index cf694305e..f7a2f89cd 100644 --- a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.html +++ b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.html @@ -6,7 +6,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -
+
{{ headingTitle }} @@ -114,10 +114,30 @@
} + + @if (rateDiff) { +
+
Rate Chart Comparison
+ @if (changesBaseline) { +

{{ changesBaseline }}

+ } + +
+ } + @if (showChanges) {
Changes Requested ({{ changes.length }})
+ @if (changesBaseline) { +

{{ changesBaseline }}

+ } @if (changes.length === 0) {

This request does not change any value.

} @else { @@ -143,7 +163,7 @@ } - @if (!showChanges && createSections.length > 0) { + @if (!showChanges && !rateDiff && !loanRateLoading && createSections.length > 0) { @for (section of createSections; track section.title) {
{{ section.title }}
@@ -157,7 +177,7 @@ } - @if (!showChanges && createSections.length === 0 && displayJSONData) { + @if (!showChanges && !rateDiff && !loanRateLoading && createSections.length === 0 && displayJSONData) {
{{ deletingEntity ? 'Record To Be Deleted' : ('labels.heading.Command' | translate) }} diff --git a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.scss b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.scss index 9bb961c1c..2dce81707 100644 --- a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.scss +++ b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.scss @@ -32,6 +32,11 @@ $bg-page: #f8fafc; border-radius: 10px; } + /* A wide payload (the Loan Base Interest Rate chart) fills the dialog the caller sized for it. */ + &--dialog#{&}--wide { + width: 100%; + } + &:not(&--dialog) { max-width: 900px; margin: 20px auto; diff --git a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts index ade448188..e2b7b1aef 100644 --- a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts +++ b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts @@ -31,6 +31,7 @@ import { groupCreateFields, humanizeKey } from '../command-diff.util'; +import { diffLoanRateRegister, isLoanBaseInterestRateCreate } from '../loan-rate-register-diff.util'; import { deleteSummaryKeys, EntityFetchServices, fetchCurrentEntity } from '../maker-checker-entity-fetch'; /** Services the entity lookup table needs; assembled once and handed to the shared fetcher. */ @@ -42,6 +43,22 @@ import { UsersService } from 'app/users/users.service'; import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service'; import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service'; import { OrganizationService } from 'app/organization/organization.service'; +import { RateRegisterService } from 'app/products/loan-interest-rate-register/rate-register.service'; +import { RateRegisterDiffComponent } from 'app/products/loan-interest-rate-register/rate-register-diff/rate-register-diff.component'; +import { + CibilSlab, + RateChartRow, + SlabColumn +} from 'app/products/loan-interest-rate-register/models/rate-register.model'; + +/** Inputs of the shared rate-register comparison view (see RateRegisterDiffComponent). */ +interface RateDiffView { + slabs: SlabColumn[]; + draftRows: RateChartRow[]; + baselineRows: RateChartRow[]; + draftCibil: CibilSlab[]; + baselineCibil: CibilSlab[]; +} /** * One row of the rendered Command payload. The dialog turns the parsed command JSON into a tree of @@ -132,7 +149,8 @@ const ENTRY_LABEL_KEYS = [ ...STANDALONE_SHARED_IMPORTS, FaIconComponent, NgTemplateOutlet, - DateFormatPipe + DateFormatPipe, + RateRegisterDiffComponent ] }) export class ViewCheckerInboxComponent { @@ -150,6 +168,7 @@ export class ViewCheckerInboxComponent { private fixedDepositsService = inject(FixedDepositsService); private recurringDepositsService = inject(RecurringDepositsService); private organizationService = inject(OrganizationService); + private rateRegisterService = inject(RateRegisterService); /** Bundle handed to the shared entity lookup, so that table stays free of Angular injection. */ private get entityFetchServices(): EntityFetchServices { @@ -196,10 +215,22 @@ export class ViewCheckerInboxComponent { /** UPDATE review: the fields this command actually moves, as OLD -> NEW. */ changes: CommandChange[] = []; + /** Note naming the version a Loan Base Interest Rate request is compared against. */ + changesBaseline = ''; + /** Loan Base Interest Rate request: the chart-style comparison (same view as the Compare screen). */ + rateDiff: RateDiffView | null = null; /** True once the current entity was read and a real comparison is on screen. */ showChanges = false; /** True while the current entity is being fetched for comparison. */ comparing = false; + + /** A Loan Base Interest Rate request still waiting for its chart: hides the raw payload meanwhile. */ + get loanRateLoading(): boolean { + return ( + this.comparing && + isLoanBaseInterestRateCreate(this.checkerInboxDetail?.entityName, this.checkerInboxDetail?.actionName) + ); + } /** True when the screen is describing a record that is about to be deleted. */ deletingEntity = false; /** CREATE review: submitted data bucketed into readable sections. */ @@ -354,6 +385,8 @@ export class ViewCheckerInboxComponent { this.comparing = false; this.deletingEntity = false; this.createSections = []; + this.changesBaseline = ''; + this.rateDiff = null; // commandAsJson is absent on some entries (a DELETE carries no payload), and JSON.parse(undefined) // throws — which as a route only broke the page, but in a dialog would leave an empty shell open. try { @@ -377,6 +410,9 @@ export class ViewCheckerInboxComponent { } else if (action === 'DELETE') { this.loadDeleteSummary(detail); } else if (action === 'CREATE') { + if (isLoanBaseInterestRateCreate(detail?.entityName, detail?.actionName)) { + this.loadLoanRateRegisterChanges(detail); + } this.createSections = this.buildCreateSections(this.jsondata); if ((detail?.entityName ?? '').toUpperCase() === 'GLACCOUNT') { this.resolveGlAccountCreateLabels(detail, this.jsondata); @@ -415,6 +451,59 @@ export class ViewCheckerInboxComponent { }); } + /** + * Loan Base Interest Rate: every submission is a CREATE of a whole new version (16 loan types x 10 + * slabs plus CIBIL bands), so the raw payload hides the handful of rates the maker actually moved. + * Compares it with the version in force today and shows only the differences as OLD -> NEW. With no + * active version (first ever submission) the grouped CREATE view stays on screen. + */ + private loadLoanRateRegisterChanges(detail: any): void { + this.comparing = true; + this.productsService.getActiveLoanBaseInterestRate().subscribe({ + next: (active: any) => { + if (!this.isCurrent(detail)) { + return; + } + this.comparing = false; + this.changes = diffLoanRateRegister(this.jsondata ?? {}, active ?? {}); + this.rateDiff = this.buildRateDiff(detail, active); + if (active) { + const effective = active.effectiveFromDate ? `, effective ${active.effectiveFromDate}` : ''; + this.changesBaseline = `Compared with active version: ${active.name ?? 'Version ' + active.id}${effective}`; + } else { + this.changesBaseline = + 'No active version exists yet - this is the first version, so every filled value is new.'; + } + // The chart comparison already shows every change, so the flat list is only the fallback for a + // payload the chart could not be built from. + this.showChanges = !this.rateDiff; + }, + error: () => { + this.comparing = false; + } + }); + } + + /** + * The chart-style view of a Loan Base Interest Rate request: the submitted version against the active + * one (or against a blank baseline when there is no active version yet). Null if the payload cannot be + * read, in which case only the change list is shown. + */ + private buildRateDiff(detail: any, active: any): RateDiffView | null { + const submitted = this.rateRegisterService.registerFromPendingEntry(detail); + if (!submitted) { + return null; + } + const base = active ? this.rateRegisterService.registerFromServerDto(active) : null; + return { + slabs: submitted.slabs, + draftRows: submitted.rows, + baselineRows: base ? base.rows : submitted.baselineRows, + draftCibil: submitted.cibilSlabs, + baselineCibil: base ? base.cibilSlabs : submitted.baselineCibilSlabs + }; + } + /** * DELETE: the payload is empty for every entity, so the command alone tells the checker nothing. * Reads the record instead and shows the few fields that identify it. diff --git a/src/environments/.env.ts b/src/environments/.env.ts index e4a38927e..94bc5c969 100644 --- a/src/environments/.env.ts +++ b/src/environments/.env.ts @@ -9,8 +9,8 @@ /* tslint:disable */ export default { 'mifos_x': { - 'version': '261007', - 'hash': '7c868ae07' + 'version': '261008', + 'hash': 'a5a64d4ef' }, 'allow_switching_backend_instance': true }; From afcd3af918cc94e982b820ea63c82c3b27027ed8 Mon Sep 17 00:00:00 2001 From: Sonali Likhitkar Date: Mon, 12 Oct 2026 15:52:11 +0530 Subject: [PATCH 2/3] feat(delinquency): maker-checker UI for Delinquency Ranges and Buckets Checker inbox now resolves DELINQUENCY_RANGE/DELINQUENCY_BUCKET entries to readable diffs instead of raw JSON, and each bucket/range screen shows its own pending-approval state via a new pending-requests panel. Co-Authored-By: Claude Sonnet 5 --- .../create-bucket/create-bucket.component.ts | 11 + .../delinquency-bucket.component.html | 2 + .../delinquency-bucket.component.ts | 2 + .../edit-bucket/edit-bucket.component.ts | 11 +- .../view-bucket/view-bucket.component.ts | 11 +- .../create-range/create-range.component.ts | 11 + .../delinquency-range.component.html | 2 + .../delinquency-range.component.ts | 2 + .../edit-range/edit-range.component.ts | 11 + .../view-range/view-range.component.ts | 11 +- ...elinquency-pending-requests.component.html | 55 +++++ ...elinquency-pending-requests.component.scss | 108 +++++++++ .../delinquency-pending-requests.component.ts | 210 ++++++++++++++++++ src/app/products/products.service.ts | 6 + src/app/tasks/maker-checker-entity-fetch.ts | 9 + .../view-checker-inbox.component.ts | 80 +++++++ 16 files changed, 539 insertions(+), 3 deletions(-) create mode 100644 src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.html create mode 100644 src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.scss create mode 100644 src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.ts diff --git a/src/app/products/manage-delinquency-buckets/delinquency-bucket/create-bucket/create-bucket.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-bucket/create-bucket/create-bucket.component.ts index 9e3e84583..fb5046977 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-bucket/create-bucket/create-bucket.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-bucket/create-bucket/create-bucket.component.ts @@ -12,6 +12,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base'; @@ -59,6 +60,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; export class CreateBucketComponent implements OnInit { private formBuilder = inject(UntypedFormBuilder); private productsService = inject(ProductsService); + private alertService = inject(AlertService); private router = inject(Router); private route = inject(ActivatedRoute); dialog = inject(MatDialog); @@ -174,6 +176,15 @@ export class CreateBucketComponent implements OnInit { }; this.productsService.createDelinquencyBucket(data).subscribe((response: any) => { + // Maker-checker: the request waits in the Checker Inbox, so there is no bucket to open yet. + if (response?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency bucket request submitted for approval.' + }); + this.router.navigate(['../'], { relativeTo: this.route }); + return; + } this.router.navigate( [ '../', diff --git a/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.html b/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.html index 1088a50ab..7a26b5f79 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.html +++ b/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.html @@ -7,6 +7,8 @@ -->
+ +

diff --git a/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.ts index 00e11022e..24059b71f 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-bucket/delinquency-bucket.component.ts @@ -24,6 +24,7 @@ import { } from '@angular/material/table'; import { ActivatedRoute, RouterLink } from '@angular/router'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { DelinquencyPendingRequestsComponent } from '../pending-requests/delinquency-pending-requests.component'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @Component({ @@ -33,6 +34,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; imports: [ ...STANDALONE_SHARED_IMPORTS, FaIconComponent, + DelinquencyPendingRequestsComponent, MatTable, MatSort, MatColumnDef, diff --git a/src/app/products/manage-delinquency-buckets/delinquency-bucket/edit-bucket/edit-bucket.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-bucket/edit-bucket/edit-bucket.component.ts index 7272967f4..716396d55 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-bucket/edit-bucket/edit-bucket.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-bucket/edit-bucket/edit-bucket.component.ts @@ -12,6 +12,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { TranslateService } from '@ngx-translate/core'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.component'; import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base'; @@ -59,6 +60,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; export class EditBucketComponent implements OnInit { private formBuilder = inject(UntypedFormBuilder); private productsService = inject(ProductsService); + private alertService = inject(AlertService); private router = inject(Router); private route = inject(ActivatedRoute); dialog = inject(MatDialog); @@ -191,7 +193,14 @@ export class EditBucketComponent implements OnInit { ranges: ranges }; - this.productsService.updateDelinquencyBucket(this.delinquencyBucketId, data).subscribe(() => { + this.productsService.updateDelinquencyBucket(this.delinquencyBucketId, data).subscribe((response: any) => { + // Maker-checker: the change is applied only after a checker approves it. + if (response?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency bucket change submitted for approval.' + }); + } this.router.navigate(['../'], { relativeTo: this.route }); }); } diff --git a/src/app/products/manage-delinquency-buckets/delinquency-bucket/view-bucket/view-bucket.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-bucket/view-bucket/view-bucket.component.ts index ae086e225..08abc1ad2 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-bucket/view-bucket/view-bucket.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-bucket/view-bucket/view-bucket.component.ts @@ -10,6 +10,7 @@ import { Component, inject } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @@ -28,6 +29,7 @@ export class ViewBucketComponent { private router = inject(Router); private dialog = inject(MatDialog); private productsService = inject(ProductsService); + private alertService = inject(AlertService); /** Delinquency Bucket Data. */ delinquencyBucketData: any; @@ -47,7 +49,14 @@ export class ViewBucketComponent { }); dialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { - this.productsService.deleteDelinquencyBucket(this.delinquencyBucketData.id).subscribe(() => { + this.productsService.deleteDelinquencyBucket(this.delinquencyBucketData.id).subscribe((result: any) => { + // Maker-checker: the bucket is deleted only after a checker approves. + if (result?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency bucket delete request submitted for approval.' + }); + } this.router.navigate(['../'], { relativeTo: this.route }); }); } diff --git a/src/app/products/manage-delinquency-buckets/delinquency-range/create-range/create-range.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-range/create-range/create-range.component.ts index 8c0e5ce92..a58a558da 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-range/create-range/create-range.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-range/create-range/create-range.component.ts @@ -10,6 +10,7 @@ import { Component, OnInit, inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { SettingsService } from 'app/settings/settings.service'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @@ -24,6 +25,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; export class CreateRangeComponent implements OnInit { private formBuilder = inject(UntypedFormBuilder); private productsService = inject(ProductsService); + private alertService = inject(AlertService); private route = inject(ActivatedRoute); private router = inject(Router); private settingsService = inject(SettingsService); @@ -71,6 +73,15 @@ export class CreateRangeComponent implements OnInit { locale }; this.productsService.createDelinquencyRange(data).subscribe((response: any) => { + // Maker-checker: the request waits in the Checker Inbox, so there is no range to open yet. + if (response?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency range request submitted for approval.' + }); + this.router.navigate(['../'], { relativeTo: this.route }); + return; + } this.router.navigate( [ '../', diff --git a/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.html b/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.html index 4e56b3d84..3e2cdf8a5 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.html +++ b/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.html @@ -7,6 +7,8 @@ -->
+ +

diff --git a/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.ts index 41d218989..706f2c846 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-range/delinquency-range.component.ts @@ -24,6 +24,7 @@ import { } from '@angular/material/table'; import { ActivatedRoute, RouterLink } from '@angular/router'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; +import { DelinquencyPendingRequestsComponent } from '../pending-requests/delinquency-pending-requests.component'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @Component({ @@ -33,6 +34,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; imports: [ ...STANDALONE_SHARED_IMPORTS, FaIconComponent, + DelinquencyPendingRequestsComponent, MatTable, MatSort, MatColumnDef, diff --git a/src/app/products/manage-delinquency-buckets/delinquency-range/edit-range/edit-range.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-range/edit-range/edit-range.component.ts index a83a58af3..2aacfa487 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-range/edit-range/edit-range.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-range/edit-range/edit-range.component.ts @@ -10,6 +10,7 @@ import { Component, OnInit, inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators, ReactiveFormsModule } from '@angular/forms'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { SettingsService } from 'app/settings/settings.service'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @@ -24,6 +25,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; export class EditRangeComponent implements OnInit { private formBuilder = inject(UntypedFormBuilder); private productsService = inject(ProductsService); + private alertService = inject(AlertService); private route = inject(ActivatedRoute); private router = inject(Router); private settingsService = inject(SettingsService); @@ -78,6 +80,15 @@ export class EditRangeComponent implements OnInit { locale }; this.productsService.updateDelinquencyRange(this.delinquencyRangeData.id, data).subscribe((response: any) => { + // Maker-checker: the change is applied only after a checker approves it. + if (response?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency range change submitted for approval.' + }); + this.router.navigate(['../../'], { relativeTo: this.route }); + return; + } this.router.navigate( [ '../../', diff --git a/src/app/products/manage-delinquency-buckets/delinquency-range/view-range/view-range.component.ts b/src/app/products/manage-delinquency-buckets/delinquency-range/view-range/view-range.component.ts index 85a6a1e6c..810b80da9 100644 --- a/src/app/products/manage-delinquency-buckets/delinquency-range/view-range/view-range.component.ts +++ b/src/app/products/manage-delinquency-buckets/delinquency-range/view-range/view-range.component.ts @@ -10,6 +10,7 @@ import { Component, inject } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; import { ProductsService } from 'app/products/products.service'; +import { AlertService } from 'app/core/alert/alert.service'; import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; @@ -28,6 +29,7 @@ export class ViewRangeComponent { private router = inject(Router); private dialog = inject(MatDialog); private productsService = inject(ProductsService); + private alertService = inject(AlertService); /** Delinquency Range Data. */ delinquencyRangeData: any; @@ -44,7 +46,14 @@ export class ViewRangeComponent { }); dialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { - this.productsService.deleteDelinquencyRange(this.delinquencyRangeData.id).subscribe(() => { + this.productsService.deleteDelinquencyRange(this.delinquencyRangeData.id).subscribe((result: any) => { + // Maker-checker: the range is deleted only after a checker approves. + if (result?.rollbackTransaction) { + this.alertService.alert({ + type: 'Success', + message: 'Delinquency range delete request submitted for approval.' + }); + } this.router.navigate(['../'], { relativeTo: this.route }); }); } diff --git a/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.html b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.html new file mode 100644 index 000000000..537a2e6a2 --- /dev/null +++ b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.html @@ -0,0 +1,55 @@ + + +@if (rows.length > 0) { +
+
+ + {{ rows.length }} request{{ rows.length > 1 ? 's' : '' }} awaiting approval + These changes take effect only after a checker approves them. + Open Approvals → +
+ + + + + + + + + + + + @for (row of rows; track row.id) { + + + + + + + + } + +
ActionRecordWhat changesRequested byRequested on
+ {{ row.action }} + {{ row.subject }} + @if (row.changes.length > 0) { + @for (change of row.changes; track change.label) { +
+ {{ change.label }} + {{ change.oldValue }} + → + {{ change.newValue }} +
+ } + } @else { + {{ row.detail }} + } + 		{{ row.maker }}{{ row.madeOn | date: 'dd MMM yyyy, hh:mm a' }}
+
+} diff --git a/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.scss b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.scss new file mode 100644 index 000000000..e913e9bad --- /dev/null +++ b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.scss @@ -0,0 +1,108 @@ +/** + * 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/. + */ + +.dpr { + margin-bottom: 16px; + border: 1px solid #fcd34d; + border-radius: 10px; + background: #fffbeb; + overflow: hidden; + + &__head { + display: flex; + align-items: center; + gap: 10px; + padding: 10px 16px; + font-size: 13px; + color: #78350f; + + i { + color: #d97706; + } + } + + &__sub { + color: #92400e; + } + + &__link { + margin-left: auto; + font-weight: 600; + color: #92400e; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + + &__table { + width: 100%; + border-collapse: collapse; + font-size: 13px; + + th { + text-align: left; + padding: 8px 16px; + font-size: 11px; + letter-spacing: 0.05em; + text-transform: uppercase; + color: #92400e; + border-top: 1px solid #fde68a; + } + + td { + padding: 8px 16px; + border-top: 1px solid #fde68a; + color: #1e293b; + } + } + + &__change { + display: flex; + align-items: baseline; + gap: 8px; + padding: 2px 0; + } + + &__field { + min-width: 90px; + font-size: 12px; + color: #92400e; + } + + &__old { + padding: 0 6px; + border-radius: 4px; + background: #fee2e2; + color: #991b1b; + text-decoration: line-through; + } + + &__arrow { + color: #92400e; + } + + &__new { + padding: 0 6px; + border-radius: 4px; + background: #dcfce7; + color: #166534; + font-weight: 600; + } + + &__chip { + display: inline-block; + padding: 1px 10px; + border-radius: 999px; + background: #fef3c7; + color: #92400e; + font-size: 11px; + font-weight: 600; + } +} diff --git a/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.ts b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.ts new file mode 100644 index 000000000..34d471f4e --- /dev/null +++ b/src/app/products/manage-delinquency-buckets/pending-requests/delinquency-pending-requests.component.ts @@ -0,0 +1,210 @@ +/** + * 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, Input, OnInit, inject } from '@angular/core'; +import { DatePipe } from '@angular/common'; +import { RouterLink } from '@angular/router'; +import { Observable, forkJoin, of } from 'rxjs'; +import { catchError, map, switchMap } from 'rxjs/operators'; +import { ProductsService } from 'app/products/products.service'; + +/** One field that a pending request would change: what it is now, and what it would become. */ +interface PendingChange { + label: string; + oldValue: string; + newValue: string; +} + +interface PendingRow { + id: number; + action: string; + /** What the request is about, e.g. the range or bucket name. */ + subject: string; + /** UPDATE: the fields that move, old -> new. */ + changes: PendingChange[]; + /** CREATE / DELETE: a plain description of what is being added or removed. */ + detail: string; + maker: string; + madeOn: Date | null; +} + +/** + * Lists the Delinquency Range / Bucket requests that a maker has submitted and a checker has not yet + * approved. Without this the list pages look unchanged after a submit, so the maker cannot tell the + * request exists, what it would change, or where to approve it. + */ +@Component({ + selector: 'mifosx-delinquency-pending-requests', + templateUrl: './delinquency-pending-requests.component.html', + styleUrls: ['./delinquency-pending-requests.component.scss'], + imports: [ + DatePipe, + RouterLink + ] +}) +export class DelinquencyPendingRequestsComponent implements OnInit { + private productsService = inject(ProductsService); + + /** DELINQUENCY_RANGE or DELINQUENCY_BUCKET. */ + @Input({ required: true }) entityName: string; + + rows: PendingRow[] = []; + + ngOnInit(): void { + this.productsService + .getPendingMakerCheckerByEntity(this.entityName) + .pipe( + catchError(() => of([])), + switchMap((entries: any[]) => { + if (!entries || entries.length === 0) { + return of([] as PendingRow[]); + } + // The list call has no payload and no current values. The payload comes from the audit entry, + // and the current range or bucket from the normal read calls, so an UPDATE can show old -> new. + return forkJoin(entries.map((entry) => this.buildRow(entry))); + }) + ) + .subscribe((rows) => (this.rows = rows)); + } + + private buildRow(entry: any): Observable { + const isBucket = this.entityName === 'DELINQUENCY_BUCKET'; + const action = (entry.actionName ?? '').toUpperCase(); + const hasTarget = action !== 'CREATE' && entry.resourceId !== undefined && entry.resourceId !== null; + + const audit$ = this.productsService.getLoanRateRegisterAuditDetail(entry.id).pipe(catchError(() => of(null))); + const current$ = hasTarget + ? (isBucket + ? this.productsService.getDelinquencyBucket(entry.resourceId) + : this.productsService.getDelinquencyRange(entry.resourceId) + ).pipe(catchError(() => of(null))) + : of(null); + // Bucket ranges are stored and submitted as ids; the names come from the range list. + const ranges$ = isBucket ? this.productsService.getDelinquencyRanges().pipe(catchError(() => of([]))) : of([]); + + return forkJoin({ audit: audit$, current: current$, ranges: ranges$ }).pipe( + map(({ audit, current, ranges }) => { + let payload: any = null; + try { + payload = audit?.commandAsJson ? JSON.parse(audit.commandAsJson) : null; + } catch { + payload = null; + } + const rangesById = new Map( + (ranges ?? []).map((range: any) => [ + Number(range.id), + range + ]) + ); + const row: PendingRow = { + id: entry.id, + action, + subject: '', + changes: [], + detail: '', + maker: entry.maker, + madeOn: entry.madeOnDate ? new Date(Number(entry.madeOnDate) * 1000) : null + }; + if (isBucket) { + this.fillBucket(row, action, payload, current, rangesById); + } else { + this.fillRange(row, action, payload, current); + } + if (!row.subject) { + row.subject = entry.resourceId ? `#${entry.resourceId}` : '—'; + } + return row; + }) + ); + } + + private fillRange(row: PendingRow, action: string, payload: any, current: any): void { + const describe = (range: any) => + `${range.classification} (${range.minimumAgeDays} - ${range.maximumAgeDays ?? 'no limit'} days)`; + if (action === 'CREATE' && payload) { + row.subject = payload.classification ?? ''; + row.detail = `New range: ${describe(payload)}`; + } else if (action === 'DELETE' && current) { + row.subject = current.classification ?? ''; + row.detail = `Range to be deleted: ${describe(current)}`; + } else if (action === 'UPDATE' && current) { + row.subject = current.classification ?? ''; + const fields: [string, string][] = [ + [ + 'classification', + 'Classification' + ], + [ + 'minimumAgeDays', + 'Days from' + ], + [ + 'maximumAgeDays', + 'Days till' + ] + ]; + row.changes = this.diff(fields, payload, current); + if (row.changes.length === 0) { + row.detail = 'No field value changes'; + } + } + } + + private fillBucket(row: PendingRow, action: string, payload: any, current: any, rangesById: Map): void { + const names = (ids: any[]) => + (ids ?? []) + .map((entry) => rangesById.get(Number(entry?.id ?? entry)) ?? { id: Number(entry?.id ?? entry) }) + .sort((a, b) => (a.minimumAgeDays ?? 0) - (b.minimumAgeDays ?? 0)) + .map((range) => range.classification ?? `Range #${range.id}`) + .join(', '); + if (action === 'CREATE' && payload) { + row.subject = payload.name ?? ''; + row.detail = `New bucket with ranges: ${names(payload.ranges) || '—'}`; + } else if (action === 'DELETE' && current) { + row.subject = current.name ?? ''; + row.detail = `Bucket to be deleted (ranges: ${names(current.ranges) || '—'})`; + } else if (action === 'UPDATE' && current && payload) { + row.subject = current.name ?? ''; + const before = { name: current.name, ranges: names(current.ranges) }; + const after = { name: payload.name ?? current.name, ranges: names(payload.ranges ?? current.ranges) }; + row.changes = this.diff( + [ + [ + 'name', + 'Name' + ], + [ + 'ranges', + 'Ranges' + ] + ], + after, + before + ); + if (row.changes.length === 0) { + row.detail = 'No field value changes'; + } + } + } + + /** The fields whose submitted value differs from today's. */ + private diff(fields: [string, string][], submitted: any, current: any): PendingChange[] { + return fields + .filter(([key]) => submitted && submitted[key] !== undefined && String(submitted[key]) !== String(current?.[key])) + .map( + ([ + key, + label + ]) => ({ + label, + oldValue: String(current?.[key] ?? '—'), + newValue: String(submitted[key]) + }) + ); + } +} diff --git a/src/app/products/products.service.ts b/src/app/products/products.service.ts index 8c5759a99..779a0d773 100644 --- a/src/app/products/products.service.ts +++ b/src/app/products/products.service.ts @@ -830,6 +830,12 @@ export class ProductsService { return this.http.get('/makercheckers', { params, context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); } + /** Requests of one entity (e.g. DELINQUENCY_RANGE) still awaiting a checker. */ + getPendingMakerCheckerByEntity(entityName: string): Observable { + const params = new HttpParams().set('entityName', entityName); + return this.http.get('/makercheckers', { params, context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); + } + /** Full maker-checker entry, including the submitted payload (commandAsJson), which the list call omits. */ getLoanRateRegisterAuditDetail(id: number): Observable { return this.http.get(`/audits/${id}`, { context: new HttpContext().set(SILENT_HTTP_ERROR, true) }); diff --git a/src/app/tasks/maker-checker-entity-fetch.ts b/src/app/tasks/maker-checker-entity-fetch.ts index bc0814747..a9d7845e2 100644 --- a/src/app/tasks/maker-checker-entity-fetch.ts +++ b/src/app/tasks/maker-checker-entity-fetch.ts @@ -63,6 +63,9 @@ const ENTITY_FETCHERS: Record Ob FIXEDDEPOSITPRODUCT: (id, s) => s.products.getFixedDepositProductAndTemplate(id), RECURRINGDEPOSITPRODUCT: (id, s) => s.products.getRecurringDepositProduct(id, true), CHARGE: (id, s) => s.products.getCharge(id, true), + // SMA / NPA classification master. The bucket is read as-is; the dialog resolves its range ids to names. + DELINQUENCY_RANGE: (id, s) => s.products.getDelinquencyRange(id), + DELINQUENCY_BUCKET: (id, s) => s.products.getDelinquencyBucket(id), // ---- Accounts ---------------------------------------------------------------- SAVINGSACCOUNT: (id, s) => s.savings.getSavingsAccountData(id), @@ -199,6 +202,12 @@ const DELETE_SUMMARY_KEYS: Record = { 'email', 'officeName' ], + DELINQUENCY_RANGE: [ + 'classification', + 'minimumAgeDays', + 'maximumAgeDays' + ], + DELINQUENCY_BUCKET: ['name'], GLACCOUNT: [ 'name', 'glCode', diff --git a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts index e2b7b1aef..22a4a07b5 100644 --- a/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts +++ b/src/app/tasks/view-checker-inbox/view-checker-inbox.component.ts @@ -10,6 +10,7 @@ import { Component, inject } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import * as _ from 'lodash'; +import { forkJoin } from 'rxjs'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; /** Custom Services */ @@ -417,6 +418,9 @@ export class ViewCheckerInboxComponent { if ((detail?.entityName ?? '').toUpperCase() === 'GLACCOUNT') { this.resolveGlAccountCreateLabels(detail, this.jsondata); } + if ((detail?.entityName ?? '').toUpperCase() === 'DELINQUENCY_BUCKET') { + this.resolveDelinquencyBucketCreateRanges(detail); + } } } @@ -429,6 +433,10 @@ export class ViewCheckerInboxComponent { * entity showed before. */ private loadUpdateChanges(detail: any): void { + if ((detail?.entityName ?? '').toUpperCase() === 'DELINQUENCY_BUCKET') { + this.loadDelinquencyBucketChanges(detail); + return; + } const request$ = fetchCurrentEntity(detail?.entityName, detail?.resourceId, this.entityFetchServices); if (!request$) { return; @@ -451,6 +459,78 @@ export class ViewCheckerInboxComponent { }); } + /** One line per range for a delinquency bucket, e.g. 'SMA-1 (31 - 60 days)', oldest range first. */ + private delinquencyRangeNames(ids: any[], rangesById: Map): string { + return (ids ?? []) + .map((entry) => rangesById.get(Number(entry?.id ?? entry)) ?? { id: Number(entry?.id ?? entry) }) + .sort((a, b) => (a.minimumAgeDays ?? 0) - (b.minimumAgeDays ?? 0)) + .map((range) => + range.classification + ? `${range.classification} (${range.minimumAgeDays} - ${range.maximumAgeDays ?? 'no limit'} days)` + : `Range #${range.id}` + ) + .join(', '); + } + + /** + * Delinquency bucket UPDATE: the payload lists range ids, which mean nothing to a checker, and the stored + * bucket lists range objects, so a plain field diff would show two unreadable lists. Both sides are turned + * into the same readable range names first, so only a real difference is reported as OLD -> NEW. + */ + private loadDelinquencyBucketChanges(detail: any): void { + this.comparing = true; + forkJoin({ + current: this.productsService.getDelinquencyBucket(detail?.resourceId), + ranges: this.productsService.getDelinquencyRanges() + }).subscribe({ + next: ({ current, ranges }: { current: any; ranges: any }) => { + if (!this.isCurrent(detail)) { + return; + } + this.comparing = false; + const rangesById = new Map( + (ranges ?? []).map((range: any) => [ + Number(range.id), + range + ]) + ); + const submitted = { + ...(this.jsondata ?? {}), + ranges: this.delinquencyRangeNames(this.jsondata?.ranges, rangesById) + }; + const existing = { ...(current ?? {}), ranges: this.delinquencyRangeNames(current?.ranges, rangesById) }; + this.changes = diffCommandAgainstEntity(submitted, existing); + this.showChanges = true; + }, + error: () => { + this.comparing = false; + } + }); + } + + /** Delinquency bucket CREATE: show the chosen ranges by name instead of their ids. */ + private resolveDelinquencyBucketCreateRanges(detail: any): void { + this.productsService.getDelinquencyRanges().subscribe({ + next: (ranges: any) => { + if (!this.isCurrent(detail)) { + return; + } + const rangesById = new Map( + (ranges ?? []).map((range: any) => [ + Number(range.id), + range + ]) + ); + const resolved = { + ...(this.jsondata ?? {}), + ranges: this.delinquencyRangeNames(this.jsondata?.ranges, rangesById) + }; + this.createSections = this.buildCreateSections(resolved); + this.commandFields = this.buildCommandFields(resolved); + } + }); + } + /** * Loan Base Interest Rate: every submission is a CREATE of a whole new version (16 loan types x 10 * slabs plus CIBIL bands), so the raw payload hides the handful of rates the maker actually moved. From 606d14b9959c568ae6779f0979b2de00d7c86bbe Mon Sep 17 00:00:00 2001 From: Sonali Likhitkar Date: Mon, 12 Oct 2026 15:53:43 +0530 Subject: [PATCH 3/3] feat(loan-products): build out Loans A/C (EMI) stepper and wire it to the rate register Adds the curated Loans A/C steps (security/collateral, amount & tenure, repayment & EMI, interest, prepayment & closure) and a product-type picker (loan-product-types.ts) shared by the create wizard, product list and account picker. The interest step and a new register-rate-view read the live Loan Interest Rate Register for a product's chart/CIBIL rate instead of a hardcoded value, and a new loan-product-catalog service + template card back the loan account stepper's product pick. Also carries forward in-progress Loan Interest Rate Register UI work: an inline Add Slab panel (replacing window.prompt) and a Submit Details dialog for confirming name/effective dates before submitting for approval. Co-Authored-By: Claude Sonnet 5 --- .../loan-product-template-card.component.html | 43 +++ .../loan-product-template-card.component.scss | 52 ++++ .../loan-product-template-card.component.ts | 37 +++ .../loans-account-details-step.component.ts | 69 ++++- .../services/loan-product-catalog.service.ts | 48 ++++ .../edit-register.component.html | 23 +- .../edit-register.component.scss | 6 + .../edit-register/edit-register.component.ts | 57 +++- ...loan-interest-rate-register.component.html | 2 +- .../preview-register.component.ts | 34 +++ .../rate-register.service.ts | 7 +- .../submit-details-dialog.component.ts | 139 +++++++++ .../create-loan-product.component.html | 79 +++++- .../create-loan-product.component.ts | 267 +++++++++++++++++- .../loan-product-stepper/advance-steps.scss | 42 +++ ...oduct-advance-interest-step.component.html | 36 +-- ...product-advance-interest-step.component.ts | 53 +++- .../loan-product-details-step.component.ts | 32 +-- ...uct-loan-amount-tenure-step.component.html | 150 ++++++++++ ...oduct-loan-amount-tenure-step.component.ts | 106 +++++++ ...-product-loan-interest-step.component.html | 161 +++++++++++ ...an-product-loan-interest-step.component.ts | 188 ++++++++++++ ...roduct-loan-prepayment-step.component.html | 144 ++++++++++ ...-product-loan-prepayment-step.component.ts | 117 ++++++++ ...product-loan-repayment-step.component.html | 155 ++++++++++ ...n-product-loan-repayment-step.component.ts | 129 +++++++++ ...-product-loan-security-step.component.html | 130 +++++++++ ...an-product-loan-security-step.component.ts | 127 +++++++++ .../register-rate-view.component.html | 97 +++++++ .../register-rate-view.component.scss | 106 +++++++ .../register-rate-view.component.ts | 220 +++++++++++++++ .../loan-products/loan-product-types.ts | 64 +++++ .../loan-products.component.scss | 46 +++ .../loan-products/loan-products.component.ts | 70 ++++- .../products/loan-products/loan-products.ts | 27 +- src/environments/.env.ts | 4 +- 36 files changed, 2967 insertions(+), 100 deletions(-) create mode 100644 src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.html create mode 100644 src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.scss create mode 100644 src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.ts create mode 100644 src/app/loans/services/loan-product-catalog.service.ts create mode 100644 src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts create mode 100644 src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.html create mode 100644 src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.scss create mode 100644 src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.ts create mode 100644 src/app/products/loan-products/loan-product-types.ts diff --git a/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.html b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.html new file mode 100644 index 000000000..20170e15f --- /dev/null +++ b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.html @@ -0,0 +1,43 @@ + + +@if (product) { +
+
+ {{ product.name }} + {{ category }} + {{ type }} +
+
+
+ Amount + + @if (product.minPrincipal != null || product.maxPrincipal != null) { + {{ product.minPrincipal | number: '1.0-0' }} – {{ product.maxPrincipal | number: '1.0-0' }} + } @else { + — + } + +
+
+ Tenure (repayments) + + @if (product.minNumberOfRepayments != null || product.maxNumberOfRepayments != null) { + {{ product.minNumberOfRepayments }} – {{ product.maxNumberOfRepayments }} + } @else { + — + } + +
+
+ Short name + {{ product.shortName || '—' }} +
+
+
+} diff --git a/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.scss b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.scss new file mode 100644 index 000000000..3e4824e67 --- /dev/null +++ b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.scss @@ -0,0 +1,52 @@ +/** + * 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/. + */ + +.lptc { + margin: 4px 0 16px; + padding: 12px 16px; + border: 1px solid #bae6fd; + border-radius: 8px; + background: #f0f9ff; + + &__head { + display: flex; + align-items: center; + gap: 8px; + margin-bottom: 8px; + } + + &__chip { + padding: 1px 10px; + border-radius: 999px; + background: #e0f2fe; + color: #075985; + font-size: 12px; + font-weight: 600; + + &--type { + background: #ede9fe; + color: #5b21b6; + } + } + + &__grid { + display: grid; + grid-template-columns: repeat(3, minmax(0, 1fr)); + gap: 8px 16px; + font-size: 13px; + color: #1e293b; + } + + &__label { + display: block; + font-size: 11px; + letter-spacing: 0.04em; + text-transform: uppercase; + color: #64748b; + } +} diff --git a/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.ts b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.ts new file mode 100644 index 000000000..be03d6c85 --- /dev/null +++ b/src/app/loans/loans-account-stepper/loan-product-template-card/loan-product-template-card.component.ts @@ -0,0 +1,37 @@ +/** + * 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, Input } from '@angular/core'; +import { DecimalPipe } from '@angular/common'; +import { productCategoryLabel, productTypeLabel } from 'app/products/loan-products/loan-product-types'; + +/** + * The product picked on the loan account form, summarised with its category, type and the main limits, so the + * officer can see what the account will be opened under before going on. + */ +@Component({ + selector: 'mifosx-loan-product-template-card', + templateUrl: './loan-product-template-card.component.html', + styleUrls: ['./loan-product-template-card.component.scss'], + imports: [DecimalPipe] +}) +export class LoanProductTemplateCardComponent { + /** A product from the catalogue (the list shape), or undefined when none is picked. */ + @Input() product: any; + + get category(): string { + return productCategoryLabel(this.product?.advanceExtensions?.productTypeGroup); + } + + get type(): string { + return productTypeLabel( + this.product?.advanceExtensions?.productTypeGroup, + this.product?.advanceExtensions?.productTypeSubGroup + ); + } +} diff --git a/src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.ts index 8d649088c..e60f519d1 100644 --- a/src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.ts +++ b/src/app/loans/loans-account-stepper/loans-account-details-step/loans-account-details-step.component.ts @@ -32,6 +32,9 @@ import { MatCheckbox } from '@angular/material/checkbox'; import { MatStepperPrevious, MatStepperNext } from '@angular/material/stepper'; import { FaIconComponent } from '@fortawesome/angular-fontawesome'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { LoanProductCatalogService } from '../../services/loan-product-catalog.service'; +import { LoanProductTemplateCardComponent } from '../loan-product-template-card/loan-product-template-card.component'; +import { PRODUCT_SUB_TYPES, PRODUCT_TYPE_GROUPS } from 'app/products/loan-products/loan-product-types'; /** * Loans Account Details Step @@ -49,7 +52,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; MatStepperPrevious, FaIconComponent, MatStepperNext, - AsyncPipe + AsyncPipe, + LoanProductTemplateCardComponent ] }) export class LoansAccountDetailsStepComponent implements OnInit, OnDestroy { @@ -59,6 +63,7 @@ export class LoansAccountDetailsStepComponent implements OnInit, OnDestroy { private translateService = inject(TranslateService); private settingsService = inject(SettingsService); private commons = inject(Commons); + private catalog = inject(LoanProductCatalogService); //** Defining PlaceHolders for the search bar */ placeHolderLabel = ''; @@ -88,6 +93,27 @@ export class LoansAccountDetailsStepComponent implements OnInit, OnDestroy { loanId: any = null; + /** Category and product type narrow the product picker to the active products of that kind. */ + readonly categories = PRODUCT_TYPE_GROUPS; + categoryFilter = ''; + typeFilter = ''; + /** Ids of the products active today; null until read, or if the read failed (then nothing is hidden). */ + private activeProductIds: Set | null = null; + /** Every product from the template, before any filter. */ + private allProducts: any[] = []; + + /** Types offered for the chosen category; every type when no category is chosen. */ + get typeOptions() { + return this.categoryFilter + ? (PRODUCT_SUB_TYPES[this.categoryFilter] ?? []) + : Object.values(PRODUCT_SUB_TYPES).flat(); + } + + /** The product picked in the form, with its category and type, for the template card. */ + get selectedProduct(): any { + return this.catalog.get(this.loansAccountDetailsForm?.get('productId')?.value); + } + loanProductSelected = false; /** Currency data. */ protected productData: ReplaySubject = new ReplaySubject(1); @@ -115,7 +141,8 @@ export class LoansAccountDetailsStepComponent implements OnInit, OnDestroy { this.maxDate = this.settingsService.maxFutureDate; this.buildDependencies(); if (this.loansAccountTemplate) { - this.productList = this.loansAccountTemplate.productOptions.sort(this.commons.dynamicSort('name')); + this.allProducts = this.loansAccountTemplate.productOptions.sort(this.commons.dynamicSort('name')); + this.productList = this.allProducts; if (this.loansAccountTemplate.loanProductId) { this.loansAccountDetailsForm.patchValue({ productId: this.loansAccountTemplate.loanProductId, @@ -136,6 +163,44 @@ export class LoansAccountDetailsStepComponent implements OnInit, OnDestroy { this.searchItem(); }); this.productData.next(this.productList.slice()); + this.loadActiveProducts(); + } + + /** + * A new account can only be opened on a product that is active today, and the picker can be narrowed by category + * and type. Editing an existing account keeps every product, since its own product may have closed since. + */ + private loadActiveProducts(): void { + if (this.loanId) { + return; + } + this.catalog.activeProducts().subscribe((products) => { + this.activeProductIds = products.length > 0 ? new Set(products.map((product) => Number(product.id))) : null; + this.applyProductFilters(); + }); + } + + onCategoryChange(): void { + // A type belongs to one category, so a type from another category cannot stay selected. + if (this.typeFilter && !this.typeOptions.some((type) => type.id === this.typeFilter)) { + this.typeFilter = ''; + } + this.applyProductFilters(); + } + + /** Rebuilds the product list from the template: active only, then category and type, then the search text. */ + applyProductFilters(): void { + this.productList = this.allProducts.filter((product: any) => { + if (this.activeProductIds && !this.activeProductIds.has(Number(product.id))) { + return false; + } + const ext = this.catalog.classification(product.id); + if (this.categoryFilter && ext['productTypeGroup'] !== this.categoryFilter) { + return false; + } + return !this.typeFilter || ext['productTypeSubGroup'] === this.typeFilter; + }); + this.searchItem(); } ngOnDestroy(): void { diff --git a/src/app/loans/services/loan-product-catalog.service.ts b/src/app/loans/services/loan-product-catalog.service.ts new file mode 100644 index 000000000..907847faf --- /dev/null +++ b/src/app/loans/services/loan-product-catalog.service.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, inject } from '@angular/core'; +import { Observable, of } from 'rxjs'; +import { catchError, map, tap } from 'rxjs/operators'; +import { ProductsService } from 'app/products/products.service'; + +/** + * Read-only view of the loan product catalogue for the loan account screens: which products are active today and + * what category and type each one is. Reads the normal product list once; the category and type of each product + * come from the classification the list carries (`advanceExtensions`). + */ +@Injectable({ + providedIn: 'root' +}) +export class LoanProductCatalogService { + private productsService = inject(ProductsService); + + private byId = new Map(); + + /** + * The products that are active today. Also remembers every product it saw, so `get` and `classification` can + * answer for them afterwards. An empty list on failure, so the picker never ends up with nothing to choose. + */ + activeProducts(): Observable { + return this.productsService.getLoanProducts().pipe( + tap((products: any[]) => (products ?? []).forEach((product) => this.byId.set(Number(product.id), product))), + map((products: any[]) => (products ?? []).filter((product) => product?.status === 'loanProduct.active')), + catchError(() => of([])) + ); + } + + /** A product seen by `activeProducts`, or undefined before it ran or for an unknown id. */ + get(productId: any): any { + return this.byId.get(Number(productId)); + } + + /** The product's category and type (`productTypeGroup`, `productTypeSubGroup`, ...), empty when it has none. */ + classification(productId: any): Record { + return this.get(productId)?.advanceExtensions ?? {}; + } +} diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html index 0ec403f4b..35c9f7843 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.html @@ -27,7 +27,7 @@
- +
@@ -84,6 +84,27 @@
{{ addProductError }}
+
+
Add amount slab
+
+
+ + +
+
+ + +
+ + +
+
The new slab is added as the last column; fill in its rates for each product.
+
{{ addSlabError }}
+
diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss index 476337e6e..25e958ccc 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.scss @@ -137,6 +137,12 @@ } } + &__add-hint { + margin-top: 8px; + font-size: 12px; + color: #64748b; + } + &__add-error { margin-top: 8px; font-size: 12px; diff --git a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts index 95472abde..1900d114c 100644 --- a/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts +++ b/src/app/products/loan-interest-rate-register/edit-register/edit-register.component.ts @@ -227,6 +227,7 @@ export class EditRegisterComponent implements OnInit, OnDestroy { if (!this.canEdit) { return; } + this.addingSlab = false; this.addingProduct = true; this.newProductName = ''; this.newProductGl = null; @@ -271,23 +272,67 @@ export class EditRegisterComponent implements OnInit, OnDestroy { } } - /** Append a new amount slab column; every existing row grows by one blank cell. */ + /** "Add slab" panel state. A slab is an amount band; at least a label or an upper limit is needed. */ + addingSlab = false; + newSlabLabel = ''; + newSlabAmount: number | null = null; + addSlabError = ''; + + /** Opens the Add slab panel. */ addSlab(): void { if (!this.canEdit) { return; } - const label = window.prompt('Slab label (e.g. "Upto 50,00,000" or "> 50,00,000")', 'New slab'); + this.addingProduct = false; + this.addingSlab = true; + this.newSlabLabel = ''; + this.newSlabAmount = null; + this.addSlabError = ''; + } + + cancelAddSlab(): void { + this.addingSlab = false; + this.addSlabError = ''; + } + + /** Label that is filled in for a slab when only the upper limit is given, e.g. "Upto 50,00,000". */ + suggestedSlabLabel(): string { + const amount = this.newSlabAmount; + return amount != null && Number.isFinite(amount) && amount > 0 ? `Upto ${amount.toLocaleString('en-IN')}` : ''; + } + + /** Append the new amount slab as the last column; every existing row grows by one blank cell. */ + confirmAddSlab(): void { + const amount = this.newSlabAmount; + const hasAmount = amount != null && String(amount) !== ''; + if (hasAmount && (!Number.isFinite(amount) || (amount as number) <= 0)) { + this.addSlabError = 'The upper limit must be a number greater than 0.'; + return; + } + const label = this.newSlabLabel.trim() || this.suggestedSlabLabel(); if (!label) { + this.addSlabError = 'Enter a label, or an upper limit to build one from.'; + return; + } + if (this.slabs.some((s) => s.label.trim().toLowerCase() === label.toLowerCase())) { + this.addSlabError = 'A slab with this label already exists.'; + return; + } + if (hasAmount && this.slabs.some((s) => s.amountUpto === amount)) { + this.addSlabError = 'A slab with this upper limit already exists.'; + return; + } + if (!hasAmount && this.slabs.some((s) => s.amountUpto === null)) { + this.addSlabError = 'An open-ended slab (no upper limit) already exists.'; return; } - const amountText = window.prompt('Amount upper bound in ₹ (leave blank for no cap)', ''); - const amountUpto = amountText && amountText.trim() ? Number(amountText) : null; this.slabs.push({ key: `s_${Date.now()}`, - label: label.trim(), - amountUpto: amountUpto !== null && !Number.isFinite(amountUpto) ? null : amountUpto + label, + amountUpto: hasAmount ? (amount as number) : null }); this.rows.forEach((r) => r.rates.push(null)); + this.cancelAddSlab(); } editCibil(): void { diff --git a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html index dd57f3b14..cf9e44f33 100644 --- a/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html +++ b/src/app/products/loan-interest-rate-register/loan-interest-rate-register.component.html @@ -71,7 +71,7 @@ > - {{ r.name }} + {{ r.name || '(Untitled draft)' }} {{ statusLabel(r.status) }} diff --git a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts index 6614572f5..71e7c00b5 100644 --- a/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts +++ b/src/app/products/loan-interest-rate-register/preview-register/preview-register.component.ts @@ -11,6 +11,12 @@ import { CommonModule } from '@angular/common'; import { ActivatedRoute, Router } from '@angular/router'; import { MatButtonModule } from '@angular/material/button'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { MatDialog } from '@angular/material/dialog'; +import { + SubmitDetailsData, + SubmitDetailsDialogComponent, + SubmitDetailsResult +} from '../submit-details-dialog/submit-details-dialog.component'; import { RateRegisterService } from '../rate-register.service'; import { CibilSlab, RateChartRow, RateRegister, SlabColumn } from '../models/rate-register.model'; import { RateRegisterDiffComponent } from '../rate-register-diff/rate-register-diff.component'; @@ -41,6 +47,7 @@ export class PreviewRegisterComponent implements OnInit { private readonly route = inject(ActivatedRoute); private readonly router = inject(Router); private readonly snack = inject(MatSnackBar); + private readonly dialog = inject(MatDialog); draft!: RateRegister; active?: RateRegister; @@ -98,6 +105,33 @@ export class PreviewRegisterComponent implements OnInit { if (this.submitting) { return; } + const ref = this.dialog.open( + SubmitDetailsDialogComponent, + { + width: '520px', + maxWidth: '95vw', + data: { + name: this.draft.name, + effectiveFrom: this.draft.effectiveFrom, + effectiveTo: this.draft.effectiveTo ?? '', + activeName: this.active && this.active.id !== this.draft.id ? this.active.name : undefined, + activeFrom: this.active && this.active.id !== this.draft.id ? this.active.effectiveFrom : undefined + } + } + ); + ref.afterClosed().subscribe((details) => { + if (!details) { + return; + } + this.draft.name = details.name; + this.draft.effectiveFrom = details.effectiveFrom; + this.draft.effectiveTo = details.effectiveTo || null; + this.service.saveDrafts(); + this.send(); + }); + } + + private send(): void { this.submitting = true; this.service.submitForApproval(this.draft.id).subscribe({ next: (res) => { diff --git a/src/app/products/loan-interest-rate-register/rate-register.service.ts b/src/app/products/loan-interest-rate-register/rate-register.service.ts index 9230ad7a5..16dfa332c 100644 --- a/src/app/products/loan-interest-rate-register/rate-register.service.ts +++ b/src/app/products/loan-interest-rate-register/rate-register.service.ts @@ -425,9 +425,10 @@ export class RateRegisterService { const today = new Date().toISOString().slice(0, 10); const copy: RateRegister = { id: newId, - name: `${source.name} — new version`, - effectiveFrom: source.effectiveFrom, - effectiveTo: source.effectiveTo, + // Left blank on purpose: the maker enters name and dates in the submit popup. + name: '', + effectiveFrom: '', + effectiveTo: null, currency: source.currency, status: 'Draft', createdBy: 'Current User', diff --git a/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts b/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts new file mode 100644 index 000000000..e815d80f3 --- /dev/null +++ b/src/app/products/loan-interest-rate-register/submit-details-dialog/submit-details-dialog.component.ts @@ -0,0 +1,139 @@ +/** + * 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 { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { MatButtonModule } from '@angular/material/button'; + +export interface SubmitDetailsData { + name: string; + effectiveFrom: string; + effectiveTo: string; + /** Active version this one replaces, shown as context. */ + activeName?: string; + activeFrom?: string; +} + +export interface SubmitDetailsResult { + name: string; + effectiveFrom: string; + effectiveTo: string; +} + +/** Asks the maker for the version details (name, effective from / to) just before sending for approval. */ +@Component({ + selector: 'mifosx-submit-details-dialog', + imports: [ + CommonModule, + FormsModule, + MatDialogModule, + MatButtonModule + ], + template: ` +

Version details

+ +

+ Confirm these details before sending the rate register for approval. + It will replace {{ data.activeName }} (effective {{ data.activeFrom }}) once approved. +

+
+ + +
+
+
+ + +
+
+ + +
+
+
{{ error }}
+ + + + + + `, + styles: [ + ` + .sd { + min-width: 460px; + display: flex; + flex-direction: column; + gap: 12px; + } + .sd__hint { + margin: 0; + font-size: 12px; + color: #64748b; + } + .sd__row { + display: flex; + gap: 12px; + } + .sd__field { + display: flex; + flex-direction: column; + flex: 1; + } + .sd__field label { + font-size: 10px; + font-weight: 600; + color: #64748b; + letter-spacing: 0.3px; + margin-bottom: 3px; + } + .sd__field input { + height: 34px; + border: 1px solid #cbd5e1; + border-radius: 6px; + padding: 0 10px; + font-size: 13px; + font-family: inherit; + } + .sd__error { + font-size: 12px; + color: #b91c1c; + } + ` + ] +}) +export class SubmitDetailsDialogComponent { + readonly ref = inject>(MatDialogRef); + readonly data = inject(MAT_DIALOG_DATA); + + name = this.data.name; + effectiveFrom = this.data.effectiveFrom; + effectiveTo = this.data.effectiveTo; + error = ''; + + confirm(): void { + const name = this.name.trim(); + if (!name) { + this.error = 'Enter the register name.'; + return; + } + if (!this.effectiveFrom) { + this.error = 'Select the effective from date.'; + return; + } + if (this.effectiveTo && this.effectiveTo < this.effectiveFrom) { + this.error = 'Effective to cannot be before effective from.'; + return; + } + this.ref.close({ name, effectiveFrom: this.effectiveFrom, effectiveTo: this.effectiveTo }); + } +} diff --git a/src/app/products/loan-products/create-loan-product/create-loan-product.component.html b/src/app/products/loan-products/create-loan-product/create-loan-product.component.html index abc3da5c8..d900c8414 100644 --- a/src/app/products/loan-products/create-loan-product/create-loan-product.component.html +++ b/src/app/products/loan-products/create-loan-product/create-loan-product.component.html @@ -75,7 +75,10 @@ INTEREST
- +
@@ -114,6 +117,77 @@ } } + @if (isLoanAccount) { + + + + SECURITY & COLLATERAL + +
+ +
+ + + + + + AMOUNT & TENURE + +
+ +
+ + + + + + REPAYMENT & EMI + +
+ +
+ + + + + + INTEREST + +
+ +
+ + + + + + PENAL & NPA + +
+ +
+ + + + + + PREPAYMENT & CLOSURE + +
+ +
+ + } + + @@ -193,6 +268,7 @@ + diff --git a/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts b/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts index 50c14db3b..005e57c45 100644 --- a/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts +++ b/src/app/products/loan-products/create-loan-product/create-loan-product.component.ts @@ -24,6 +24,11 @@ import { LoanProductSettingsStepComponent } from '../loan-product-stepper/loan-p import { LoanProductChargesStepComponent } from '../loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component'; import { LoanProductAccountingStepComponent } from '../loan-product-stepper/loan-product-accounting-step/loan-product-accounting-step.component'; import { LoanProductInterestRefundStepComponent } from '../loan-product-stepper/loan-product-interest-refund-step/loan-product-interest-refund-step.component'; +import { LoanProductLoanSecurityStepComponent } from '../loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component'; +import { LoanProductLoanAmountTenureStepComponent } from '../loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component'; +import { LoanProductLoanRepaymentStepComponent } from '../loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component'; +import { LoanProductLoanInterestStepComponent } from '../loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component'; +import { LoanProductLoanPrepaymentStepComponent } from '../loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component'; /** Custom Services */ import { ProductsService } from 'app/products/products.service'; @@ -63,12 +68,18 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; LoanProductPenalNpaStepComponent, LoanProductRenewalClosureStepComponent, LoanProductChequeBookStepComponent, - LoanProductSettingsStepComponent, - LoanProductInterestRefundStepComponent, - LoanProductPaymentStrategyStepComponent, - LoanProductTermsStepComponent, + LoanProductLoanSecurityStepComponent, + LoanProductLoanAmountTenureStepComponent, + LoanProductLoanRepaymentStepComponent, + LoanProductLoanInterestStepComponent, + LoanProductLoanPrepaymentStepComponent, + // Old Loans A/C path — commented out for now (its tabs are commented out in the template): + // LoanProductSettingsStepComponent, + // LoanProductInterestRefundStepComponent, + // LoanProductPaymentStrategyStepComponent, + // LoanProductTermsStepComponent, + // LoanProductDeferredIncomeRecognitionStepComponent, LoanProductChargesStepComponent, - LoanProductDeferredIncomeRecognitionStepComponent, LoanProductAccountingStepComponent, LoanProductPreviewStepComponent ] @@ -97,6 +108,18 @@ export class CreateLoanProductComponent implements OnInit { loanProductRenewalClosureStep: LoanProductRenewalClosureStepComponent; @ViewChild(LoanProductChequeBookStepComponent) loanProductChequeBookStep: LoanProductChequeBookStepComponent; + // Conditional tabs (Loans A/C only): resolved after the @if renders them. + @ViewChild(LoanProductLoanSecurityStepComponent) + loanProductLoanSecurityStep: LoanProductLoanSecurityStepComponent; + @ViewChild(LoanProductLoanAmountTenureStepComponent) + loanProductLoanAmountTenureStep: LoanProductLoanAmountTenureStepComponent; + @ViewChild(LoanProductLoanRepaymentStepComponent) + loanProductLoanRepaymentStep: LoanProductLoanRepaymentStepComponent; + @ViewChild(LoanProductLoanInterestStepComponent) + loanProductLoanInterestStep: LoanProductLoanInterestStepComponent; + @ViewChild(LoanProductLoanPrepaymentStepComponent) + loanProductLoanPrepaymentStep: LoanProductLoanPrepaymentStepComponent; + /** Charges step needs a real control; Settings is absent on the Advances path, so fall back to this. */ readonly multiDisburseFallback = new UntypedFormControl(false); @ViewChild(LoanProductInterestRefundStepComponent, { static: true }) @@ -179,6 +202,11 @@ export class CreateLoanProductComponent implements OnInit { return this.isAdvanceProduct && !!this.loanProductAdvanceLimitTenureStep?.isOverdraft; } + /** The GL account chosen on the Details step; the rate register row can be matched by it. */ + get productGlAccount(): number | string | null { + return this.loanProductDetailsStep?.loanProductDetailsForm?.get('glAccount')?.value ?? null; + } + /** Sub type chosen on the Details step; drives the FD 12–15 month tenure policy downstream. */ get advanceSubType(): string { return this.loanProductDetailsStep?.loanProductDetailsForm?.get('productTypeSubGroup')?.value ?? ''; @@ -282,16 +310,26 @@ export class CreateLoanProductComponent implements OnInit { return this.loanProductDetailsForm?.get('productTypeGroup')?.value === 'advances'; } + /** The Details step's chosen product type; drives the Loans A/C (EMI) tabs. */ + get isLoanAccount(): boolean { + return this.loanProductDetailsForm?.get('productTypeGroup')?.value === 'loans'; + } + get totalTabs(): number { let tabs = 4; // details, currency, charges, accounting (always) if (this.isAdvanceProduct) { // security & lien, limit & tenure, interest, penal & npa, renewal & closure tabs += 5; if (this.isOverdraftFacility) tabs += 1; // cheque book - } else { - tabs += 2; // settings, terms - if (this.isAdvancedPaymentStrategy) tabs += 3; // interest refund, payment allocation, deferred income + } else if (this.isLoanAccount) { + // security & collateral, amount & tenure, repayment & emi, interest, penal & npa, prepayment & closure + tabs += 6; } + // Old Loans A/C path (Settings, Terms, Interest Refund, Payment Allocation, Deferred Income) — commented out: + // else { + // tabs += 2; // settings, terms + // if (this.isAdvancedPaymentStrategy) tabs += 3; // interest refund, payment allocation, deferred income + // } if (this.loanProductFormValid) tabs += 1; // preview return tabs; } @@ -313,12 +351,28 @@ export class CreateLoanProductComponent implements OnInit { ); } - // Loans A/C: original Settings + Terms path. - const loansValid = !!this.loanProductTermsForm?.valid && !!this.loanProductSettingsForm?.valid; - if (this.isAdvancedPaymentStrategy) { - return base && loansValid && !!this.loanIncomeCapitalizationForm?.valid; + // Loans A/C (EMI): the curated Loans steps gate the form; Settings/Terms tabs are commented out. + if (this.isLoanAccount) { + return ( + base && + !!this.loanProductLoanSecurityStep?.loanProductLoanSecurityForm?.valid && + !!this.loanProductLoanAmountTenureStep?.loanProductLoanAmountTenureForm?.valid && + !!this.loanProductLoanRepaymentStep?.loanProductLoanRepaymentForm?.valid && + !!this.loanProductLoanInterestStep?.loanProductLoanInterestForm?.valid && + !!this.loanProductPenalNpaStep?.loanProductPenalNpaForm?.valid && + !!this.loanProductLoanPrepaymentStep?.loanProductLoanPrepaymentForm?.valid + ); } - return base && loansValid; + + // No product type chosen yet. + return false; + + // Old Loans A/C path (Settings + Terms) — commented out for now: + // const loansValid = !!this.loanProductTermsForm?.valid && !!this.loanProductSettingsForm?.valid; + // if (this.isAdvancedPaymentStrategy) { + // return base && loansValid && !!this.loanIncomeCapitalizationForm?.valid; + // } + // return base && loansValid; } get loanProduct() { @@ -328,7 +382,13 @@ export class CreateLoanProductComponent implements OnInit { return this.assembleAdvanceProduct(); } - // Loans A/C: original composition (Settings/Terms present). + // Loans A/C (EMI): builds its own payload from the Loans steps, mapped onto Fineract's core fields. + if (this.isLoanAccount) { + return this.assembleLoanProduct(); + } + return {}; + + /* OLD LOANS A/C PATH (Settings/Terms composition) — commented out for now. const loanProduct = { ...this.loanProductDetailsStep.loanProductDetails, ...this.loanProductCurrencyStep.loanProductCurrency, @@ -364,6 +424,181 @@ export class CreateLoanProductComponent implements OnInit { } } return loanProduct; + */ + } + + /** + * Builds the create payload for a Loans A/C (EMI) product: the Loans steps mapped onto Fineract's core + * product fields (so the standard product saves). The Loans-only options that have no core field yet + * (eligibility, collateral rules, prepayment, repayment mode, floating reset, register link) stay UI-only + * and are not sent — an unknown key would be rejected by checkForUnsupportedParameters. + */ + private assembleLoanProduct(): any { + const num = (v: any): number | undefined => (v === '' || v === null || v === undefined ? undefined : Number(v)); + + const d = this.loanProductDetailsStep.loanProductDetails; + const cur = this.loanProductCurrencyStep.loanProductCurrency; + const at = this.loanProductLoanAmountTenureStep.loanProductLoanAmountTenure; + const rp = this.loanProductLoanRepaymentStep.loanProductLoanRepayment; + const intr = this.loanProductLoanInterestStep.loanProductLoanInterest; + const sec = this.loanProductLoanSecurityStep.loanProductLoanSecurity; + const pp = this.loanProductLoanPrepaymentStep.loanProductLoanPrepayment; + const pn = this.loanProductPenalNpaStep.loanProductPenalNpa; + + const stepper = this.loanProductLoanRepaymentStep; + const interestStep = this.loanProductLoanInterestStep; + const frequency = stepper.frequencyOptions.find((f) => f.id === rp.frequency)?.fineractId ?? 2; + const daysInYear = interestStep.daysInYearOptions.find((o) => o.id === intr.daysInYear)?.fineractId ?? 1; + const daysInMonth = interestStep.daysInMonthOptions.find((o) => o.id === intr.daysInMonth)?.fineractId ?? 1; + + const defaultStrategy = this.loanProductsTemplate?.transactionProcessingStrategyOptions?.[0]?.code; + const minTenure = num(at.minTenure); + const minRate = num(intr.minRate); + const multiTranche = at.disbursementType === 'multiple'; + const moratorium = num(rp.moratoriumMonths); + + const payload: any = { + // identity + currency + name: d.name, + shortName: d.shortName, + description: d.description, + startDate: d.startDate, + closeDate: d.closeDate, + currencyCode: cur.currencyCode, + digitsAfterDecimal: cur.digitsAfterDecimal, + inMultiplesOf: cur.inMultiplesOf ?? 1, + + // amount -> principal + minPrincipal: num(at.minAmount), + principal: num(at.defaultAmount) ?? num(at.minAmount), + maxPrincipal: num(at.maxAmount), + + // tenure (months) -> number of repayments + minNumberOfRepayments: minTenure, + numberOfRepayments: num(at.defaultTenure) ?? minTenure, + maxNumberOfRepayments: num(at.maxTenure), + repaymentEvery: num(rp.repaidEvery) ?? 1, + repaymentFrequencyType: frequency, + graceOnPrincipalPayment: moratorium && moratorium > 0 ? moratorium : undefined, + + // rate + minInterestRatePerPeriod: minRate, + interestRatePerPeriod: num(intr.defaultRate) ?? minRate, + maxInterestRatePerPeriod: num(intr.maxRate), + interestRateFrequencyType: 3, // per year + + // amortization / calculation + amortizationType: rp.repaymentType === 'equal_principal' ? 0 : 1, // 0 equal principal, 1 equal installments + interestType: intr.calcMethod === 'flat' ? 1 : 0, // 0 declining balance, 1 flat + interestCalculationPeriodType: intr.calcPeriod === 'daily' ? 0 : 1, // 0 daily, 1 same as repayment period + transactionProcessingStrategyCode: defaultStrategy, + daysInYearType: daysInYear, + daysInMonthType: daysInMonth, + isInterestRecalculationEnabled: false, + + // disbursement + multiDisburseLoan: multiTranche, + maxTrancheCount: multiTranche ? num(at.maxTranches) : undefined, + + // NPA / delinquency map onto core product fields + overdueDaysForNPA: num(pn.npaDays), + graceOnArrearsAgeing: num(pn.graceOnArrearsAgeing), + inArrearsTolerance: num(pn.inArrearsTolerance), + delinquencyBucketId: pn.delinquencyBucketId || undefined, + + // accounting rule + GL mappings + charges (all standard, whitelisted) + ...this.loanProductAccountingStep.loanProductAccounting, + ...this.loanProductChargesStep.loanProductCharges, + + // Details-step satellite params (same whitelist the Advances path uses) + productTypeGroup: d.productTypeGroup, + productTypeSubGroup: d.productTypeSubGroup, + glAccount: d.glAccount || undefined, + loanProductCategory: d.loanProductCategory, + prioritySector: d.prioritySector, + cibilAccountType: d.cibilAccountType, + kfsEnabled: d.kfsEnabled, + aprEnabled: d.aprEnabled, + + // Loans A/C (EMI) fields kept on the product satellite (same whitelist as the Advances fields) + margin: num(sec.margin), + ltv: sec.ltv, + securityType: sec.securityType, + repaymentType: rp.repaymentType, + appropriationOrder: rp.appropriationOrder, + interestCalcMethod: intr.calcMethod, + spread: num(intr.spread), + lockInMonths: num(pp.lockInMonths), + interestOnPreclosure: pp.interestOnPreclosure, + penalApplicable: pn.penalApplicable, + penalRate: num(pn.penalRate), + penalAppliedOn: pn.penalAppliedOn, + penalGraceDays: num(pn.penalGraceDays), + npaTrigger: pn.npaTrigger, + interestAfterNpa: pn.interestAfterNpa, + npaUpgradeOnlyAllArrears: pn.upgradeOnlyAllArrears, + npaKeepStandardIfDepositCovers: pn.keepStandardIfDepositCovers, + securityMandatory: sec.securityMandatory, + guarantorsRequired: num(sec.guarantorsRequired), + coApplicant: sec.coApplicant, + thirdPartySecurity: sec.thirdPartySecurity, + legalOpinionRequired: sec.legalOpinionRequired, + propertyInsuranceRequired: sec.propertyInsuranceRequired, + registerCharge: sec.registerCharge, + releaseSecurityOnClosure: sec.autoReleaseOnClosure, + allowMultipleSecurities: sec.allowMultipleSecurities, + allowThirdPartyDeposit: sec.allowThirdPartyDeposit, + minAge: num(at.minAge), + maxAgeAtMaturity: num(at.maxAgeAtMaturity), + minCibil: num(at.minCibil), + minMonthlyIncome: num(at.minMonthlyIncome), + maxFoir: num(at.maxFoir), + maxLoansPerCustomer: num(at.maxLoansPerCustomer), + disbursementType: at.disbursementType, + disbursementMode: at.disbursementMode, + undisbursedInterest: at.undisbursedInterest, + preEmiInterest: at.preEmiInterest, + emiDueDay: rp.emiDueDay, + holidayRule: rp.holidayRule, + moratoriumMonths: num(rp.moratoriumMonths), + moratoriumInterest: rp.moratoriumInterest, + variableInstallments: rp.variableInstallments, + repaymentMode: rp.repaymentMode, + linkedAccountType: rp.linkedAccountType, + pdcCollection: rp.pdcCollection, + mandateRequired: rp.mandateRequired, + advanceEmi: rp.advanceEmi, + rateType: intr.interestType, + registerParticular: intr.registerParticular, + applyCibilAdjustment: intr.applyCibilAdjustment, + rateResolvedAt: intr.rateResolvedAt, + calcPeriod: intr.calcPeriod, + interestStartsFrom: intr.interestStartsFrom, + compounding: intr.compounding, + benchmark: intr.benchmark, + resetFrequency: intr.resetFrequency, + resetChange: intr.resetChange, + partPrepaymentAllowed: pp.partPrepaymentAllowed, + minPartPayment: num(pp.minPartPayment), + allowedOn: pp.allowedOn, + partPaymentsPerYear: pp.partPaymentsPerYear, + partPrepaymentMode: pp.partPrepaymentMode, + foreclosureFloatingIndividual: num(pp.foreclosureFloatingIndividual), + foreclosureFixedIndividual: num(pp.foreclosureFixedIndividual), + foreclosureNonIndividual: num(pp.foreclosureNonIndividual), + foreclosureTakeover: num(pp.foreclosureTakeover), + foreclosureQuoteValidDays: num(pp.foreclosureQuoteValidDays), + autoCloseOnZeroBalance: pp.autoCloseOnZeroBalance, + nocLetter: pp.nocLetter, + restructuring: pp.restructuring, + releaseCollateralOnClosure: pp.releaseCollateralOnClosure, + topUpAllowed: pp.topUpAllowed, + balanceTransferOutAllowed: pp.balanceTransferOutAllowed + }; + + // Drop undefined keys so we never send an unresolved value. + Object.keys(payload).forEach((k) => payload[k] === undefined && delete payload[k]); + return payload; } /** @@ -413,7 +648,8 @@ export class CreateLoanProductComponent implements OnInit { // rate minInterestRatePerPeriod: minRate, - interestRatePerPeriod: minRate, + // A deposit-linked row ("1% + FD") has no plain minimum or maximum, so the register step supplies the default. + interestRatePerPeriod: num(intr.defaultRate) ?? minRate, maxInterestRatePerPeriod: num(intr.maxRate), interestRateFrequencyType: 3, // per year @@ -457,6 +693,7 @@ export class CreateLoanProductComponent implements OnInit { lienCertificatePrefix: sec.lienCertificatePrefix, printCertificateOnDisbursement: sec.printOnDisbursement, interestBasis: intr.interestBasis, + registerParticular: intr.registerParticular || undefined, spread: num(intr.spread), interestChargedOn: intr.interestChargedOn, interestPostingFrequency: intr.postingFrequency, diff --git a/src/app/products/loan-products/loan-product-stepper/advance-steps.scss b/src/app/products/loan-products/loan-product-stepper/advance-steps.scss index 29d9a6b7e..062f2f8fe 100644 --- a/src/app/products/loan-products/loan-product-stepper/advance-steps.scss +++ b/src/app/products/loan-products/loan-product-stepper/advance-steps.scss @@ -172,3 +172,45 @@ $gray-900: #202124; color: #075985; line-height: 1.5; } + +/* Read-only reference tables (Loans A/C steps): collateral rules, foreclosure charges. */ +.adv-table { + width: 100%; + border-collapse: collapse; + + th { + text-align: left; + font-size: 12px; + font-weight: 600; + letter-spacing: 0.05em; + text-transform: uppercase; + color: #475569; + padding: 12px 24px; + background: $gray-50; + border-bottom: 1px solid $border; + } + + td { + font-size: 14px; + padding: 10px 24px; + border-bottom: 1px solid #eef2f6; + color: #1e293b; + } + + .adv-table__no { + color: #94a3b8; + } + + .adv-table__yes { + color: #047857; + font-weight: 600; + } +} + +.adv-type-options--3 { + grid-template-columns: repeat(3, 1fr); + + @media (width <= 900px) { + grid-template-columns: 1fr; + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html index d81f96fbf..2c616c118 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.html @@ -11,36 +11,14 @@

Rate

+ Taken from the Loan Interest Rate Register
-
- - Interest Basis - - @for (opt of interestBasisOptions; track opt.id) { - {{ opt.label }} - } - - - @if (showSpread) { - - Spread over Deposit Rate (%) - - Advance rate = deposit rate + spread - - } @else { -
- } -
- - Minimum Rate (% p.a.) - - Minimum Rate is required - - - Maximum Rate (% p.a.) - - Maximum Rate is required - +
+
diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts index 89dbb9956..4aa3d2dda 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-advance-interest-step/loan-product-advance-interest-step.component.ts @@ -6,9 +6,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -import { Component, inject } from '@angular/core'; +import { Component, Input, inject } from '@angular/core'; import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { RegisterRateSelection, RegisterRateViewComponent } from '../register-rate-view/register-rate-view.component'; /** * Interest step for an Advances A/C product (Figma step 5). Interest basis + spread, rate bounds, @@ -18,13 +19,23 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; selector: 'mifosx-loan-product-advance-interest-step', templateUrl: './loan-product-advance-interest-step.component.html', styleUrls: ['../advance-steps.scss'], - imports: [...STANDALONE_SHARED_IMPORTS] + imports: [ + ...STANDALONE_SHARED_IMPORTS, + RegisterRateViewComponent + ] }) export class LoanProductAdvanceInterestStepComponent { private formBuilder = inject(UntypedFormBuilder); loanProductAdvanceInterestForm: UntypedFormGroup; + /** Sub type and GL account picked on the Details step; they choose the Loan Interest Rate Register row. */ + @Input() productSubType = ''; + @Input() glAccountId: number | string | null = null; + + /** The register row the product takes its rate from; null while the register has no row for it. */ + registerSelection: RegisterRateSelection | null = null; + readonly interestBasisOptions = [ { id: 'deposit_spread', label: 'Deposit Rate + Spread' }, { id: 'fixed', label: 'Fixed rate' }, @@ -77,11 +88,12 @@ export class LoanProductAdvanceInterestStepComponent { Validators.max(20) ] ], - minRate: [ - '', - Validators.required - ], - maxRate: [ + // Filled from the register row; never typed in. + minRate: [''], + maxRate: [''], + defaultRate: [''], + // The rate comes from the Loan Interest Rate Register, so a product with no register row cannot be created. + registerParticular: [ '', Validators.required ], @@ -95,6 +107,33 @@ export class LoanProductAdvanceInterestStepComponent { }); } + /** + * The register row decides the rate. A row of plain rates fixes the minimum and maximum; a deposit row + * ("1% + FD") is the deposit rate plus a spread, which has no plain minimum or maximum. With no row for the + * product the register particular stays empty, which keeps this step, and so the whole product, invalid until + * the product has been added to the register. + */ + onRegisterSelection(selection: RegisterRateSelection | null): void { + this.registerSelection = selection; + const form = this.loanProductAdvanceInterestForm; + if (selection) { + form.patchValue( + { + interestBasis: selection.isFormula ? 'deposit_spread' : 'fixed', + spread: selection.isFormula ? selection.minSpread : 0, + minRate: selection.minRate ?? '', + maxRate: selection.maxRate ?? '', + defaultRate: selection.defaultRate ?? '', + registerParticular: selection.particular + }, + { emitEvent: false } + ); + } else { + form.patchValue({ minRate: '', maxRate: '', defaultRate: '', registerParticular: '' }, { emitEvent: false }); + } + form.updateValueAndValidity({ emitEvent: false }); + } + get showSpread(): boolean { return this.loanProductAdvanceInterestForm.get('interestBasis').value === 'deposit_spread'; } diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts index 57a5f6dc4..6eb65abd2 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-details-step/loan-product-details-step.component.ts @@ -17,6 +17,7 @@ import { MatTooltip } from '@angular/material/tooltip'; import { CdkTextareaAutosize } from '@angular/cdk/text-field'; import { MatRadioButton, MatRadioGroup } from '@angular/material/radio'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { PRODUCT_SUB_TYPES, PRODUCT_TYPE_GROUPS } from '../../loan-product-types'; @Component({ selector: 'mifosx-loan-product-details-step', @@ -110,35 +111,10 @@ export class LoanProductDetailsStepComponent implements OnInit { isExistingProduct = false; /** Product Type -- picked first, since it decides which sections the rest of the wizard shows. */ - readonly productTypeGroups = [ - { id: 'advances', label: 'Advances A/C', hint: 'No EMI. Limit / drawing power against security.' }, - { id: 'loans', label: 'Loans A/C', hint: 'Fixed disbursement, fixed tenure, EMI repayment.' } - ]; + /** Category and type lists are shared with the product list and the loan account product picker. */ + readonly productTypeGroups = PRODUCT_TYPE_GROUPS; - /** `shortName` is the two-letter code the product's Short Name is pre-filled with when the sub type is picked. */ - readonly productTypeSubGroups: Record = { - advances: [ - { id: 'fd', label: 'Loan against FD', shortName: 'FD' }, - { id: 'rd', label: 'Loan against RD', shortName: 'RD' }, - { id: 'dds', label: 'Loan against DDS', shortName: 'DS' }, - { id: 'lic', label: 'Loan against LIC Policy', shortName: 'LI' }, - { id: 'gold', label: 'Loan against Gold', shortName: 'GD' }, - { id: 'warehouse', label: 'Warehouse Receipt', shortName: 'WR' }, - { id: 'cc', label: 'Cash Credit (CC)', shortName: 'CC' }, - { id: 'overdraft', label: 'Overdraft (OD)', shortName: 'OD' }, - { id: 'kcc', label: 'Kisan Credit Card (KCC)', shortName: 'KC' }, - { id: 'bills', label: 'Bills Purchased / Discounted', shortName: 'BP' } - ], - loans: [ - { id: 'term', label: 'Term Loan', shortName: 'TL' }, - { id: 'personal', label: 'Personal Loan', shortName: 'PL' }, - { id: 'housing', label: 'Housing Loan', shortName: 'HL' }, - { id: 'vehicle', label: 'Vehicle Loan', shortName: 'VL' }, - { id: 'education', label: 'Education Loan', shortName: 'EL' }, - { id: 'business', label: 'Business / MSME Loan', shortName: 'BL' }, - { id: 'gold_emi', label: 'Gold EMI Loan', shortName: 'GE' } - ] - }; + readonly productTypeSubGroups = PRODUCT_SUB_TYPES; /** Regulatory Classification options (UI-only; RBI / bureau reporting). */ readonly loanProductCategoryOptions = [ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html new file mode 100644 index 000000000..72b1d72d7 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.html @@ -0,0 +1,150 @@ + + +
+
+
+ +

Loan Amount

+
+
+ + Minimum Amount (₹) + + Minimum Amount is required + + + Default Amount (₹) + + + + Maximum Amount (₹) + + Maximum Amount is required + +
+
+
+ Each loan is sanctioned within these bounds. The amount is fixed at sanction. It is not a limit that can be + drawn and repaid again. +
+
+
+ +
+
+ +

Tenure

+
+
+ + Minimum Tenure (months) + + Minimum Tenure is required + + + Default Tenure (months) + + + + Maximum Tenure (months) + + Age at maturity cap comes from Borrower Eligibility below + Maximum Tenure is required + +
+
+ +
+
+ +

Borrower Eligibility

+
+
+ + Minimum Age (years) + + + + Maximum Age at Maturity (years) + + + + Minimum CIBIL Score + + + + Minimum Monthly Income (₹) + + + + Maximum FOIR / DBR (%) + + + + Maximum Loans per Customer + + +
+
+ +
+
+ +

Disbursement

+
+ + + Single disbursement + Full amount paid out once. + + + Multiple tranches + Paid out in stages, for example as construction progresses. + + +
+ @if (isMultiTranche) { + + Maximum Tranches + + At least 2 tranches + + } + + Disbursement Mode + + @for (opt of disbursementModeOptions; track opt.id) { + {{ opt.label }} + } + + + + Interest on Undisbursed Amount + + @for (opt of undisbursedInterestOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ + Pre-EMI interest is charged on each disbursed tranche until the first full EMI + +
+
+ +
+ + + Hidden for Loans A/C: Facility Type (Demand / Overdraft), Drawing power, Limit renewal, Cheque + book. + +
+ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts new file mode 100644 index 000000000..ff547810f --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-amount-tenure-step/loan-product-loan-amount-tenure-step.component.ts @@ -0,0 +1,106 @@ +/** + * 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 { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { MatRadioButton, MatRadioGroup } from '@angular/material/radio'; +import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; + +/** + * Amount & Tenure step for a Loans A/C (EMI) product (step 4): fixed sanctioned amount, tenure, + * borrower eligibility and disbursement. Amount, tenure and tranches feed Fineract's core product + * fields; eligibility is UI-only for now. + */ +@Component({ + selector: 'mifosx-loan-product-loan-amount-tenure-step', + templateUrl: './loan-product-loan-amount-tenure-step.component.html', + styleUrls: ['../advance-steps.scss'], + imports: [ + ...STANDALONE_SHARED_IMPORTS, + MatCheckbox, + MatRadioGroup, + MatRadioButton + ] +}) +export class LoanProductLoanAmountTenureStepComponent { + private formBuilder = inject(UntypedFormBuilder); + + loanProductLoanAmountTenureForm: UntypedFormGroup; + + readonly disbursementModeOptions = [ + { id: 'transfer_dd_vendor', label: 'Transfer to A/C, DD, Direct to vendor' }, + { id: 'transfer', label: 'Transfer to A/C only' }, + { id: 'dd', label: 'Demand draft only' } + ]; + + readonly undisbursedInterestOptions = [ + { id: 'none', label: 'None — interest only on disbursed' }, + { id: 'commitment', label: 'Commitment charge on undisbursed' } + ]; + + constructor() { + this.loanProductLoanAmountTenureForm = this.formBuilder.group({ + minAmount: [ + '', + [ + Validators.required, + Validators.min(0) + ] + ], + defaultAmount: [''], + maxAmount: [ + '', + [ + Validators.required, + Validators.min(0) + ] + ], + minTenure: [ + 12, + [ + Validators.required, + Validators.min(1) + ] + ], + defaultTenure: [ + '', + Validators.min(1) + ], + maxTenure: [ + 360, + [ + Validators.required, + Validators.min(1) + ] + ], + minAge: [21], + maxAgeAtMaturity: [70], + minCibil: [650], + minMonthlyIncome: [''], + maxFoir: [50], + maxLoansPerCustomer: [1], + disbursementType: ['single'], + maxTranches: [ + 2, + Validators.min(2) + ], + disbursementMode: ['transfer_dd_vendor'], + undisbursedInterest: ['none'], + preEmiInterest: [true] + }); + } + + get isMultiTranche(): boolean { + return this.loanProductLoanAmountTenureForm.get('disbursementType').value === 'multiple'; + } + + get loanProductLoanAmountTenure() { + return this.loanProductLoanAmountTenureForm.getRawValue(); + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html new file mode 100644 index 000000000..0a08d2380 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.html @@ -0,0 +1,161 @@ + + +
+
+
+ +

Interest Type

+
+ + + Fixed + Same rate for the whole tenure + + + Floating + Linked to a benchmark; resets periodically + + + Hybrid + Fixed for a period, then floating + + +
+
+ +
+
+ +

Rate Source

+ Centralised — changes flow to all loans on this product +
+
+ +
+
+ + Apply CIBIL Adjustment + + @for (opt of yesNoOptions; track opt) { + {{ opt }} + } + + + + Spread over Register Rate (%) + + + + Rate Resolved At + + @for (opt of rateResolvedAtOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ +
+
+ +

Calculation

+
+
+ + Calculation Method + + @for (opt of calcMethodOptions; track opt.id) { + {{ opt.label }} + } + + + + Days in Year + + @for (opt of daysInYearOptions; track opt.id) { + {{ opt.label }} + } + + + + Days in Month + + @for (opt of daysInMonthOptions; track opt.id) { + {{ opt.label }} + } + + + + Calculation Period + + @for (opt of calcPeriodOptions; track opt.id) { + {{ opt.label }} + } + + + + Interest Starts From + + @for (opt of interestStartOptions; track opt.id) { + {{ opt.label }} + } + + + + Compounding + + @for (opt of compoundingOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ + @if (isFloatingOrHybrid) { +
+
+ +

Floating Rate Reset

+ Shown only when the type is Floating or Hybrid +
+
+ + Benchmark + + @for (opt of benchmarkOptions; track opt.id) { + {{ opt.label }} + } + + + + Reset Frequency + + @for (opt of resetFrequencyOptions; track opt.id) { + {{ opt.label }} + } + + + + On Reset, Change + + @for (opt of resetChangeOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ } + diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts new file mode 100644 index 000000000..a29bc3534 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-interest-step/loan-product-loan-interest-step.component.ts @@ -0,0 +1,188 @@ +/** + * 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, Input, inject } from '@angular/core'; +import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { MatRadioButton, MatRadioGroup } from '@angular/material/radio'; +import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { RegisterRateSelection, RegisterRateViewComponent } from '../register-rate-view/register-rate-view.component'; + +/** + * Interest step for a Loans A/C (EMI) product (step 6). The rate normally comes from the central + * Loan Interest Rate Register (amount slab + CIBIL adjustment); the min / default / max rate and the + * calculation method feed Fineract's core product fields. Register link, spread and floating reset + * are UI-only for now. + */ +@Component({ + selector: 'mifosx-loan-product-loan-interest-step', + templateUrl: './loan-product-loan-interest-step.component.html', + styleUrls: ['../advance-steps.scss'], + imports: [ + ...STANDALONE_SHARED_IMPORTS, + MatRadioGroup, + MatRadioButton, + RegisterRateViewComponent + ] +}) +export class LoanProductLoanInterestStepComponent { + private formBuilder = inject(UntypedFormBuilder); + + loanProductLoanInterestForm: UntypedFormGroup; + + /** Sub type and GL account picked on the Details step; they choose the Loan Interest Rate Register row. */ + @Input() productSubType = ''; + @Input() glAccountId: number | string | null = null; + + /** The register row the product takes its rate from; null while the register has no row for it. */ + registerSelection: RegisterRateSelection | null = null; + + /** The 16 default particulars of the Loan Interest Rate Register. */ + readonly registerParticulars = [ + 'Housing Loan (Purchase/Construction)', + 'Home Repair/Renovation', + 'Personal Loan (Unsecured)', + 'Personal Loan (Secured/Property)', + 'Two Wheeler Loan', + 'Car Loan (New)', + 'Used Car/Vehicle Loan', + 'Commercial Vehicle Loan', + 'Gold Loan', + 'Business Term Loan', + 'Machinery & Equipment Loan', + 'Cash Credit', + 'Overdraft', + 'Agriculture Loan', + 'Loan against FDR', + 'Loan against RD' + ]; + + readonly yesNoOptions = [ + 'YES', + 'NO' + ]; + + readonly rateResolvedAtOptions = [ + { id: 'sanction', label: 'Sanction' }, + { id: 'disbursement', label: 'First disbursement' } + ]; + + readonly calcMethodOptions = [ + { id: 'declining', label: 'Declining Balance' }, + { id: 'flat', label: 'Flat' } + ]; + + /** `fineractId` maps to Fineract's daysInYearType (1 = actual). */ + readonly daysInYearOptions = [ + { id: 'actual', label: 'Actual (365 / 366)', fineractId: 1 }, + { id: '365', label: '365', fineractId: 365 }, + { id: '360', label: '360', fineractId: 360 } + ]; + + /** `fineractId` maps to Fineract's daysInMonthType (1 = actual). */ + readonly daysInMonthOptions = [ + { id: 'actual', label: 'Actual', fineractId: 1 }, + { id: '30', label: '30', fineractId: 30 } + ]; + + readonly calcPeriodOptions = [ + { id: 'same', label: 'Same as repayment period' }, + { id: 'daily', label: 'Daily' } + ]; + + readonly interestStartOptions = [ + { id: 'disbursement', label: 'Disbursement date' }, + { id: 'first_emi', label: 'First EMI date' } + ]; + + readonly compoundingOptions = [ + { id: 'none', label: 'None (simple on outstanding)' }, + { id: 'monthly', label: 'Monthly' } + ]; + + readonly benchmarkOptions = [ + { id: 'repo', label: 'Repo / MCLR / Bank base rate' }, + { id: 'eblr', label: 'External benchmark (EBLR)' } + ]; + + readonly resetFrequencyOptions = [ + { id: 'quarterly', label: 'Quarterly' }, + { id: 'half_yearly', label: 'Half-yearly' }, + { id: 'yearly', label: 'Yearly' } + ]; + + readonly resetChangeOptions = [ + { id: 'tenure', label: 'Tenure (EMI stays constant)' }, + { id: 'emi', label: 'EMI (tenure stays constant)' } + ]; + + constructor() { + this.loanProductLoanInterestForm = this.formBuilder.group({ + interestType: ['fixed'], + // The rate comes from the Loan Interest Rate Register, so a product with no register row cannot be created. + registerParticular: [ + '', + Validators.required + ], + applyCibilAdjustment: ['YES'], + spread: [ + 0, + [ + Validators.min(0), + Validators.max(20) + ] + ], + rateResolvedAt: ['sanction'], + // Filled from the register row; never typed in. + minRate: [''], + defaultRate: [''], + maxRate: [''], + calcMethod: ['declining'], + daysInYear: ['actual'], + daysInMonth: ['actual'], + calcPeriod: ['same'], + interestStartsFrom: ['disbursement'], + compounding: ['none'], + benchmark: ['repo'], + resetFrequency: ['quarterly'], + resetChange: ['tenure'] + }); + } + + /** + * The register row decides the rate limits. With no row for the product the register particular stays empty, + * which keeps this step, and so the whole product, invalid until the product has been added to the register. + */ + onRegisterSelection(selection: RegisterRateSelection | null): void { + this.registerSelection = selection; + const form = this.loanProductLoanInterestForm; + if (selection) { + form.patchValue( + { + registerParticular: selection.particular, + minRate: selection.minRate ?? '', + maxRate: selection.maxRate ?? '', + defaultRate: selection.defaultRate ?? '' + }, + { emitEvent: false } + ); + } else { + form.patchValue({ registerParticular: '', minRate: '', maxRate: '', defaultRate: '' }, { emitEvent: false }); + } + form.updateValueAndValidity({ emitEvent: false }); + } + + /** Reset options only apply to a floating or hybrid rate. */ + get isFloatingOrHybrid(): boolean { + const type = this.loanProductLoanInterestForm.get('interestType').value; + return type === 'floating' || type === 'hybrid'; + } + + get loanProductLoanInterest() { + return this.loanProductLoanInterestForm.getRawValue(); + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html new file mode 100644 index 000000000..b17ca654c --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.html @@ -0,0 +1,144 @@ + + +
+
+
+ +

Part-prepayment

+
+
+ Part-prepayment allowed +
+
+ + Minimum Part-payment (₹) + + + + Allowed Only On + + @for (opt of allowedOnOptions; track opt.id) { + {{ opt.label }} + } + + + + Part-payments per Year + + @for (opt of perYearOptions; track opt.id) { + {{ opt.label }} + } + + +
+ + + Reduce tenure + EMI stays the same + + + Reduce EMI + Tenure stays the same + + + Borrower chooses + Picked at payment time + + +
+
+ +
+
+ +

Pre-closure (Foreclosure)

+ Charge on outstanding principal +
+
+ + Individual · floating rate (%) + + Nil as per RBI + + + Individual · fixed rate (%) + + + + Non-individual / business (%) + + + + Takeover by another bank (%) + + +
+
+ + Lock-in Period (months) + + + + Interest on Pre-closure + + @for (opt of interestOnPreclosureOptions; track opt.id) { + {{ opt.label }} + } + + + + Foreclosure Quote Valid (days) + + +
+
+ +
+
+ +

Closure & Restructuring

+
+
+ + Auto-close on Zero Balance + + @for (opt of autoCloseOptions; track opt) { + {{ opt }} + } + + + + NOC / Closure Letter + + @for (opt of nocOptions; track opt.id) { + {{ opt.label }} + } + + + + Restructuring / Re-schedule + + @for (opt of restructuringOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+
+ Release collateral and lien on closure + Top-up loan on the same account + Allow balance transfer (takeover) out +
+
+
+
Unlike an Advance, there is no renewal. A loan ends at maturity or on pre-closure.
+
+
+ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts new file mode 100644 index 000000000..e5c6487e8 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-prepayment-step/loan-product-loan-prepayment-step.component.ts @@ -0,0 +1,117 @@ +/** + * 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 { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { MatRadioButton, MatRadioGroup } from '@angular/material/radio'; +import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; + +/** + * Prepayment & Closure step for a Loans A/C (EMI) product (step 8). A loan has no renewal; it ends at + * maturity or on pre-closure. UI-only for now: not sent in the create payload. + */ +@Component({ + selector: 'mifosx-loan-product-loan-prepayment-step', + templateUrl: './loan-product-loan-prepayment-step.component.html', + styleUrls: ['../advance-steps.scss'], + imports: [ + ...STANDALONE_SHARED_IMPORTS, + MatCheckbox, + MatRadioGroup, + MatRadioButton + ] +}) +export class LoanProductLoanPrepaymentStepComponent { + private formBuilder = inject(UntypedFormBuilder); + + loanProductLoanPrepaymentForm: UntypedFormGroup; + + readonly allowedOnOptions = [ + { id: 'emi_date', label: 'EMI due date' }, + { id: 'any_day', label: 'Any day' } + ]; + + readonly perYearOptions = [ + { id: 'unlimited', label: 'Unlimited' }, + { id: 'one', label: 'Once a year' }, + { id: 'two', label: 'Twice a year' } + ]; + + readonly interestOnPreclosureOptions = [ + { id: 'till_date', label: 'Till date of payment' }, + { id: 'full_month', label: 'Full current month' } + ]; + + readonly autoCloseOptions = [ + 'YES', + 'NO' + ]; + + readonly nocOptions = [ + { id: 'auto', label: 'Auto-generate' }, + { id: 'manual', label: 'On request' } + ]; + + readonly restructuringOptions = [ + { id: 'approval', label: 'Allowed with approval' }, + { id: 'no', label: 'Not allowed' } + ]; + + constructor() { + const percent = [ + Validators.min(0), + Validators.max(100) + ]; + this.loanProductLoanPrepaymentForm = this.formBuilder.group({ + partPrepaymentAllowed: [true], + minPartPayment: [ + '', + Validators.min(0) + ], + allowedOn: ['emi_date'], + partPaymentsPerYear: ['unlimited'], + partPrepaymentMode: ['reduce_tenure'], + foreclosureFloatingIndividual: [ + 0, + percent + ], + foreclosureFixedIndividual: [ + 2, + percent + ], + foreclosureNonIndividual: [ + 3, + percent + ], + foreclosureTakeover: [ + 2, + percent + ], + lockInMonths: [ + 0, + Validators.min(0) + ], + interestOnPreclosure: ['till_date'], + foreclosureQuoteValidDays: [ + 7, + Validators.min(1) + ], + autoCloseOnZeroBalance: ['YES'], + nocLetter: ['auto'], + restructuring: ['approval'], + releaseCollateralOnClosure: [true], + topUpAllowed: [false], + balanceTransferOutAllowed: [true] + }); + } + + get loanProductLoanPrepayment() { + return this.loanProductLoanPrepaymentForm.getRawValue(); + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html new file mode 100644 index 000000000..4972737f7 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.html @@ -0,0 +1,155 @@ + + +
+
+
+ +

Repayment Type

+
+ + @for (opt of repaymentTypeOptions; track opt.id) { + + {{ opt.label }} + {{ opt.hint }} + + } + +
+
+ This is the main difference from an Advance. Repayment follows a fixed schedule, not a running balance. +
+
+
+ +
+
+ +

Schedule

+
+
+ + Repaid Every + + Repaid Every is required + + + Frequency + + @for (opt of frequencyOptions; track opt.id) { + {{ opt.label }} + } + + + + Minimum Days to First Repayment + + + + EMI Due Day + + @for (opt of emiDueDayOptions; track opt.id) { + {{ opt.label }} + } + + + + If Due Date is a Holiday + + @for (opt of holidayRuleOptions; track opt.id) { + {{ opt.label }} + } + + + + Moratorium / Grace (months) + + + + Interest during Moratorium + + @for (opt of moratoriumInterestOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ Variable installments allowed +
+
+ +
+
+ +

Repayment Mode

+
+
+ + Repayment Mode + + @for (opt of repaymentModeOptions; track opt.id) { + {{ opt.label }} + } + + + + Linked Account Type + + @for (opt of linkedAccountOptions; track opt.id) { + {{ opt.label }} + } + + + + PDC Collection + + @for (opt of pdcOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ + Mandate registration is required before the first disbursement + +
+
+
+ Cheques are used here to repay the EMI as post-dated cheques, not to withdraw from the loan. A cheque book is + therefore not part of a Loan A/C. +
+
+
+ +
+
+ +

Appropriation Order

+
+
+ + Appropriation Order + + @for (opt of appropriationOrderOptions; track opt.id) { + {{ opt.label }} + } + + + + Advance EMI Payment + + @for (opt of advanceEmiOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts new file mode 100644 index 000000000..162f2cd8d --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-repayment-step/loan-product-loan-repayment-step.component.ts @@ -0,0 +1,129 @@ +/** + * 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 { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { MatRadioButton, MatRadioGroup } from '@angular/material/radio'; +import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; + +/** + * Repayment & EMI step for a Loans A/C (EMI) product (step 5) — the step an Advance does not have. + * Repayment type and frequency feed Fineract's core product fields; the repayment mode and the + * rest of the schedule options are UI-only for now. + */ +@Component({ + selector: 'mifosx-loan-product-loan-repayment-step', + templateUrl: './loan-product-loan-repayment-step.component.html', + styleUrls: ['../advance-steps.scss'], + imports: [ + ...STANDALONE_SHARED_IMPORTS, + MatCheckbox, + MatRadioGroup, + MatRadioButton + ] +}) +export class LoanProductLoanRepaymentStepComponent { + private formBuilder = inject(UntypedFormBuilder); + + loanProductLoanRepaymentForm: UntypedFormGroup; + + readonly repaymentTypeOptions = [ + { id: 'emi', label: 'EMI', hint: 'Reducing balance, equal instalments' }, + { id: 'equal_principal', label: 'Equal principal', hint: 'Falling instalments' }, + { id: 'flat', label: 'Flat rate', hint: 'Interest on original amount' }, + { id: 'bullet', label: 'Bullet', hint: 'Pay everything at maturity' }, + { id: 'step', label: 'Step-up / Balloon', hint: 'Custom schedule' } + ]; + + /** `fineractId` is Fineract's repaymentFrequencyType (0 days, 1 weeks, 2 months). */ + readonly frequencyOptions = [ + { id: 'months', label: 'Months', fineractId: 2 }, + { id: 'weeks', label: 'Weeks', fineractId: 1 }, + { id: 'days', label: 'Days', fineractId: 0 } + ]; + + readonly emiDueDayOptions = [ + { id: 'disbursement_day', label: 'Same day as disbursement' }, + { id: 'fixed_day', label: 'Fixed day of month (5th)' } + ]; + + readonly holidayRuleOptions = [ + { id: 'next', label: 'Next working day' }, + { id: 'previous', label: 'Previous working day' }, + { id: 'same', label: 'Same day' } + ]; + + readonly moratoriumInterestOptions = [ + { id: 'pre_emi', label: 'Pay monthly (Pre-EMI)' }, + { id: 'capitalise', label: 'Capitalise into loan' } + ]; + + readonly repaymentModeOptions = [ + { id: 'nach', label: 'Auto-debit (NACH / ECS)' }, + { id: 'pdc', label: 'Post-dated cheques (PDC)' }, + { id: 'cash', label: 'Cash / transfer at branch' } + ]; + + readonly linkedAccountOptions = [ + { id: 'savings_current', label: 'Savings / Current' }, + { id: 'savings', label: 'Savings only' } + ]; + + readonly pdcOptions = [ + { id: 'mandatory', label: 'Mandatory — 3 cheques' }, + { id: 'optional', label: 'Optional' }, + { id: 'none', label: 'Not collected' } + ]; + + readonly appropriationOrderOptions = [ + { id: 'charges_penal_interest_principal', label: 'Charges → Penal → Interest → Principal' }, + { id: 'principal_interest_penal_charges', label: 'Principal → Interest → Penal → Charges' } + ]; + + readonly advanceEmiOptions = [ + { id: 'adjust_next', label: 'Allowed — adjust next EMI' }, + { id: 'not_allowed', label: 'Not allowed' } + ]; + + constructor() { + this.loanProductLoanRepaymentForm = this.formBuilder.group({ + repaymentType: ['emi'], + repaidEvery: [ + 1, + [ + Validators.required, + Validators.min(1) + ] + ], + frequency: ['months'], + minDaysToFirstRepayment: [ + '', + Validators.min(0) + ], + emiDueDay: ['fixed_day'], + holidayRule: ['next'], + moratoriumMonths: [ + 0, + Validators.min(0) + ], + moratoriumInterest: ['pre_emi'], + variableInstallments: [false], + repaymentMode: ['nach'], + linkedAccountType: ['savings_current'], + pdcCollection: ['mandatory'], + mandateRequired: [true], + appropriationOrder: ['charges_penal_interest_principal'], + advanceEmi: ['adjust_next'] + }); + } + + get loanProductLoanRepayment() { + return this.loanProductLoanRepaymentForm.getRawValue(); + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html new file mode 100644 index 000000000..6650b8f5a --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.html @@ -0,0 +1,130 @@ + + +
+
+
+ +

Security

+
+
+ + Security Type + + + + Security Mandatory + + @for (opt of securityMandatoryOptions; track opt.id) { + {{ opt.label }} + } + + + + Margin (%) + + Margin must be between 0 and 100 + + + Maximum LTV (%) + + = 100 − Margin + +
+
+ +
+
+ +

Collateral Rules by Security Type

+ Which security this product may accept +
+
+ + + + + + + + + + + + @for (rule of collateralRules; track rule.security) { + + + + + + + + + } + +
SecurityAllowedMax LTV %ValuationInsuranceCharge / lien
{{ rule.security }} + {{ rule.allowed ? 'Yes' : 'No' }} + {{ rule.ltv }}{{ rule.valuation }}{{ rule.insurance }}{{ rule.charge }}
+
+ +
+
+ +

Guarantor & Co-applicant

+
+
+ + Guarantors Required (min) + + + + Co-applicant + + @for (opt of coApplicantOptions; track opt.id) { + {{ opt.label }} + } + + + + Third-party Security + + @for (opt of thirdPartyOptions; track opt.id) { + {{ opt.label }} + } + + +
+
+ +
+
+ +

Conditions

+
+
+
+ + Legal opinion / title search mandatory before sanction + + + Property insurance mandatory for the whole tenure + + Register charge (CERSAI) before disbursement + Release security automatically on closure + Allow multiple securities for one loan + Allow third-party deposit as security +
+
+
+
+ Unlike an Advance, the security does not decide a running limit. It only decides eligibility at sanction. + Disbursement happens once, up to the sanctioned amount. +
+
+
+ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts new file mode 100644 index 000000000..39caf70e0 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-loan-security-step/loan-product-loan-security-step.component.ts @@ -0,0 +1,127 @@ +/** + * 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 { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; + +/** + * Security & Collateral step for a Loans A/C (EMI) product (step 3). + * + * Unlike an Advance, the security only decides eligibility at sanction — it does not set a running + * limit. UI-only for now: not sent in the create payload. + */ +@Component({ + selector: 'mifosx-loan-product-loan-security-step', + templateUrl: './loan-product-loan-security-step.component.html', + styleUrls: ['../advance-steps.scss'], + imports: [ + ...STANDALONE_SHARED_IMPORTS, + MatCheckbox + ] +}) +export class LoanProductLoanSecurityStepComponent { + private formBuilder = inject(UntypedFormBuilder); + + loanProductLoanSecurityForm: UntypedFormGroup; + + readonly securityMandatoryOptions = [ + { id: 'yes', label: 'Yes — no sanction without security' }, + { id: 'no', label: 'No — unsecured' } + ]; + + readonly coApplicantOptions = [ + { id: 'joint_property', label: 'Mandatory for joint property' }, + { id: 'always', label: 'Always mandatory' }, + { id: 'optional', label: 'Optional' } + ]; + + readonly thirdPartyOptions = [ + { id: 'consent', label: 'Allowed with owner consent' }, + { id: 'no', label: 'Not allowed' } + ]; + + /** Reference table: which security a loan on this product may accept. */ + readonly collateralRules = [ + { + security: 'Residential property', + allowed: true, + ltv: '80', + valuation: 'Empanelled valuer', + insurance: 'Mandatory', + charge: 'Mortgage + CERSAI' + }, + { + security: 'Commercial property', + allowed: true, + ltv: '70', + valuation: 'Empanelled valuer', + insurance: 'Mandatory', + charge: 'Mortgage + CERSAI' + }, + { + security: 'Fixed / Recurring Deposit', + allowed: true, + ltv: '90', + valuation: 'Not needed', + insurance: 'Not needed', + charge: 'Lien marked' + }, + { + security: 'LIC policy', + allowed: true, + ltv: '90', + valuation: 'Surrender value', + insurance: 'Not needed', + charge: 'Assignment' + }, + { security: 'Vehicle', allowed: false, ltv: '—', valuation: '—', insurance: '—', charge: '—' }, + { security: 'Gold ornaments', allowed: false, ltv: '—', valuation: '—', insurance: '—', charge: '—' } + ]; + + constructor() { + this.loanProductLoanSecurityForm = this.formBuilder.group({ + securityType: ['Immovable property (mortgage)'], + securityMandatory: ['yes'], + margin: [ + 20, + [ + Validators.required, + Validators.min(0), + Validators.max(100) + ] + ], + guarantorsRequired: [ + 1, + Validators.min(0) + ], + coApplicant: ['joint_property'], + thirdPartySecurity: ['consent'], + legalOpinionRequired: [true], + propertyInsuranceRequired: [true], + registerCharge: [true], + autoReleaseOnClosure: [true], + allowMultipleSecurities: [false], + allowThirdPartyDeposit: [false] + }); + } + + /** Maximum LTV is derived from the margin (100 − margin) and shown read-only. */ + get ltv(): number { + const margin = Number(this.loanProductLoanSecurityForm.get('margin').value); + return Number.isFinite(margin) ? Math.max(0, 100 - margin) : 100; + } + + get loanProductLoanSecurity() { + return { + ...this.loanProductLoanSecurityForm.getRawValue(), + ltv: this.ltv + }; + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.html b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.html new file mode 100644 index 000000000..377661f29 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.html @@ -0,0 +1,97 @@ + + +@switch (state) { + @case ('loading') { +
Reading the Loan Interest Rate Register…
+ } + @case ('none') { +
+ There is no active Loan Interest Rate Register yet. + + A product takes its interest rate from the register, so it cannot be created until a register is created and + approved. + + Open the register → +
+ } + @case ('ready') { + @if (selectedRow) { +
+ + Interest comes from the active register {{ register?.name }}, effective {{ register?.effectiveFrom }}. + + Open register → +
+ } + + @if (!selectedRow) { +
+ This product has no interest rate in the Loan Interest Rate Register yet. + {{ blockReason }} + Add it in the register → +
+ } + + @if (selectedRow) { +
+ Register row + {{ selectedRow.srNo }}. {{ selectedRow.particulars }} + @if (glLabel(selectedRow); as gl) { + {{ gl }} + } + {{ matchNote }} +
+ +
+ + + + + + + + + @for (slab of slabRates; track slab.label) { + + + + + } + +
Amount slabRate
{{ slab.label }}{{ slab.text }}
+ + + + + + + + + + + @for (slab of cibilSlabs; track slab.from) { + + + + + + } + +
CIBIL scoreBandAdded to the rate
{{ slab.from }} – {{ slab.to }}{{ slab.tier }}{{ slab.adjustmentPct > 0 ? '+' + slab.adjustmentPct.toFixed(2) + '%' : 'No change' }}
+
+ @if (selectedRow.isFormula || slabRates[0]?.formula) { +
+ This row is the deposit's own rate plus a spread, so the final rate is worked out on each account from its + deposit. +
+ } + } + } +} diff --git a/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.scss b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.scss new file mode 100644 index 000000000..4347cf852 --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.scss @@ -0,0 +1,106 @@ +/** + * 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/. + */ + +:host { + display: block; +} + +.rrv__source { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + + a { + font-weight: 600; + white-space: nowrap; + } +} + +.rrv__block { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 4px 16px; + margin: 16px 24px 0; + padding: 12px 16px; + border: 1px solid #fecaca; + border-radius: 8px; + background: #fef2f2; + color: #991b1b; + font-size: 13px; + line-height: 1.5; + + strong { + flex: 1 1 100%; + font-size: 14px; + } + + span { + flex: 1 1 360px; + } +} + +.rrv__block-btn { + font-weight: 600; + color: #991b1b; + white-space: nowrap; +} + +.rrv__row { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px 14px; + padding: 14px 24px 4px; + font-size: 14px; + color: #1e293b; +} + +.rrv__row-label { + font-size: 12px; + letter-spacing: 0.05em; + text-transform: uppercase; + color: #5f6368; +} + +.rrv__row-gl { + padding: 1px 10px; + border-radius: 999px; + background: #e0f2fe; + color: #075985; + font-size: 12px; + font-weight: 600; +} + +.rrv__row-note { + font-size: 12px; + color: #5f6368; +} + +.rrv__tables { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 16px; + padding: 8px 24px 16px; + + @media (width <= 900px) { + grid-template-columns: 1fr; + } +} + +.rrv__formula { + color: #075985; + font-weight: 600; +} + +.rrv__note { + padding: 0 24px 16px; + font-size: 13px; + color: #5f6368; +} diff --git a/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.ts b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.ts new file mode 100644 index 000000000..44d9a35cc --- /dev/null +++ b/src/app/products/loan-products/loan-product-stepper/register-rate-view/register-rate-view.component.ts @@ -0,0 +1,220 @@ +/** + * 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, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, inject } from '@angular/core'; +import { RouterLink } from '@angular/router'; +import { RateRegisterService } from 'app/products/loan-interest-rate-register/rate-register.service'; +import { + CibilSlab, + RateCell, + RateChartRow, + RateRegister +} from 'app/products/loan-interest-rate-register/models/rate-register.model'; + +/** How the register row was found for the product. */ +export type RegisterMatch = 'gl' | 'type'; + +/** What the product takes from the register row, handed to the step that owns the rate fields. */ +export interface RegisterRateSelection { + particular: string; + srNo: number; + glAccountId: number | null; + /** True when the row holds formulas such as "1% + FD": the rate is the deposit's own rate plus a spread. */ + isFormula: boolean; + /** Lowest and highest plain rate in the row, the top one including the largest CIBIL adjustment. Null for a formula row. */ + minRate: number | null; + maxRate: number | null; + /** The rate the product is created with: the lowest plain rate, or the lowest spread for a formula row. */ + defaultRate: number | null; + /** Lowest and highest spread over the deposit rate; only for a formula row. */ + minSpread: number | null; + maxSpread: number | null; + matchedBy: RegisterMatch; + registerName: string; +} + +/** + * Product sub type id -> a word of the register particular that goes with it. This only covers the register's + * default rows. Any other product is found through its GL account, which every register row carries. + */ +const PARTICULAR_BY_SUB_TYPE: Record = { + fd: 'against fdr', + rd: 'against rd', + gold: 'gold loan', + cc: 'cash credit', + overdraft: 'overdraft', + kcc: 'agriculture', + housing: 'housing loan', + personal: 'personal loan (unsecured)', + vehicle: 'car loan (new)', + business: 'business term loan', + term: 'business term loan', + gold_emi: 'gold loan' +}; + +/** + * Shows the interest of a product as the Loan Interest Rate Register defines it: the rate of the product's own + * register row for each amount slab, and the CIBIL adjustment. Nothing is chosen or typed here. + * + * The row is found from the product's GL account first (the register maps each row to a GL), then from its sub + * type. The row found is reported through `selectionChange`, or null when there is none, which blocks the product. + */ +@Component({ + selector: 'mifosx-register-rate-view', + templateUrl: './register-rate-view.component.html', + styleUrls: [ + '../advance-steps.scss', + './register-rate-view.component.scss' + ], + imports: [RouterLink] +}) +export class RegisterRateViewComponent implements OnInit, OnChanges { + private registerService = inject(RateRegisterService); + + /** Sub type id picked on the Details step, e.g. `fd`. */ + @Input() productSubType = ''; + /** The product's GL account id from the Details step. */ + @Input() glAccountId: number | string | null = null; + @Output() selectionChange = new EventEmitter(); + + state: 'loading' | 'ready' | 'none' = 'loading'; + register?: RateRegister; + selectedSrNo: number | null = null; + matchedBy: RegisterMatch | null = null; + /** More than one register row fits the product and nothing tells them apart. */ + ambiguous = false; + + ngOnInit(): void { + this.registerService.getGlOptions().subscribe(); + this.registerService.list().subscribe(() => { + this.register = this.registerService.getActive(); + this.state = this.register && this.register.rows.length > 0 ? 'ready' : 'none'; + this.autoSelect(); + }); + } + + ngOnChanges(changes: SimpleChanges): void { + // The Details step can change after this one has opened, and a new type or GL means a new row. + if ((changes['productSubType'] || changes['glAccountId']) && this.state === 'ready') { + this.autoSelect(); + } + } + + get rows(): RateChartRow[] { + return this.register?.rows ?? []; + } + + get selectedRow(): RateChartRow | undefined { + return this.rows.find((row) => row.srNo === this.selectedSrNo); + } + + get cibilSlabs(): CibilSlab[] { + return this.register?.cibilSlabs ?? []; + } + + glLabel(row: RateChartRow): string | null { + return this.registerService.glLabel(row.glAccountId); + } + + /** The row's rate for every amount slab, ready to show. */ + get slabRates(): { label: string; text: string; formula: boolean; na: boolean }[] { + const row = this.selectedRow; + if (!row || !this.register) { + return []; + } + return this.register.slabs.map((slab, index) => { + const cell: RateCell = row.rates[index] ?? null; + return { + label: slab.label, + text: cell === null ? 'N.A.' : typeof cell === 'string' ? cell : `${cell.toFixed(2)}%`, + formula: typeof cell === 'string', + na: cell === null + }; + }); + } + + /** Why the product cannot go on: what the officer has to do in the register first. */ + get blockReason(): string { + const hasGl = this.glAccountId !== null && this.glAccountId !== ''; + if (!this.productSubType && !hasGl) { + return 'Choose the product type and the GL account on the Details step first.'; + } + const gl = hasGl ? this.registerService.glLabel(Number(this.glAccountId)) : null; + if (this.ambiguous) { + return `More than one register row uses the GL account${gl ? ` (${gl})` : ''}. Give each row its own GL account in the register so this product can be matched to one of them.`; + } + const forGl = gl ? ` with its GL account (${gl})` : ' with its GL account'; + return `Add this product${forGl} and its interest rates in the register and get the register approved. The product can be created only after that.`; + } + + /** How the row was found, shown beside it. */ + get matchNote(): string { + return this.matchedBy === 'gl' + ? `Found through the product's GL account (${this.glLabel(this.selectedRow!) ?? 'GL'}).` + : 'Found through the product type.'; + } + + private autoSelect(): void { + const rows = this.rows; + const word = PARTICULAR_BY_SUB_TYPE[this.productSubType]?.toLowerCase(); + const byType = word ? rows.filter((row) => row.particulars.toLowerCase().includes(word)) : []; + const gl = this.glAccountId === null || this.glAccountId === '' ? null : Number(this.glAccountId); + const byGl = gl === null ? [] : rows.filter((row) => row.glAccountId === gl); + + let chosen: RateChartRow | undefined; + let by: RegisterMatch | null = null; + this.ambiguous = false; + if (byGl.length === 1) { + chosen = byGl[0]; + by = 'gl'; + } else if (byGl.length > 1) { + // Several rows share the GL: the product type tells them apart, or nothing does. + chosen = byGl.find((row) => byType.includes(row)); + by = chosen ? 'type' : null; + this.ambiguous = !chosen; + } else if (byType.length === 1) { + chosen = byType[0]; + by = 'type'; + } else if (byType.length > 1) { + this.ambiguous = true; + } + this.selectedSrNo = chosen?.srNo ?? null; + this.matchedBy = by; + this.emit(); + } + + private emit(): void { + const row = this.selectedRow; + if (!row || !this.register) { + this.selectionChange.emit(null); + return; + } + const plain = row.rates.filter((cell): cell is number => typeof cell === 'number'); + const spreads = row.rates + .filter((cell): cell is string => typeof cell === 'string') + .map((text) => /(\d+(?:\.\d+)?)\s*%/.exec(text)?.[1]) + .filter((value): value is string => !!value) + .map(Number); + const topAdjustment = Math.max(0, ...this.cibilSlabs.map((slab) => Number(slab.adjustmentPct) || 0)); + const isFormula = spreads.length > 0 && plain.length === 0; + const minRate = plain.length > 0 ? Math.min(...plain) : null; + this.selectionChange.emit({ + particular: row.particulars, + srNo: row.srNo, + glAccountId: row.glAccountId ?? null, + isFormula, + minRate, + maxRate: plain.length > 0 ? Math.round((Math.max(...plain) + topAdjustment) * 100) / 100 : null, + defaultRate: isFormula ? Math.min(...spreads) : minRate, + minSpread: isFormula ? Math.min(...spreads) : null, + maxSpread: isFormula ? Math.max(...spreads) : null, + matchedBy: this.matchedBy ?? 'type', + registerName: this.register.name + }); + } +} diff --git a/src/app/products/loan-products/loan-product-types.ts b/src/app/products/loan-products/loan-product-types.ts new file mode 100644 index 000000000..f310cef62 --- /dev/null +++ b/src/app/products/loan-products/loan-product-types.ts @@ -0,0 +1,64 @@ +/** + * 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/. + */ + +/** + * The category ("product type") and sub type of a loan product. One list shared by the create-product wizard, the + * product list filters and the loan account product picker, so a type added here appears in all three. + */ + +export interface ProductTypeGroup { + id: string; + label: string; + hint: string; +} + +export interface ProductSubType { + id: string; + label: string; + /** The two-letter code the product's Short Name is pre-filled with when the sub type is picked. */ + shortName: string; +} + +export const PRODUCT_TYPE_GROUPS: ProductTypeGroup[] = [ + { id: 'advances', label: 'Advances A/C', hint: 'No EMI. Limit / drawing power against security.' }, + { id: 'loans', label: 'Loans A/C', hint: 'Fixed disbursement, fixed tenure, EMI repayment.' } +]; + +export const PRODUCT_SUB_TYPES: Record = { + advances: [ + { id: 'fd', label: 'Loan against FD', shortName: 'FD' }, + { id: 'rd', label: 'Loan against RD', shortName: 'RD' }, + { id: 'dds', label: 'Loan against DDS', shortName: 'DS' }, + { id: 'lic', label: 'Loan against LIC Policy', shortName: 'LI' }, + { id: 'gold', label: 'Loan against Gold', shortName: 'GD' }, + { id: 'warehouse', label: 'Warehouse Receipt', shortName: 'WR' }, + { id: 'cc', label: 'Cash Credit (CC)', shortName: 'CC' }, + { id: 'overdraft', label: 'Overdraft (OD)', shortName: 'OD' }, + { id: 'kcc', label: 'Kisan Credit Card (KCC)', shortName: 'KC' }, + { id: 'bills', label: 'Bills Purchased / Discounted', shortName: 'BP' } + ], + loans: [ + { id: 'term', label: 'Term Loan', shortName: 'TL' }, + { id: 'personal', label: 'Personal Loan', shortName: 'PL' }, + { id: 'housing', label: 'Housing Loan', shortName: 'HL' }, + { id: 'vehicle', label: 'Vehicle Loan', shortName: 'VL' }, + { id: 'education', label: 'Education Loan', shortName: 'EL' }, + { id: 'business', label: 'Business / MSME Loan', shortName: 'BL' }, + { id: 'gold_emi', label: 'Gold EMI Loan', shortName: 'GE' } + ] +}; + +/** Label of a category id, or a dash for a product that carries none (created before categories existed). */ +export function productCategoryLabel(group: string | null | undefined): string { + return PRODUCT_TYPE_GROUPS.find((g) => g.id === group)?.label ?? '—'; +} + +/** Label of a sub type id within its category, or a dash when unknown. */ +export function productTypeLabel(group: string | null | undefined, subGroup: string | null | undefined): string { + return (PRODUCT_SUB_TYPES[group ?? ''] ?? []).find((s) => s.id === subGroup)?.label ?? '—'; +} diff --git a/src/app/products/loan-products/loan-products.component.scss b/src/app/products/loan-products/loan-products.component.scss index e15399058..48f1f175d 100644 --- a/src/app/products/loan-products/loan-products.component.scss +++ b/src/app/products/loan-products/loan-products.component.scss @@ -15,3 +15,49 @@ --pl-accent: #b45309; --pl-accent-l: #fef3c7; } + +/* Category / product type / active-only filters beside the search box. */ +.pl-filters { + display: flex; + align-items: flex-end; + gap: 12px; + flex-wrap: wrap; +} + +.pl-filter { + display: flex; + flex-direction: column; + gap: 2px; + font-size: 11px; + color: #64748b; + + select { + height: 34px; + min-width: 160px; + padding: 0 8px; + border: 1px solid #cbd5e1; + border-radius: 6px; + background: #fff; + font-size: 13px; + color: #1e293b; + } + + &--check { + flex-direction: row; + align-items: center; + gap: 6px; + height: 34px; + font-size: 13px; + color: #1e293b; + } +} + +.pl-tag--advances { + background: #e0f2fe; + color: #075985; +} + +.pl-tag--loans { + background: #ede9fe; + color: #5b21b6; +} diff --git a/src/app/products/loan-products/loan-products.component.ts b/src/app/products/loan-products/loan-products.component.ts index f16a3bff1..f316a73ab 100644 --- a/src/app/products/loan-products/loan-products.component.ts +++ b/src/app/products/loan-products/loan-products.component.ts @@ -42,6 +42,7 @@ import { MatTooltip } from '@angular/material/tooltip'; import { StatusLookupPipe } from '../../pipes/status-lookup.pipe'; import { DateFormatPipe } from '../../pipes/date-format.pipe'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { PRODUCT_SUB_TYPES, PRODUCT_TYPE_GROUPS, productCategoryLabel, productTypeLabel } from './loan-product-types'; @Component({ selector: 'mifosx-loan-products', @@ -82,6 +83,8 @@ export class LoanProductsComponent implements OnInit, AfterViewInit { displayedColumns: string[] = [ 'name', 'shortName', + 'category', + 'productType', 'closeDate', 'status', 'actions' @@ -90,6 +93,31 @@ export class LoanProductsComponent implements OnInit, AfterViewInit { filteredCount = 0; + /** Category and type filters, fed by the classification each product carries. */ + readonly categories = PRODUCT_TYPE_GROUPS; + categoryFilter = ''; + typeFilter = ''; + activeOnly = false; + textFilter = ''; + + /** Types offered for the chosen category; every type when no category is chosen. */ + get typeOptions() { + return this.categoryFilter + ? (PRODUCT_SUB_TYPES[this.categoryFilter] ?? []) + : Object.values(PRODUCT_SUB_TYPES).flat(); + } + + categoryOf(product: any): string { + return productCategoryLabel(product?.advanceExtensions?.productTypeGroup); + } + + typeOf(product: any): string { + return productTypeLabel( + product?.advanceExtensions?.productTypeGroup, + product?.advanceExtensions?.productTypeSubGroup + ); + } + get totalCount(): number { return this.loanProductsData?.length || 0; } @@ -130,12 +158,52 @@ export class LoanProductsComponent implements OnInit, AfterViewInit { this.dataSource = new MatTableDataSource(this.loanProductsData); this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; + this.dataSource.filterPredicate = (product: any) => this.matchesFilters(product); this.filteredCount = this.totalCount; this.dataSource.connect().subscribe((rows) => (this.filteredCount = rows.length)); } applyFilter(filterValue: string) { - this.dataSource.filter = (filterValue || '').trim().toLowerCase(); + this.textFilter = (filterValue || '').trim().toLowerCase(); + this.refreshFilter(); + } + + onCategoryChange(): void { + // A type belongs to one category, so a type from another category cannot stay selected. + if (this.typeFilter && !this.typeOptions.some((type) => type.id === this.typeFilter)) { + this.typeFilter = ''; + } + this.refreshFilter(); + } + + /** The filter value itself is unused (the predicate reads the fields above); changing it re-runs the predicate. */ + refreshFilter(): void { + this.dataSource.filter = `${this.categoryFilter}|${this.typeFilter}|${this.activeOnly}|${this.textFilter}`; + } + + private matchesFilters(product: any): boolean { + const ext = product?.advanceExtensions ?? {}; + if (this.categoryFilter && ext.productTypeGroup !== this.categoryFilter) { + return false; + } + if (this.typeFilter && ext.productTypeSubGroup !== this.typeFilter) { + return false; + } + if (this.activeOnly && product?.status !== 'loanProduct.active') { + return false; + } + if (this.textFilter) { + const haystack = [ + product?.name, + product?.shortName, + this.categoryOf(product), + this.typeOf(product) + ] + .join(' ') + .toLowerCase(); + return haystack.includes(this.textFilter); + } + return true; } /** diff --git a/src/app/products/loan-products/loan-products.ts b/src/app/products/loan-products/loan-products.ts index 52e913db3..b097b9b43 100644 --- a/src/app/products/loan-products/loan-products.ts +++ b/src/app/products/loan-products/loan-products.ts @@ -50,10 +50,29 @@ export class LoanProducts { delete loanProduct.advancedAccountingRules; delete loanProduct.loanPeriod; - // The Advances payload is assembled explicitly in the create component and already carries only - // whitelisted params (core Fineract fields + satellite ADVANCE_PARAMETERS), so it is NOT stripped. - // For the Loans path, the Details/Security fields below are not backend params, so drop them. - if (loanProduct.productTypeGroup !== 'advances') { + // The Accounting step carries CBS-specific GL mappings that the backend does not accept yet. They are + // sent as '' when the officer leaves them blank, and the backend rejects the whole product for an + // unsupported parameter, so drop the ones that are empty. A mapping the officer actually selects is still + // sent and gets a clear "not supported" answer rather than being silently ignored. + [ + 'intReceivablesGlAccountId', + 'intPayableGlAccountId', + 'deafIntPayableGlAccountId', + 'intOverdueReserveAccountId', + 'undebitedInterestAccountId', + 'penalIntCrGlAccountId', + 'rdMaturedGlAccountId' + ].forEach((key) => { + if (loanProduct[key] === '' || loanProduct[key] === null || loanProduct[key] === undefined) { + delete loanProduct[key]; + } + }); + + // The Advances and Loans A/C (EMI) payloads are assembled explicitly in the create component and already + // carry only whitelisted params (core Fineract fields + satellite params), so they are NOT stripped. + // For any other product (the old Settings/Terms path), the Details/Security fields below are not backend + // params, so drop them. + if (loanProduct.productTypeGroup !== 'advances' && loanProduct.productTypeGroup !== 'loans') { delete loanProduct.productTypeGroup; delete loanProduct.productTypeSubGroup; delete loanProduct.glAccount; diff --git a/src/environments/.env.ts b/src/environments/.env.ts index 94bc5c969..956c04858 100644 --- a/src/environments/.env.ts +++ b/src/environments/.env.ts @@ -9,8 +9,8 @@ /* tslint:disable */ export default { 'mifos_x': { - 'version': '261008', - 'hash': 'a5a64d4ef' + 'version': '261010', + 'hash': 'd61584f29' }, 'allow_switching_backend_instance': true };