feat: interest posting
This commit is contained in:
@@ -22,9 +22,134 @@
|
||||
<input type="date" [(ngModel)]="postingDate" (change)="load()" />
|
||||
</label>
|
||||
<button class="ipr-btn" (click)="load()" [disabled]="loading"><fa-icon icon="undo"></fa-icon> Reload</button>
|
||||
<button class="ipr-btn ipr-btn--primary" (click)="openPreview()" [disabled]="previewLoading">
|
||||
<fa-icon icon="eye"></fa-icon> Preview interest (today)
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (isHeadOffice) {
|
||||
<div class="ipr-tabs">
|
||||
<button class="ipr-tab" [class.is-active]="tab === 'own'" (click)="switchTab('own')">
|
||||
<fa-icon icon="building"></fa-icon> My branch{{ myBranch ? ' — ' + myBranch : '' }}
|
||||
</button>
|
||||
<button class="ipr-tab" [class.is-active]="tab === 'others'" (click)="switchTab('others')">
|
||||
<fa-icon icon="sitemap"></fa-icon> Other branches
|
||||
</button>
|
||||
</div>
|
||||
@if (tab === 'others') {
|
||||
<div class="ipr-alert ipr-alert--info">
|
||||
<fa-icon icon="info-circle"></fa-icon>
|
||||
<div>
|
||||
Each branch generates and approves its own reports. The head office can act here only for a branch that has
|
||||
not opened the day, and only once every other open branch has closed. Anything it approves is marked (HO).
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
|
||||
@if (showPreview) {
|
||||
<div class="ipr-card">
|
||||
<div class="ipr-detail-head">
|
||||
<div>
|
||||
<h3>Interest preview — earned up to {{ previewAsOf }}</h3>
|
||||
<div class="muted">
|
||||
What each account would be paid if interest were posted today. View only — nothing is saved, approved or
|
||||
posted.
|
||||
</div>
|
||||
</div>
|
||||
<div class="ipr-total">
|
||||
<span>Total so far</span>
|
||||
<strong>₹{{ previewTotal | number: '1.2-2' }}</strong>
|
||||
<span class="muted">{{ previewRows.length }} account(s)</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ipr-preview-actions">
|
||||
<button class="ipr-btn ipr-btn--slim" (click)="openPreview()" [disabled]="previewLoading">
|
||||
<fa-icon icon="undo"></fa-icon> Refresh
|
||||
</button>
|
||||
<button
|
||||
class="ipr-btn ipr-btn--slim"
|
||||
(click)="exportPreview()"
|
||||
[disabled]="previewLoading || previewRows.length === 0"
|
||||
>
|
||||
<fa-icon icon="file-excel"></fa-icon> Export Excel
|
||||
</button>
|
||||
<button class="ipr-btn ipr-btn--slim" (click)="closePreview()"><fa-icon icon="times"></fa-icon> Close</button>
|
||||
</div>
|
||||
@if (previewLoading) {
|
||||
<div class="ipr-empty">Calculating interest up to today…</div>
|
||||
} @else {
|
||||
<table class="ipr-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<th>Product</th>
|
||||
<th>Posting date</th>
|
||||
<th class="num">Accounts</th>
|
||||
<th class="num">Interest so far</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (g of previewGroups; track g.officeName + g.productName) {
|
||||
<tr>
|
||||
<td>{{ g.officeName }}</td>
|
||||
<td>
|
||||
<strong>{{ g.productName }}</strong>
|
||||
</td>
|
||||
<td>{{ g.postingDate }}</td>
|
||||
<td class="num">{{ g.accounts }}</td>
|
||||
<td class="num">₹{{ g.interest | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
} @empty {
|
||||
<tr>
|
||||
<td colspan="5" class="ipr-empty">No savings account has interest accrued in its current cycle.</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
@if (previewRows.length > 0) {
|
||||
<table class="ipr-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<th>Product</th>
|
||||
<th>Account no</th>
|
||||
<th>Account holder</th>
|
||||
<th class="num">Balance</th>
|
||||
<th class="num">Rate %</th>
|
||||
<th>Cycle</th>
|
||||
<th class="num">Interest so far</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@for (r of previewRows; track r.savingsAccountId) {
|
||||
<tr>
|
||||
<td>{{ r.officeName }}</td>
|
||||
<td>{{ r.productName }}</td>
|
||||
<td>{{ r.accountNo }}</td>
|
||||
<td>{{ r.clientName }}</td>
|
||||
<td class="num">₹{{ r.balance | number: '1.2-2' }}</td>
|
||||
<td class="num">{{ r.rate | number: '1.2-2' }}</td>
|
||||
<td class="muted">{{ r.cycleStart }} → {{ r.postingDate }}</td>
|
||||
<td class="num">₹{{ r.interest | number: '1.2-2' }}</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="7"><strong>Total</strong></td>
|
||||
<td class="num">
|
||||
<strong>₹{{ previewTotal | number: '1.2-2' }}</strong>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (errorMessage) {
|
||||
<div class="ipr-alert ipr-alert--error">
|
||||
<fa-icon icon="exclamation-triangle"></fa-icon>
|
||||
@@ -52,9 +177,13 @@
|
||||
@for (d of due; track d.productId + '-' + d.officeId) {
|
||||
<div class="ipr-due-row">
|
||||
<strong>{{ d.productName }}</strong> <span>· {{ d.officeName }} · {{ d.postingDate }}</span>
|
||||
<button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="generate(d)" [disabled]="busy">
|
||||
<fa-icon icon="sync"></fa-icon> Generate report
|
||||
</button>
|
||||
@if (d.canAct) {
|
||||
<button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="generate(d)" [disabled]="busy">
|
||||
<fa-icon icon="sync"></fa-icon> {{ tab === 'others' ? 'Generate on behalf' : 'Generate report' }}
|
||||
</button>
|
||||
} @else if (d.blockedReason) {
|
||||
<span class="ipr-blocked">{{ d.blockedReason }}</span>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
@@ -114,9 +243,12 @@
|
||||
}
|
||||
@if (canApprove(r)) {
|
||||
<button class="ipr-btn ipr-btn--primary ipr-btn--slim" (click)="approve(r)" [disabled]="busy">
|
||||
<fa-icon icon="check"></fa-icon> Approve
|
||||
<fa-icon icon="check"></fa-icon> {{ tab === 'others' ? 'Approve on behalf' : 'Approve' }}
|
||||
</button>
|
||||
}
|
||||
@if (!r.canAct && r.blockedReason && (r.status === 'GENERATED' || r.status === 'APPROVED')) {
|
||||
<span class="ipr-blocked">{{ r.blockedReason }}</span>
|
||||
}
|
||||
</td>
|
||||
</tr>
|
||||
} @empty {
|
||||
|
||||
@@ -274,3 +274,54 @@
|
||||
font-weight: 600;
|
||||
color: var(--i-amber);
|
||||
}
|
||||
|
||||
// Preview: refresh / export / close, above the totals.
|
||||
.ipr-preview-actions {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
justify-content: flex-end;
|
||||
padding: 0 16px 10px;
|
||||
}
|
||||
|
||||
.ipr-tabs {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
margin-bottom: 12px;
|
||||
border-bottom: 1px solid var(--i-g200);
|
||||
}
|
||||
|
||||
.ipr-tab {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 8px 14px;
|
||||
margin-bottom: -1px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
color: var(--i-g500);
|
||||
cursor: pointer;
|
||||
background: transparent;
|
||||
border: 1px solid transparent;
|
||||
border-radius: 6px 6px 0 0;
|
||||
|
||||
&.is-active {
|
||||
color: var(--i-navy);
|
||||
background: #fff;
|
||||
border-color: var(--i-g200);
|
||||
border-bottom-color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.ipr-alert--info {
|
||||
background: var(--i-blue-l);
|
||||
color: var(--i-blue);
|
||||
}
|
||||
|
||||
.ipr-blocked {
|
||||
display: inline-block;
|
||||
max-width: 320px;
|
||||
font-size: 11px;
|
||||
line-height: 1.35;
|
||||
color: var(--i-g500);
|
||||
white-space: normal;
|
||||
}
|
||||
|
||||
@@ -11,11 +11,14 @@ import { FormsModule } from '@angular/forms';
|
||||
import { FaIconComponent } from '@fortawesome/angular-fontawesome';
|
||||
import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
|
||||
import { SettingsService } from 'app/settings/settings.service';
|
||||
import { exportWorkbook } from '../cashier/cashier-export';
|
||||
import {
|
||||
InterestPostingDue,
|
||||
InterestPostingReport,
|
||||
InterestPostingReportDetail,
|
||||
InterestPostingReportService
|
||||
InterestPostingReportService,
|
||||
InterestPreviewRow,
|
||||
ReportScope
|
||||
} from './interest-posting-report.service';
|
||||
|
||||
/**
|
||||
@@ -51,15 +54,48 @@ export class InterestPostingReportComponent implements OnInit {
|
||||
/** Products with interest due and no report yet — the noon job ran before they had anything due, or failed. */
|
||||
due: InterestPostingDue[] = [];
|
||||
|
||||
/** 'own' — the user's own branch; 'others' — every other branch, a head-office-only tab. */
|
||||
tab: ReportScope = 'own';
|
||||
isHeadOffice = false;
|
||||
myBranch = '';
|
||||
|
||||
ngOnInit(): void {
|
||||
this.postingDate = this.businessDateIso();
|
||||
this.reportService.context().subscribe({
|
||||
next: (ctx) => {
|
||||
this.isHeadOffice = !!ctx?.headOffice;
|
||||
this.myBranch = ctx?.officeName ?? '';
|
||||
},
|
||||
error: () => (this.isHeadOffice = false)
|
||||
});
|
||||
this.load();
|
||||
}
|
||||
|
||||
switchTab(tab: ReportScope): void {
|
||||
if (this.tab === tab) {
|
||||
return;
|
||||
}
|
||||
this.tab = tab;
|
||||
this.selected = null;
|
||||
this.notice = '';
|
||||
this.load();
|
||||
}
|
||||
|
||||
/** Acting for another branch is the head office's exception, so it is spelt out before it happens. */
|
||||
private confirmOnBehalf(officeName: string, action: string): boolean {
|
||||
if (this.tab !== 'others') {
|
||||
return true;
|
||||
}
|
||||
return confirm(
|
||||
`${officeName} has not opened today. You are about to ${action} its interest posting report on its behalf, ` +
|
||||
'from the head office. Continue?'
|
||||
);
|
||||
}
|
||||
|
||||
load(): void {
|
||||
this.loading = true;
|
||||
this.errorMessage = '';
|
||||
this.reportService.list(this.postingDate || undefined).subscribe({
|
||||
this.reportService.list(this.postingDate || undefined, undefined, undefined, this.tab).subscribe({
|
||||
next: (reports) => {
|
||||
this.reports = reports ?? [];
|
||||
this.loading = false;
|
||||
@@ -75,13 +111,16 @@ export class InterestPostingReportComponent implements OnInit {
|
||||
this.errorMessage = this.messageOf(err, 'Could not load the interest posting reports.');
|
||||
}
|
||||
});
|
||||
this.reportService.dueWithoutReport(this.postingDate || undefined).subscribe({
|
||||
this.reportService.dueWithoutReport(this.postingDate || undefined, this.tab).subscribe({
|
||||
next: (due) => (this.due = due ?? []),
|
||||
error: () => (this.due = [])
|
||||
});
|
||||
}
|
||||
|
||||
generate(item: InterestPostingDue): void {
|
||||
if (!this.confirmOnBehalf(item.officeName, 'generate')) {
|
||||
return;
|
||||
}
|
||||
this.busy = true;
|
||||
this.notice = '';
|
||||
this.errorMessage = '';
|
||||
@@ -111,7 +150,8 @@ export class InterestPostingReportComponent implements OnInit {
|
||||
if (
|
||||
!confirm(
|
||||
`Regenerate the interest posting report for ${report.productName} — ${report.officeName}? It will need approving again.`
|
||||
)
|
||||
) ||
|
||||
!this.confirmOnBehalf(report.officeName, 'regenerate')
|
||||
) {
|
||||
return;
|
||||
}
|
||||
@@ -138,7 +178,8 @@ export class InterestPostingReportComponent implements OnInit {
|
||||
!confirm(
|
||||
`Approve interest of ₹${report.totalInterest} across ${report.accountCount} account(s) for ${report.productName}? ` +
|
||||
'It will be posted when the branch closes the day.'
|
||||
)
|
||||
) ||
|
||||
!this.confirmOnBehalf(report.officeName, 'approve')
|
||||
) {
|
||||
return;
|
||||
}
|
||||
@@ -177,8 +218,165 @@ export class InterestPostingReportComponent implements OnInit {
|
||||
);
|
||||
}
|
||||
|
||||
/** Pending reports that block this user's own day close; another branch's pending reports block only that branch. */
|
||||
get pendingCount(): number {
|
||||
return this.reports.filter((r) => r.status === 'GENERATED').length;
|
||||
return this.tab === 'own' ? this.reports.filter((r) => r.status === 'GENERATED').length : 0;
|
||||
}
|
||||
|
||||
// ── Preview: what each account has earned so far, as if posted today. View only. ──
|
||||
|
||||
showPreview = false;
|
||||
previewLoading = false;
|
||||
previewRows: InterestPreviewRow[] = [];
|
||||
previewAsOf = '';
|
||||
|
||||
openPreview(): void {
|
||||
this.showPreview = true;
|
||||
this.previewLoading = true;
|
||||
this.errorMessage = '';
|
||||
this.reportService.preview().subscribe({
|
||||
next: (rows) => {
|
||||
this.previewRows = rows ?? [];
|
||||
this.previewAsOf = this.previewRows[0]?.asOf ?? this.businessDateIso();
|
||||
this.previewLoading = false;
|
||||
},
|
||||
error: (err) => {
|
||||
this.previewLoading = false;
|
||||
this.previewRows = [];
|
||||
this.errorMessage = this.messageOf(err, 'Could not load the interest preview.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
closePreview(): void {
|
||||
this.showPreview = false;
|
||||
}
|
||||
|
||||
get previewTotal(): number {
|
||||
return this.previewRows.reduce((sum, r) => sum + Number(r.interest || 0), 0);
|
||||
}
|
||||
|
||||
/** Totals by branch and product, for the summary above the account list and the export. */
|
||||
get previewGroups(): {
|
||||
officeName: string;
|
||||
productName: string;
|
||||
postingDate: string;
|
||||
accounts: number;
|
||||
interest: number;
|
||||
}[] {
|
||||
const map = new Map<
|
||||
string,
|
||||
{ officeName: string; productName: string; postingDate: string; accounts: number; interest: number }
|
||||
>();
|
||||
this.previewRows.forEach((r) => {
|
||||
const key = `${r.officeName}|${r.productName}`;
|
||||
const g = map.get(key) ?? {
|
||||
officeName: r.officeName,
|
||||
productName: r.productName,
|
||||
postingDate: r.postingDate,
|
||||
accounts: 0,
|
||||
interest: 0
|
||||
};
|
||||
g.accounts += 1;
|
||||
g.interest += Number(r.interest || 0);
|
||||
map.set(key, g);
|
||||
});
|
||||
return [...map.values()];
|
||||
}
|
||||
|
||||
exportPreview(): void {
|
||||
const stamp = `Interest earned to ${this.previewAsOf} — preview, not posted`;
|
||||
exportWorkbook(
|
||||
[
|
||||
{
|
||||
sheetName: 'By account',
|
||||
title: 'Savings Interest Preview',
|
||||
subtitle: stamp,
|
||||
headers: [
|
||||
'Branch',
|
||||
'Product',
|
||||
'Account No',
|
||||
'Customer',
|
||||
'Balance',
|
||||
'Rate %',
|
||||
'Cycle Start',
|
||||
'Posting Date',
|
||||
'Interest So Far'
|
||||
],
|
||||
widths: [
|
||||
18,
|
||||
22,
|
||||
20,
|
||||
26,
|
||||
16,
|
||||
8,
|
||||
12,
|
||||
12,
|
||||
16
|
||||
],
|
||||
rows: [
|
||||
...this.previewRows.map((r) => [
|
||||
r.officeName,
|
||||
r.productName,
|
||||
r.accountNo,
|
||||
r.clientName,
|
||||
Number(r.balance || 0),
|
||||
Number(r.rate || 0),
|
||||
r.cycleStart,
|
||||
r.postingDate,
|
||||
Number(r.interest || 0)
|
||||
]),
|
||||
[
|
||||
'TOTAL',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
this.previewTotal
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
sheetName: 'By branch & product',
|
||||
title: 'Savings Interest Preview — Totals',
|
||||
subtitle: stamp,
|
||||
headers: [
|
||||
'Branch',
|
||||
'Product',
|
||||
'Posting Date',
|
||||
'Accounts',
|
||||
'Interest So Far'
|
||||
],
|
||||
widths: [
|
||||
18,
|
||||
22,
|
||||
12,
|
||||
10,
|
||||
16
|
||||
],
|
||||
rows: [
|
||||
...this.previewGroups.map((g) => [
|
||||
g.officeName,
|
||||
g.productName,
|
||||
g.postingDate,
|
||||
g.accounts,
|
||||
g.interest
|
||||
]),
|
||||
[
|
||||
'TOTAL',
|
||||
'',
|
||||
'',
|
||||
this.previewRows.length,
|
||||
this.previewTotal
|
||||
]
|
||||
]
|
||||
}
|
||||
],
|
||||
`savings-interest-preview-${this.previewAsOf}`
|
||||
);
|
||||
}
|
||||
|
||||
private businessDateIso(): string {
|
||||
|
||||
@@ -12,6 +12,9 @@ import { Observable } from 'rxjs';
|
||||
|
||||
export type InterestPostingReportStatus = 'GENERATED' | 'APPROVED' | 'POSTED' | 'SUPERSEDED';
|
||||
|
||||
/** Which branches a list covers: the user's own, or (head office only) every other branch. */
|
||||
export type ReportScope = 'own' | 'others';
|
||||
|
||||
export interface InterestPostingReport {
|
||||
id: number;
|
||||
productId: number;
|
||||
@@ -32,6 +35,8 @@ export interface InterestPostingReport {
|
||||
failureReason: string | null;
|
||||
/** Whether the signed-in user may regenerate or approve it: their own branch, or the head office for a branch that did not open. */
|
||||
canAct: boolean;
|
||||
/** Why not, where canAct is false. */
|
||||
blockedReason: string | null;
|
||||
}
|
||||
|
||||
export interface InterestPostingReportLine {
|
||||
@@ -60,6 +65,8 @@ export interface InterestPostingDue {
|
||||
officeId: number;
|
||||
officeName: string;
|
||||
postingDate: string;
|
||||
canAct: boolean;
|
||||
blockedReason: string | null;
|
||||
}
|
||||
|
||||
export interface InterestPostingSummaryRow {
|
||||
@@ -78,6 +85,22 @@ export interface InterestPostingSummaryRow {
|
||||
postedAt: string | null;
|
||||
}
|
||||
|
||||
export interface InterestPreviewRow {
|
||||
officeId: number;
|
||||
officeName: string;
|
||||
productId: number;
|
||||
productName: string;
|
||||
savingsAccountId: number;
|
||||
accountNo: string;
|
||||
clientName: string;
|
||||
balance: number;
|
||||
rate: number;
|
||||
cycleStart: string;
|
||||
postingDate: string;
|
||||
asOf: string;
|
||||
interest: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* The savings interest posting reports, one per branch and product: generated at noon on a posting
|
||||
* date, approved by the branch, posted when the branch closes the day.
|
||||
@@ -87,8 +110,15 @@ export class InterestPostingReportService {
|
||||
private http = inject(HttpClient);
|
||||
private readonly base = '/savingsinterestpostingreports';
|
||||
|
||||
list(postingDate?: string, status?: string, officeId?: number): Observable<InterestPostingReport[]> {
|
||||
/** scope 'own' is the user's own branch; 'others' (head office only) every other branch. */
|
||||
list(
|
||||
postingDate?: string,
|
||||
status?: string,
|
||||
officeId?: number,
|
||||
scope?: ReportScope
|
||||
): Observable<InterestPostingReport[]> {
|
||||
let params = new HttpParams();
|
||||
if (scope) params = params.set('scope', scope);
|
||||
if (postingDate) params = params.set('postingDate', postingDate);
|
||||
if (status) params = params.set('status', status);
|
||||
if (officeId) params = params.set('officeId', String(officeId));
|
||||
@@ -96,12 +126,18 @@ export class InterestPostingReportService {
|
||||
}
|
||||
|
||||
/** Branch and product pairs with interest due by the date and no report yet, that this user may generate. */
|
||||
dueWithoutReport(postingDate?: string): Observable<InterestPostingDue[]> {
|
||||
dueWithoutReport(postingDate?: string, scope?: ReportScope): Observable<InterestPostingDue[]> {
|
||||
let params = new HttpParams();
|
||||
if (scope) params = params.set('scope', scope);
|
||||
if (postingDate) params = params.set('postingDate', postingDate);
|
||||
return this.http.get<InterestPostingDue[]>(`${this.base}/due-without-report`, { params });
|
||||
}
|
||||
|
||||
/** The signed-in user's branch, and whether it is the head office. */
|
||||
context(): Observable<{ officeId: number; officeName: string; headOffice: boolean }> {
|
||||
return this.http.get<{ officeId: number; officeName: string; headOffice: boolean }>(`${this.base}/context`);
|
||||
}
|
||||
|
||||
detail(reportId: number): Observable<InterestPostingReportDetail> {
|
||||
return this.http.get<InterestPostingReportDetail>(`${this.base}/${reportId}`);
|
||||
}
|
||||
@@ -126,6 +162,13 @@ export class InterestPostingReportService {
|
||||
);
|
||||
}
|
||||
|
||||
/** Interest each account has earned so far this cycle, as if posted today. View only. */
|
||||
preview(officeId?: number): Observable<InterestPreviewRow[]> {
|
||||
let params = new HttpParams();
|
||||
if (officeId) params = params.set('officeId', String(officeId));
|
||||
return this.http.get<InterestPreviewRow[]>(`${this.base}/preview`, { params });
|
||||
}
|
||||
|
||||
/** The head office's branch-wise view over a date range. */
|
||||
summary(fromDate?: string, toDate?: string, productId?: number): Observable<InterestPostingSummaryRow[]> {
|
||||
let params = new HttpParams();
|
||||
|
||||
Reference in New Issue
Block a user