diff --git a/src/app/products/manage-tax-components/manage-tax-components.component.html b/src/app/products/manage-tax-components/manage-tax-components.component.html new file mode 100644 index 000000000..79269e86c --- /dev/null +++ b/src/app/products/manage-tax-components/manage-tax-components.component.html @@ -0,0 +1,40 @@ +
+ +
+ +
+ +
+ + Filter + + +
+ +
+ + + + + + + + + + + + + + + + +
Name {{ taxComponent.name }} Percentage {{ taxComponent.percentage }}
+ + + +
+ +
diff --git a/src/app/products/manage-tax-components/manage-tax-components.component.scss b/src/app/products/manage-tax-components/manage-tax-components.component.scss new file mode 100644 index 000000000..24edb63bb --- /dev/null +++ b/src/app/products/manage-tax-components/manage-tax-components.component.scss @@ -0,0 +1,7 @@ +table { + width: 100%; + + .select-row:hover { + cursor: pointer; + } +} diff --git a/src/app/products/manage-tax-components/manage-tax-components.component.spec.ts b/src/app/products/manage-tax-components/manage-tax-components.component.spec.ts new file mode 100644 index 000000000..045c33c47 --- /dev/null +++ b/src/app/products/manage-tax-components/manage-tax-components.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ManageTaxComponentsComponent } from './manage-tax-components.component'; + +describe('FixedDepositProductsComponent', () => { + let component: ManageTaxComponentsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ManageTaxComponentsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ManageTaxComponentsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/products/manage-tax-components/manage-tax-components.component.ts b/src/app/products/manage-tax-components/manage-tax-components.component.ts new file mode 100644 index 000000000..b5e898567 --- /dev/null +++ b/src/app/products/manage-tax-components/manage-tax-components.component.ts @@ -0,0 +1,65 @@ +/** Angular Imports */ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { MatTableDataSource, MatPaginator, MatSort } from '@angular/material'; +import { ActivatedRoute } from '@angular/router'; + +/** rxjs Imports */ +import { of } from 'rxjs'; + +/** + * Manage Tax Components component. + */ +@Component({ + selector: 'mifosx-manage-tax-components', + templateUrl: './manage-tax-components.component.html', + styleUrls: ['./manage-tax-components.component.scss'] +}) +export class ManageTaxComponentsComponent implements OnInit { + + /** Tax Components data. */ + taxComponentData: any; + /** Columns to be displayed in tax component table. */ + displayedColumns: string[] = ['name', 'percentage']; + /** Data source for tax component table. */ + dataSource: MatTableDataSource; + + /** Paginator for tax component table. */ + @ViewChild(MatPaginator) paginator: MatPaginator; + /** Sorter for tax component table. */ + @ViewChild(MatSort) sort: MatSort; + + /** + * Retrieves the tax component data from `resolve`. + * @param {ActivatedRoute} route Activated Route. + */ + constructor(private route: ActivatedRoute) { + this.route.data.subscribe(( data: { taxComponents: any }) => { + this.taxComponentData = data.taxComponents; + }); + } + + /** + * Filters data in tax component table based on passed value. + * @param {string} filterValue Value to filter data. + */ + applyFilter(filterValue: string) { + this.dataSource.filter = filterValue.trim().toLowerCase(); + } + + /** + * Sets the tax component table. + */ + ngOnInit() { + this.setTaxComponents(); + } + + /** + * Initializes the data source, paginator and sorter for tax component table. + */ + setTaxComponents() { + this.dataSource = new MatTableDataSource(this.taxComponentData); + this.dataSource.paginator = this.paginator; + this.dataSource.sort = this.sort; + } + +} diff --git a/src/app/products/manage-tax-components/manage-tax-components.resolver.ts b/src/app/products/manage-tax-components/manage-tax-components.resolver.ts new file mode 100644 index 000000000..2fb4ab93e --- /dev/null +++ b/src/app/products/manage-tax-components/manage-tax-components.resolver.ts @@ -0,0 +1,30 @@ +/** Angular Imports */ +import { Injectable } from '@angular/core'; +import { Resolve } from '@angular/router'; + +/** rxjs Imports */ +import { Observable } from 'rxjs'; + +/** Custom Services */ +import { ProductsService } from '../products.service'; + +/** + * Manage Tax Component data resolver. + */ +@Injectable() +export class ManageTaxComponentsResolver implements Resolve { + + /** + * @param {ProductsService} productsService Products service. + */ + constructor(private productsService: ProductsService) {} + + /** + * Returns the tax components data. + * @returns {Observable} + */ + resolve(): Observable { + return this.productsService.getTaxComponents(); + } + +} diff --git a/src/app/products/manage-tax-configurations/manage-tax-configurations.component.html b/src/app/products/manage-tax-configurations/manage-tax-configurations.component.html index 3f6716840..9e97747b8 100644 --- a/src/app/products/manage-tax-configurations/manage-tax-configurations.component.html +++ b/src/app/products/manage-tax-configurations/manage-tax-configurations.component.html @@ -8,7 +8,7 @@ - + diff --git a/src/app/products/products-routing.module.ts b/src/app/products/products-routing.module.ts index 503efa309..69677927a 100644 --- a/src/app/products/products-routing.module.ts +++ b/src/app/products/products-routing.module.ts @@ -15,12 +15,14 @@ import { RecurringDepositProductsComponent } from './recurring-deposit-products/ import { ChargesComponent } from './charges/charges.component'; import { FixedDepositProductsComponent } from './fixed-deposit-products/fixed-deposit-products.component'; import { ProductsMixComponent } from './products-mix/products-mix.component'; +import { ManageTaxComponentsComponent } from './manage-tax-components/manage-tax-components.component'; /** Custom Resolvers */ import { RecurringDepositProductsResolver } from './recurring-deposit-products/recurring-deposit-products.resolver'; import { ChargesResolver } from './charges/charges.resolver'; import { FixedDepositProductsResolver } from './fixed-deposit-products/fixed-deposit-products.resolver'; import { ProductsMixResolver } from './products-mix/products-mix.resolver'; +import { ManageTaxComponentsResolver } from './manage-tax-components/manage-tax-components.resolver'; /** Products Routes */ const routes: Routes = [ @@ -35,8 +37,21 @@ const routes: Routes = [ }, { path: 'tax-configurations', - component: ManageTaxConfigurationsComponent, data: { title: extract('Manage Tax Configurations'), breadcrumb: 'Manage Tax Configurations' }, + children: [ + { + path: '', + component: ManageTaxConfigurationsComponent, + }, + { + path: 'tax-components', + component: ManageTaxComponentsComponent, + resolve: { + taxComponents: ManageTaxComponentsResolver + }, + data: { title: extract('Manage Tax Components'), breadcrumb: 'Tax Components'}, + }, + ] }, { path: 'recurring-deposit-products', @@ -88,6 +103,7 @@ const routes: Routes = [ ChargesResolver, FixedDepositProductsResolver, ProductsMixResolver, + ManageTaxComponentsResolver ] }) export class ProductsRoutingModule { } diff --git a/src/app/products/products.module.ts b/src/app/products/products.module.ts index 3d5c69abe..2377514f5 100644 --- a/src/app/products/products.module.ts +++ b/src/app/products/products.module.ts @@ -12,6 +12,7 @@ import { RecurringDepositProductsComponent } from './recurring-deposit-products/ import { ChargesComponent } from './charges/charges.component'; import { FixedDepositProductsComponent } from './fixed-deposit-products/fixed-deposit-products.component'; import { ProductsMixComponent } from './products-mix/products-mix.component'; +import { ManageTaxComponentsComponent } from './manage-tax-components/manage-tax-components.component'; /** * Products Module @@ -29,7 +30,8 @@ import { ProductsMixComponent } from './products-mix/products-mix.component'; RecurringDepositProductsComponent, ChargesComponent, FixedDepositProductsComponent, - ProductsMixComponent + ProductsMixComponent, + ManageTaxComponentsComponent ], entryComponents: [ ] diff --git a/src/app/products/products.service.ts b/src/app/products/products.service.ts index 3f1413d29..b98c34c7d 100644 --- a/src/app/products/products.service.ts +++ b/src/app/products/products.service.ts @@ -39,6 +39,13 @@ export class ProductsService { return this.http.get('/fixeddepositproducts'); } + /** + * @returns {Observable} Tax Components data + */ + getTaxComponents(): Observable { + return this.http.get('/taxes/component'); + } + /** * @returns {Observable} Product mixes data */