- No accounts are mapped to this head, so the return reports nothing under it. Map them in
- Admin → RBI Reserve Configuration.
+ No accounts are mapped to this head, so the return reports nothing under it. Map them in Admin →
+ RBI Reserve Configuration.
}
-
Total Demand Liabilities ({{ demandLiabilities.length }} accounts)
-
{{ totalOf(demandLiabilities, "openingValue") }}
-
{{ totalOf(demandLiabilities, "currentValue") }}
+
+ Total Demand Liabilities ({{ demandLiabilities.length }} accounts)
+
+
{{ totalOf(demandLiabilities, 'openingValue') }}
+
{{ totalOf(demandLiabilities, 'currentValue') }}
{{ totalChange(demandLiabilities) }}
@@ -206,21 +205,22 @@
- }
- @empty {
+ } @empty {
- No accounts are mapped to this head, so the return reports nothing under it. Map them in
- Admin → RBI Reserve Configuration.
+ No accounts are mapped to this head, so the return reports nothing under it. Map them in Admin →
+ RBI Reserve Configuration.
}
-
Total Time Liabilities ({{ timeLiabilities.length }} accounts)
-
{{ totalOf(timeLiabilities, "openingValue") }}
-
{{ totalOf(timeLiabilities, "currentValue") }}
+
+ Total Time Liabilities ({{ timeLiabilities.length }} accounts)
+
- No accounts are mapped to this head, so the return reports nothing under it. Map them in
- Admin → RBI Reserve Configuration.
+ No accounts are mapped to this head, so the return reports nothing under it. Map them in Admin →
+ RBI Reserve Configuration.
}
@@ -278,8 +277,8 @@
Total Assets with Banking System( Deducted from NDTL )
- No accounts are mapped to this head, so the return reports nothing under it. Map them in
- Admin → RBI Reserve Configuration.
+ No accounts are mapped to this head, so the return reports nothing under it. Map them in Admin →
+ RBI Reserve Configuration.
}
@@ -341,8 +339,8 @@
Total Liquid Assets (SLR Eligible)
-
{{ totalOf(liquidAssets, "openingValue") }}
-
{{ totalOf(liquidAssets, "currentValue") }}
+
{{ totalOf(liquidAssets, 'openingValue') }}
+
{{ totalOf(liquidAssets, 'currentValue') }}
{{ totalChange(liquidAssets) }}
diff --git a/src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.ts b/src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.ts
index 04770829f..6344659ad 100644
--- a/src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.ts
+++ b/src/app/home/dashboard/crr-slr-dialog/crr-slr-dialog.component.ts
@@ -128,8 +128,7 @@ export class CrrSlrDialogComponent implements OnInit {
if (!columns.length) {
this.unavailable =
- data?.unmetRequirements?.[0] ??
- 'Form 1 could not be computed. Check the CRR/SLR configuration in Admin.';
+ data?.unmetRequirements?.[0] ?? 'Form 1 could not be computed. Check the CRR/SLR configuration in Admin.';
return;
}
// The return computes but says something would make it wrong to file — a rate never set, a
@@ -175,7 +174,6 @@ export class CrrSlrDialogComponent implements OnInit {
});
}
-
/**
* The four tabs, filled from the return's own lines.
*
diff --git a/src/app/home/dashboard/dashboard.component.html b/src/app/home/dashboard/dashboard.component.html
index 371434f2f..f0889bd9d 100644
--- a/src/app/home/dashboard/dashboard.component.html
+++ b/src/app/home/dashboard/dashboard.component.html
@@ -33,11 +33,15 @@
rate Admin was on. -->
+}
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/organization/rbi-reserve-config/rbi-reserve-config.component.html b/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.html
index 63e0e807a..eb165f58c 100644
--- a/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.html
+++ b/src/app/organization/rbi-reserve-config/rbi-reserve-config.component.html
@@ -52,7 +52,9 @@
}
} @else {
Not set
- {{ type === 'CRR' ? 'Form 1 Part B' : 'Form 1 Part C' }} cannot compute
+ {{ type === 'CRR' ? 'Form 1 Part B' : 'Form 1 Part C' }} cannot compute
}
}
@@ -230,7 +232,7 @@
-
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..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 @@
-
+
@@ -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 }}
+
+
+
Add amount slab
+
+
+
+
+
+
+
+
+
+
+
+
+
The new slab is added as the last column; fill in its rates for each product.
{{ canEdit ? 'Cancel' : 'Back to list' }}
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..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
@@ -70,6 +70,85 @@
}
}
+ &__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-hint {
+ margin-top: 8px;
+ font-size: 12px;
+ color: #64748b;
+ }
+
+ &__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..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
@@ -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,41 +209,130 @@ 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.addingSlab = false;
+ 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();
}
- /** Append a new amount slab column; every existing row grows by one blank cell. */
+ /** 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;
+ }
+ }
+
+ /** "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/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..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
@@ -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.