feat: add dividends list page (#804)

Fixes: #769
This commit is contained in:
stableapple
2020-05-31 18:07:30 +05:30
committed by GitHub
parent 28b3f730f0
commit 224ff151da
9 changed files with 255 additions and 58 deletions
+12 -1
View File
@@ -40,6 +40,7 @@ import { ViewTaxComponentComponent } from './manage-tax-components/view-tax-comp
import { CreateTaxComponentComponent } from './manage-tax-components/create-tax-component/create-tax-component.component'; import { CreateTaxComponentComponent } from './manage-tax-components/create-tax-component/create-tax-component.component';
import { EditTaxComponentComponent } from './manage-tax-components/edit-tax-component/edit-tax-component.component'; import { EditTaxComponentComponent } from './manage-tax-components/edit-tax-component/edit-tax-component.component';
import { ViewTaxGroupComponent } from './manage-tax-groups/view-tax-group/view-tax-group.component'; import { ViewTaxGroupComponent } from './manage-tax-groups/view-tax-group/view-tax-group.component';
import { ShareProductsDividendsComponent } from './share-products/dividends-share-product/dividends.components';
/** Custom Resolvers */ /** Custom Resolvers */
import { LoanProductsResolver } from './loan-products/loan-products.resolver'; import { LoanProductsResolver } from './loan-products/loan-products.resolver';
@@ -70,6 +71,7 @@ import { TaxComponentTemplateResolver } from './manage-tax-components/tax-compon
import { EditChargeComponent } from './charges/edit-charge/edit-charge.component'; import { EditChargeComponent } from './charges/edit-charge/edit-charge.component';
import { ChargesTemplateResolver } from './charges/charges-template.resolver'; import { ChargesTemplateResolver } from './charges/charges-template.resolver';
import { TaxGroupResolver } from './manage-tax-groups/tax-group.resolver'; import { TaxGroupResolver } from './manage-tax-groups/tax-group.resolver';
import { DividendsResolver } from './share-products/dividends-share-product/dividends.resolver';
/** Products Routes */ /** Products Routes */
const routes: Routes = [ const routes: Routes = [
@@ -203,6 +205,14 @@ const routes: Routes = [
resolve: { resolve: {
shareProductAndTemplate: ShareProductAndTemplateResolver shareProductAndTemplate: ShareProductAndTemplateResolver
} }
},
{
path: 'dividends',
data: { title: extract('Share Products Dividends'), breadcrumb: 'Dividends', routeParamBreadcrumb: false},
component: ShareProductsDividendsComponent,
resolve: {
dividends: DividendsResolver
}
} }
] ]
} }
@@ -452,7 +462,8 @@ const routes: Routes = [
FloatingRatesResolver, FloatingRatesResolver,
TaxComponentTemplateResolver, TaxComponentTemplateResolver,
EditTaxComponentComponent, EditTaxComponentComponent,
TaxGroupResolver TaxGroupResolver,
DividendsResolver
] ]
}) })
export class ProductsRoutingModule { } export class ProductsRoutingModule { }
+3 -1
View File
@@ -74,6 +74,7 @@ import { EditChargeComponent } from './charges/edit-charge/edit-charge.component
import { MatFormFieldModule, MatSelectModule, MatOptionModule } from '@angular/material'; import { MatFormFieldModule, MatSelectModule, MatOptionModule } from '@angular/material';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ViewTaxGroupComponent } from './manage-tax-groups/view-tax-group/view-tax-group.component'; import { ViewTaxGroupComponent } from './manage-tax-groups/view-tax-group/view-tax-group.component';
import { ShareProductsDividendsComponent } from './share-products/dividends-share-product/dividends.components';
/** /**
* Products Module * Products Module
@@ -151,7 +152,8 @@ import { ViewTaxGroupComponent } from './manage-tax-groups/view-tax-group/view-t
CreateTaxComponentComponent, CreateTaxComponentComponent,
EditTaxComponentComponent, EditTaxComponentComponent,
EditChargeComponent, EditChargeComponent,
ViewTaxGroupComponent ViewTaxGroupComponent,
ShareProductsDividendsComponent
], ],
entryComponents: [ entryComponents: [
FloatingRatePeriodDialogComponent FloatingRatePeriodDialogComponent
+4
View File
@@ -90,6 +90,10 @@ export class ProductsService {
return this.http.put(`/products/share/${shareProductId}`, shareProduct); return this.http.put(`/products/share/${shareProductId}`, shareProduct);
} }
getDividends(shareProductId: string): Observable<any> {
return this.http.get(`/shareproduct/${shareProductId}/dividend`);
}
/** /**
* @returns {Observable<any>} Recurring deposit products data * @returns {Observable<any>} Recurring deposit products data
*/ */
@@ -0,0 +1,55 @@
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
<button mat-raised-button color="primary">
<fa-icon icon="plus"></fa-icon>&nbsp;&nbsp;
Initiate Dividend
</button>
</div>
<div class="container">
<div fxLayout="row">
<mat-form-field fxFlex>
<mat-label>Filter</mat-label>
<input matInput (keyup)="applyFilter($event.target.value)">
</mat-form-field>
</div>
<div class="mat-elevation-z8">
<table mat-table [dataSource]="dataSource" matSort>
<ng-container matColumnDef="name">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let dividend">{{ dividend.productData.name }}</td>
</ng-container>
<ng-container matColumnDef="dividendPeriodStartDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Dividend Period Start Date </th>
<td mat-cell *matCellDef="let dividend">{{ dividend.dividendPeriodStartDate | date }}</td>
</ng-container>
<ng-container matColumnDef="dividendPeriodEndDate">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Dividend Period End Date </th>
<td mat-cell *matCellDef="let dividend">{{ dividend.dividendPeriodEndDate | date }}</td>
</ng-container>
<ng-container matColumnDef="amount">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Amount </th>
<td mat-cell *matCellDef="let dividend"> {{ dividend.amount }}</td>
</ng-container>
<ng-container matColumnDef="status">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Status </th>
<td mat-cell *matCellDef="let dividend">{{ dividend.status.value }}</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="[row.id]" class="select-row"></tr>
</table>
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
</div>
@@ -0,0 +1,7 @@
table {
width: 100%;
.select-row:hover {
cursor: pointer;
}
}
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ShareProductsDividendsComponent } from './dividends.components';
describe('ShareProductsComponent', () => {
let component: ShareProductsDividendsComponent;
let fixture: ComponentFixture<ShareProductsDividendsComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ShareProductsDividendsComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ShareProductsDividendsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
@@ -0,0 +1,62 @@
/** Angular Imports */
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatPaginator, MatSort, MatTableDataSource } from '@angular/material';
import { ActivatedRoute } from '@angular/router';
/**
* Dividends component.
*/
@Component({
selector: 'mifosx-dividends-share-product',
templateUrl: './dividends.component.html',
styleUrls: ['./dividends.component.scss']
})
export class ShareProductsDividendsComponent implements OnInit {
/** Dividends data. */
dividendData: any;
/** Columns to be displayed in dividends table. */
displayedColumns: string[] = ['name', 'dividendPeriodStartDate', 'dividendPeriodEndDate', 'amount', 'status'];
/** Data source for accounting rules table. */
dataSource: MatTableDataSource<any>;
/** Paginator for dividends table. */
@ViewChild(MatPaginator) paginator: MatPaginator;
/** Sorter for dividends table. */
@ViewChild(MatSort) sort: MatSort;
/**
* Retrieves the dividends data from `resolve`.
* @param {ActivatedRoute} route Activated Route.
*/
constructor(private route: ActivatedRoute) {
this.route.data.subscribe((data: {dividends: any}) => {
this.dividendData = data.dividends.pageItems;
});
}
/**
* Sets the dividends table.
*/
ngOnInit() {
this.setDividends();
}
/**
* Initializes the data source, paginator and sorter for dividends table.
*/
setDividends() {
this.dataSource = new MatTableDataSource(this.dividendData);
this.dataSource.paginator = this.paginator;
this.dataSource.sort = this.sort;
}
/**
* Filters data in dividends table based on passed value.
* @param {string} filterValue Value to filter data.
*/
applyFilter(filterValue: string) {
this.dataSource.filter = filterValue.trim().toLowerCase();
}
}
@@ -0,0 +1,31 @@
/** Angular Imports */
import { Injectable } from '@angular/core';
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
/** rxjs Imports */
import { Observable } from 'rxjs';
/** Custom Services */
import { ProductsService } from '../../products.service';
/**
* Share products data resolver.
*/
@Injectable()
export class DividendsResolver implements Resolve<Object> {
/**
* @param {ProductsService} productsService Products service.
*/
constructor(private productsService: ProductsService) {}
/**
* Returns the share products data.
* @returns {Observable<any>}
*/
resolve(route: ActivatedRouteSnapshot): Observable<any> {
const id = route.paramMap.get('id');
return this.productsService.getDividends(id);
}
}
@@ -3,7 +3,7 @@
<fa-icon icon="edit"></fa-icon>&nbsp;&nbsp; <fa-icon icon="edit"></fa-icon>&nbsp;&nbsp;
Edit Edit
</button> </button>
<button mat-raised-button color="primary"> <button mat-raised-button color="primary" [routerLink]="['dividends']">
<fa-icon icon="hand-holding-usd"></fa-icon>&nbsp;&nbsp; <fa-icon icon="hand-holding-usd"></fa-icon>&nbsp;&nbsp;
Dividends Dividends
</button> </button>