feat: add recurring deposit account tab (transactions tab) (#981)
Fixes: #980
This commit is contained in:
+6
@@ -201,6 +201,12 @@
|
|||||||
[active]="IRC.isActive">
|
[active]="IRC.isActive">
|
||||||
Interest Rate Chart
|
Interest Rate Chart
|
||||||
</a>
|
</a>
|
||||||
|
<ng-container *ngIf="recurringDepositsAccountData.transactions">
|
||||||
|
<a mat-tab-link [routerLink]="['./transactions']" routerLinkActive #transactions="routerLinkActive"
|
||||||
|
[active]="transactions.isActive">
|
||||||
|
Transactions
|
||||||
|
</a>
|
||||||
|
</ng-container>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
|
|||||||
+46
@@ -0,0 +1,46 @@
|
|||||||
|
<div class="tab-container mat-typography">
|
||||||
|
|
||||||
|
<div class="mat-elevation-z1 m-b-25">
|
||||||
|
|
||||||
|
<table mat-table [dataSource]="dataSource">
|
||||||
|
|
||||||
|
<ng-container matColumnDef="id">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> ID </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.id }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="transactionDate">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Transaction Date </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.date | date }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="transactionType">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Transaction Type </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.transactionType.value }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="debit">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Debit </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}">
|
||||||
|
{{ isDebit(transaction.transactionType) ? transaction.amount : 'N/A'}} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="credit">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Credit </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}">
|
||||||
|
{{ !isDebit(transaction.transactionType) ? transaction.amount : 'N/A' }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="balance">
|
||||||
|
<th mat-header-cell *matHeaderCellDef> Balance </th>
|
||||||
|
<td mat-cell *matCellDef="let transaction" [ngClass]="{'strike': transaction.reversed}"> {{ transaction.runningBalance }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
|
||||||
|
|
||||||
|
</table>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
.tab-container {
|
||||||
|
padding: 1%;
|
||||||
|
margin: 1%;
|
||||||
|
h3 {
|
||||||
|
margin:1% auto;
|
||||||
|
}
|
||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.strike {
|
||||||
|
text-decoration: line-through;
|
||||||
|
color: red;
|
||||||
|
}
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { TransactionsTabComponent } from './transactions-tab.component';
|
||||||
|
|
||||||
|
describe('TransactionsTabComponent', () => {
|
||||||
|
let component: TransactionsTabComponent;
|
||||||
|
let fixture: ComponentFixture<TransactionsTabComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ TransactionsTabComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(TransactionsTabComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
+49
@@ -0,0 +1,49 @@
|
|||||||
|
/** Angular Imports */
|
||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { MatTableDataSource } from '@angular/material';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transactions Tab Component.
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-transactions-tab',
|
||||||
|
templateUrl: './transactions-tab.component.html',
|
||||||
|
styleUrls: ['./transactions-tab.component.scss']
|
||||||
|
})
|
||||||
|
export class TransactionsTabComponent implements OnInit {
|
||||||
|
|
||||||
|
/** Recurring Deposits Account Status */
|
||||||
|
status: any;
|
||||||
|
/** Transactions Data */
|
||||||
|
transactionsData: any;
|
||||||
|
/** Columns to be displayed in transactions table. */
|
||||||
|
displayedColumns: string[] = ['id', 'transactionDate', 'transactionType', 'debit', 'credit', 'balance'];
|
||||||
|
/** Data source for transactions table. */
|
||||||
|
dataSource: MatTableDataSource<any>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieves recurring deposits account data from `resolve`.
|
||||||
|
* @param {ActivatedRoute} route Activated Route.
|
||||||
|
*/
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
this.route.parent.data.subscribe((data: { recurringDepositsAccountData: any }) => {
|
||||||
|
this.transactionsData = data.recurringDepositsAccountData.transactions;
|
||||||
|
this.status = data.recurringDepositsAccountData.status.value;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.dataSource = new MatTableDataSource(this.transactionsData);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if transaction is debit.
|
||||||
|
* @param {any} transactionType Transaction Type
|
||||||
|
*/
|
||||||
|
isDebit(transactionType: any) {
|
||||||
|
return transactionType.withdrawal === true || transactionType.feeDeduction === true
|
||||||
|
|| transactionType.overdraftInterest === true || transactionType.withholdTax === true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import { extract } from '../../core/i18n/i18n.service';
|
|||||||
/** Custom Components */
|
/** Custom Components */
|
||||||
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
|
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
|
||||||
import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
|
import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
|
||||||
|
import { TransactionsTabComponent } from './recurring-deposits-account-view/transactions-tab/transactions-tab.component';
|
||||||
|
|
||||||
/** Custom Resolvers */
|
/** Custom Resolvers */
|
||||||
import { RecurringDepositsAccountViewResolver } from './common-resolvers/recurring-deposits-account-view.resolver';
|
import { RecurringDepositsAccountViewResolver } from './common-resolvers/recurring-deposits-account-view.resolver';
|
||||||
@@ -33,6 +34,14 @@ const routes: Routes = [
|
|||||||
resolve: {
|
resolve: {
|
||||||
recurringDepositsAccountData: RecurringDepositsAccountDataResolver
|
recurringDepositsAccountData: RecurringDepositsAccountDataResolver
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'transactions',
|
||||||
|
component: TransactionsTabComponent,
|
||||||
|
data: { title: extract('Transactions'), breadcrumb: 'Transactions', routeParamBreadcrumb: false },
|
||||||
|
resolve: {
|
||||||
|
recurringDepositsAccountData: RecurringDepositsAccountDataResolver
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import { DirectivesModule } from '../../directives/directives.module';
|
|||||||
/** Custom Components */
|
/** Custom Components */
|
||||||
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
|
import { RecurringDepositsAccountViewComponent } from './recurring-deposits-account-view/recurring-deposits-account-view.component';
|
||||||
import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
|
import { InterestRateChartTabComponent } from './recurring-deposits-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component';
|
||||||
|
import { TransactionsTabComponent } from './recurring-deposits-account-view/transactions-tab/transactions-tab.component';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RecurringDeposits Module
|
* RecurringDeposits Module
|
||||||
@@ -26,7 +27,8 @@ import { InterestRateChartTabComponent } from './recurring-deposits-account-view
|
|||||||
],
|
],
|
||||||
declarations: [
|
declarations: [
|
||||||
RecurringDepositsAccountViewComponent,
|
RecurringDepositsAccountViewComponent,
|
||||||
InterestRateChartTabComponent
|
InterestRateChartTabComponent,
|
||||||
|
TransactionsTabComponent
|
||||||
],
|
],
|
||||||
providers: [DatePipe]
|
providers: [DatePipe]
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user