feat: recurring deposit enhancements, dashboard, chart, and account view updates
This commit is contained in:
@@ -591,16 +591,13 @@
|
||||
<i class="fa fa-calendar section-header__icon"></i>
|
||||
<h3 class="section-header__title">{{ 'labels.heading.Recurring Deposit Accounts' | translate }}</h3>
|
||||
</div>
|
||||
<div class="section-header__right">
|
||||
<button mat-raised-button color="primary" (click)="toggleRecurringAccountsOverview()">
|
||||
{{ viewAccountsLabel(showClosedRecurringAccounts) | translate }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if (!showClosedRecurringAccounts) {
|
||||
<!-- Active and ended recurring deposits share one table; the Status column says how each one ended (matured or
|
||||
closed early), so the client's RD history stays visible without switching views. -->
|
||||
@if (savingAccounts) {
|
||||
<div class="table-wrapper">
|
||||
<table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring'">
|
||||
<table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring'">
|
||||
<ng-container matColumnDef="Account No">
|
||||
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
@@ -614,6 +611,15 @@
|
||||
<mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="Status">
|
||||
<th mat-header-cell *matHeaderCellDef>Status</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{ rdStatusLabel(element) }}</span>
|
||||
@if (element.timeline?.closedOnDate) {
|
||||
<div class="rd-status__date">on {{ element.timeline.closedOnDate | dateFormat }}</div>
|
||||
}
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="Last Active">
|
||||
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
|
||||
@@ -638,7 +644,7 @@
|
||||
<i class="fa fa-check"></i>
|
||||
</button>
|
||||
}
|
||||
@if (!element.status.submittedAndPendingApproval && !element.status.active) {
|
||||
@if (element.status.approved) {
|
||||
<button
|
||||
class="account-action-button"
|
||||
mat-raised-button
|
||||
@@ -664,7 +670,7 @@
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="no-data">
|
||||
<td mat-footer-cell *matFooterCellDef [attr.colspan]="openSavingsColumns.length">
|
||||
<td mat-footer-cell *matFooterCellDef [attr.colspan]="recurringColumns.length">
|
||||
<div class="table-empty-state">
|
||||
<i class="fa fa-folder-open-o table-empty-state__icon"></i>
|
||||
<p class="table-empty-state__text">
|
||||
@@ -674,67 +680,17 @@
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="openSavingsColumns"></tr>
|
||||
<tr mat-header-row *matHeaderRowDef="recurringColumns"></tr>
|
||||
<tr
|
||||
mat-row
|
||||
*matRowDef="let row; columns: openSavingsColumns"
|
||||
*matRowDef="let row; columns: recurringColumns"
|
||||
[routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
|
||||
class="select-row"
|
||||
></tr>
|
||||
<tr
|
||||
mat-footer-row
|
||||
*matFooterRowDef="
|
||||
(savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring')?.length === 0 ? ['no-data'] : []
|
||||
"
|
||||
></tr>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
|
||||
<!-- Closed Recurring Deposit Accounts -->
|
||||
@if (showClosedRecurringAccounts) {
|
||||
<div class="table-wrapper">
|
||||
<table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring'">
|
||||
<ng-container matColumnDef="Account No">
|
||||
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<i class="fa fa-stop" [ngClass]="element.status.code | statusLookup"></i>
|
||||
<mifosx-account-number accountNo="{{ element.accountNo }}"></mifosx-account-number>
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="Saving Account">
|
||||
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Recurring Deposit Product' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let element">
|
||||
<mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
|
||||
</td>
|
||||
</ng-container>
|
||||
<ng-container matColumnDef="Closed Date">
|
||||
<th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
|
||||
<td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
|
||||
</ng-container>
|
||||
|
||||
<ng-container matColumnDef="no-data">
|
||||
<td mat-footer-cell *matFooterCellDef [attr.colspan]="closedSavingsColumns.length">
|
||||
<div class="table-empty-state">
|
||||
<i class="fa fa-folder-open-o table-empty-state__icon"></i>
|
||||
<p class="table-empty-state__text">
|
||||
{{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }}
|
||||
</p>
|
||||
</div>
|
||||
</td>
|
||||
</ng-container>
|
||||
|
||||
<tr mat-header-row *matHeaderRowDef="closedSavingsColumns"></tr>
|
||||
<tr
|
||||
mat-row
|
||||
*matRowDef="let row; columns: closedSavingsColumns"
|
||||
[routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
|
||||
class="select-row"
|
||||
></tr>
|
||||
<tr
|
||||
mat-footer-row
|
||||
*matFooterRowDef="
|
||||
(savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring')?.length === 0 ? ['no-data'] : []
|
||||
(savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring')?.length === 0 ? ['no-data'] : []
|
||||
"
|
||||
></tr>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user