feat(accounting): add accounting rules component
Add accounting rules component to preconfigure accounting transactions.
This commit is contained in:
@@ -25,6 +25,7 @@ import { ClosingEntriesComponent } from './closing-entries/closing-entries.compo
|
|||||||
import { CreateClosureComponent } from './closing-entries/create-closure/create-closure.component';
|
import { CreateClosureComponent } from './closing-entries/create-closure/create-closure.component';
|
||||||
import { ViewClosureComponent } from './closing-entries/view-closure/view-closure.component';
|
import { ViewClosureComponent } from './closing-entries/view-closure/view-closure.component';
|
||||||
import { EditClosureComponent } from './closing-entries/edit-closure/edit-closure.component';
|
import { EditClosureComponent } from './closing-entries/edit-closure/edit-closure.component';
|
||||||
|
import { AccountingRulesComponent } from './accounting-rules/accounting-rules.component';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
Route.withShell([
|
Route.withShell([
|
||||||
@@ -161,6 +162,11 @@ const routes: Routes = [
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'accounting-rules',
|
||||||
|
component: AccountingRulesComponent,
|
||||||
|
data: { title: extract('Accounting Rules'), breadcrumb: 'Rules' },
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<div class="container m-b-20" fxLayout="row" fxLayoutAlign="end" fxLayoutGap="20px">
|
||||||
|
<button mat-raised-button color="primary" [routerLink]="['/accounting/accounting-rules/create']">
|
||||||
|
<mat-icon>add</mat-icon> Add Rule
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
|
||||||
|
<div fxLayout="row" fxLayoutGap="20px">
|
||||||
|
<mat-form-field fxFlex>
|
||||||
|
<input matInput (keyup)="applyFilter($event.target.value)" placeholder="Filter">
|
||||||
|
</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 accountingRule"> {{ accountingRule.name }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="officeName">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header> Office </th>
|
||||||
|
<td mat-cell *matCellDef="let accountingRule"> {{ accountingRule.officeName }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="debitTags">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header> Debit Tags </th>
|
||||||
|
<td mat-cell *matCellDef="let accountingRule"> {{ accountingRule.debitTags }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="debitAccount">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header> Debit Account </th>
|
||||||
|
<td mat-cell *matCellDef="let accountingRule"> {{ accountingRule.debitAccounts ? accountingRule.debitAccounts[0].name : '' }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="creditTags">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header> Credit Tags </th>
|
||||||
|
<td mat-cell *matCellDef="let accountingRule"> {{ accountingRule.creditTags }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<ng-container matColumnDef="creditAccount">
|
||||||
|
<th mat-header-cell *matHeaderCellDef mat-sort-header> Credit Account </th>
|
||||||
|
<td mat-cell *matCellDef="let accountingRule"> {{ accountingRule.creditAccounts ? accountingRule.creditAccounts[0].name : '' }} </td>
|
||||||
|
</ng-container>
|
||||||
|
|
||||||
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/accounting/accounting-rules/view', row.id]"></tr>
|
||||||
|
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { AccountingRulesComponent } from './accounting-rules.component';
|
||||||
|
|
||||||
|
describe('AccountingRulesComponent', () => {
|
||||||
|
let component: AccountingRulesComponent;
|
||||||
|
let fixture: ComponentFixture<AccountingRulesComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ AccountingRulesComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(AccountingRulesComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
|
import { MatPaginator, MatSort, MatTableDataSource } from '@angular/material';
|
||||||
|
import { AccountingService } from '../accounting.service';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-accounting-rules',
|
||||||
|
templateUrl: './accounting-rules.component.html',
|
||||||
|
styleUrls: ['./accounting-rules.component.scss']
|
||||||
|
})
|
||||||
|
export class AccountingRulesComponent implements OnInit {
|
||||||
|
|
||||||
|
displayedColumns: string[] = ['name', 'officeName', 'debitTags', 'debitAccount', 'creditTags', 'creditAccount'];
|
||||||
|
dataSource: any;
|
||||||
|
|
||||||
|
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||||
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
|
|
||||||
|
constructor(private accountingService: AccountingService) { }
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.getAccountingRules();
|
||||||
|
}
|
||||||
|
|
||||||
|
getAccountingRules() {
|
||||||
|
this.accountingService.getAccountingRules().subscribe(accountingRules => {
|
||||||
|
accountingRules.forEach((accountingRule: any) => {
|
||||||
|
accountingRule.debitTags = accountingRule.debitTags ? accountingRule.debitTags.map((debitTag: any) => debitTag.tag.name).join(', ') : '';
|
||||||
|
accountingRule.creditTags = accountingRule.creditTags ? accountingRule.creditTags.map((creditTag: any) => creditTag.tag.name).join(', ') : '';
|
||||||
|
});
|
||||||
|
this.dataSource = new MatTableDataSource(accountingRules);
|
||||||
|
this.dataSource.paginator = this.paginator;
|
||||||
|
this.dataSource.sortingDataAccessor = (accountingRule: any, property: any) => {
|
||||||
|
switch (property) {
|
||||||
|
case 'debitAccount': return accountingRule.debitAccounts[0].name;
|
||||||
|
case 'creditAccount': return accountingRule.creditAccounts[0].name;
|
||||||
|
default: return accountingRule[property];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
this.dataSource.sort = this.sort;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
applyFilter(filterValue: string) {
|
||||||
|
this.dataSource.filter = filterValue.trim().toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -58,11 +58,9 @@
|
|||||||
<p matLine>Journal entries made at the end of accounting period</p>
|
<p matLine>Journal entries made at the end of accounting period</p>
|
||||||
</mat-list-item>
|
</mat-list-item>
|
||||||
|
|
||||||
<mat-list-item>
|
<mat-list-item [routerLink]="['/accounting/accounting-rules']">
|
||||||
<mat-icon matListIcon>list</mat-icon>
|
<mat-icon matListIcon>list</mat-icon>
|
||||||
<a matLine href="https://www.google.com">
|
<h4 matLine>Accounting Rules</h4>
|
||||||
Accounting Rules
|
|
||||||
</a>
|
|
||||||
<p matLine>List of all accounting rules</p>
|
<p matLine>List of all accounting rules</p>
|
||||||
</mat-list-item>
|
</mat-list-item>
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import { ClosingEntriesComponent } from './closing-entries/closing-entries.compo
|
|||||||
import { CreateClosureComponent } from './closing-entries/create-closure/create-closure.component';
|
import { CreateClosureComponent } from './closing-entries/create-closure/create-closure.component';
|
||||||
import { ViewClosureComponent } from './closing-entries/view-closure/view-closure.component';
|
import { ViewClosureComponent } from './closing-entries/view-closure/view-closure.component';
|
||||||
import { EditClosureComponent } from './closing-entries/edit-closure/edit-closure.component';
|
import { EditClosureComponent } from './closing-entries/edit-closure/edit-closure.component';
|
||||||
|
import { AccountingRulesComponent } from './accounting-rules/accounting-rules.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -52,7 +53,8 @@ import { EditClosureComponent } from './closing-entries/edit-closure/edit-closur
|
|||||||
ClosingEntriesComponent,
|
ClosingEntriesComponent,
|
||||||
CreateClosureComponent,
|
CreateClosureComponent,
|
||||||
ViewClosureComponent,
|
ViewClosureComponent,
|
||||||
EditClosureComponent
|
EditClosureComponent,
|
||||||
|
AccountingRulesComponent
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
RevertTransactionComponent,
|
RevertTransactionComponent,
|
||||||
|
|||||||
@@ -13,8 +13,12 @@ export class AccountingService {
|
|||||||
return this.http.get('/offices?orderBy=id');
|
return this.http.get('/offices?orderBy=id');
|
||||||
}
|
}
|
||||||
|
|
||||||
getAccountingRules(): Observable<any> {
|
getAccountingRules(useHttpParams?: boolean): Observable<any> {
|
||||||
return this.http.get('/accountingrules?associations=all');
|
let httpParams = new HttpParams();
|
||||||
|
if (useHttpParams) {
|
||||||
|
httpParams = httpParams.set('associations', 'all');
|
||||||
|
}
|
||||||
|
return this.http.get('/accountingrules', { params: httpParams });
|
||||||
}
|
}
|
||||||
|
|
||||||
getCurrencies(): Observable<any> {
|
getCurrencies(): Observable<any> {
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ export class FrequentPostingsComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getAccountingRules() {
|
getAccountingRules() {
|
||||||
this.accountingService.getAccountingRules().subscribe(accountingRuleData => {
|
this.accountingService.getAccountingRules(true).subscribe(accountingRuleData => {
|
||||||
this.accountingRuleData = accountingRuleData;
|
this.accountingRuleData = accountingRuleData;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user