feat(chart-of-accounts): view GL Account component
Add view GL Account component.
This commit is contained in:
@@ -16,6 +16,8 @@ import { ChartOfAccountsComponent } from './chart-of-accounts/chart-of-accounts.
|
|||||||
|
|
||||||
import { ChartOfAccountsResolver } from './chart-of-accounts/chart-of-accounts.resolver';
|
import { ChartOfAccountsResolver } from './chart-of-accounts/chart-of-accounts.resolver';
|
||||||
import { CreateGlAccountComponent } from './chart-of-accounts/create-gl-account/create-gl-account.component';
|
import { CreateGlAccountComponent } from './chart-of-accounts/create-gl-account/create-gl-account.component';
|
||||||
|
import { ViewGlAccountComponent } from './chart-of-accounts/view-gl-account/view-gl-account.component';
|
||||||
|
import { ViewGlAccountResolver } from './chart-of-accounts/view-gl-account/view-gl-account.resolver';
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
Route.withShell([
|
Route.withShell([
|
||||||
@@ -98,6 +100,14 @@ const routes: Routes = [
|
|||||||
path: 'gl-accounts/create',
|
path: 'gl-accounts/create',
|
||||||
component: CreateGlAccountComponent,
|
component: CreateGlAccountComponent,
|
||||||
data: { title: extract('Create GL Account'), breadcrumb: 'Create GL Account' },
|
data: { title: extract('Create GL Account'), breadcrumb: 'Create GL Account' },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'gl-accounts/view/:id',
|
||||||
|
component: ViewGlAccountComponent,
|
||||||
|
data: { title: extract('View GL Account'), routeResolveBreadcrumb: ['glAccount', 'name'] },
|
||||||
|
resolve: {
|
||||||
|
glAccount: ViewGlAccountResolver
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -109,6 +119,9 @@ const routes: Routes = [
|
|||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [RouterModule.forChild(routes)],
|
imports: [RouterModule.forChild(routes)],
|
||||||
exports: [RouterModule],
|
exports: [RouterModule],
|
||||||
providers: [ChartOfAccountsResolver]
|
providers: [
|
||||||
|
ChartOfAccountsResolver,
|
||||||
|
ViewGlAccountResolver
|
||||||
|
]
|
||||||
})
|
})
|
||||||
export class AccountingRoutingModule { }
|
export class AccountingRoutingModule { }
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { ViewFinancialActivityMappingComponent } from './financial-activity-mapp
|
|||||||
import { EditFinancialActivityMappingComponent } from './financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component';
|
import { EditFinancialActivityMappingComponent } from './financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component';
|
||||||
import { ChartOfAccountsComponent } from './chart-of-accounts/chart-of-accounts.component';
|
import { ChartOfAccountsComponent } from './chart-of-accounts/chart-of-accounts.component';
|
||||||
import { CreateGlAccountComponent } from './chart-of-accounts/create-gl-account/create-gl-account.component';
|
import { CreateGlAccountComponent } from './chart-of-accounts/create-gl-account/create-gl-account.component';
|
||||||
|
import { ViewGlAccountComponent } from './chart-of-accounts/view-gl-account/view-gl-account.component';
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
imports: [
|
imports: [
|
||||||
@@ -39,7 +40,8 @@ import { CreateGlAccountComponent } from './chart-of-accounts/create-gl-account/
|
|||||||
ViewFinancialActivityMappingComponent,
|
ViewFinancialActivityMappingComponent,
|
||||||
EditFinancialActivityMappingComponent,
|
EditFinancialActivityMappingComponent,
|
||||||
ChartOfAccountsComponent,
|
ChartOfAccountsComponent,
|
||||||
CreateGlAccountComponent
|
CreateGlAccountComponent,
|
||||||
|
ViewGlAccountComponent
|
||||||
],
|
],
|
||||||
entryComponents: [
|
entryComponents: [
|
||||||
RevertTransactionComponent,
|
RevertTransactionComponent,
|
||||||
|
|||||||
@@ -108,4 +108,9 @@ export class AccountingService {
|
|||||||
return this.http.post('/glaccounts', glAccount);
|
return this.http.post('/glaccounts', glAccount);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getGlAccount(glAccountId: string, template: boolean = false) {
|
||||||
|
const httpParams = new HttpParams().set('template', template.toString());
|
||||||
|
return this.http.get(`/glaccounts/${glAccountId}`, { params: httpParams });
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,7 +65,7 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
||||||
<tr mat-row *matRowDef="let row; columns: displayedColumns;" (click)="viewGLAccount(row)" class="select"></tr>
|
<tr mat-row *matRowDef="let row; columns: displayedColumns;" [routerLink]="['/accounting/chart-of-accounts/gl-accounts/view', row.id]"></tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|||||||
@@ -25,11 +25,9 @@ export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
|
|||||||
@ViewChild(MatPaginator) paginator: MatPaginator;
|
@ViewChild(MatPaginator) paginator: MatPaginator;
|
||||||
@ViewChild(MatSort) sort: MatSort;
|
@ViewChild(MatSort) sort: MatSort;
|
||||||
|
|
||||||
//
|
|
||||||
nestedTreeControl: NestedTreeControl<GLAccountNode>;
|
nestedTreeControl: NestedTreeControl<GLAccountNode>;
|
||||||
nestedTreeDataSource: MatTreeNestedDataSource<GLAccountNode>;
|
nestedTreeDataSource: MatTreeNestedDataSource<GLAccountNode>;
|
||||||
glAccount: GLAccountNode;
|
glAccount: GLAccountNode;
|
||||||
//
|
|
||||||
|
|
||||||
constructor(private glAccountTreeService: GlAccountTreeService,
|
constructor(private glAccountTreeService: GlAccountTreeService,
|
||||||
private route: ActivatedRoute) {
|
private route: ActivatedRoute) {
|
||||||
@@ -37,20 +35,16 @@ export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
|
|||||||
this.glAccountData = data.glAccountData;
|
this.glAccountData = data.glAccountData;
|
||||||
glAccountTreeService.initialize(this.glAccountData);
|
glAccountTreeService.initialize(this.glAccountData);
|
||||||
});
|
});
|
||||||
//
|
|
||||||
this.nestedTreeControl = new NestedTreeControl<GLAccountNode>(this._getChildren);
|
this.nestedTreeControl = new NestedTreeControl<GLAccountNode>(this._getChildren);
|
||||||
this.nestedTreeDataSource = new MatTreeNestedDataSource();
|
this.nestedTreeDataSource = new MatTreeNestedDataSource();
|
||||||
//
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.tableDataSource = new MatTableDataSource(this.glAccountData);
|
this.tableDataSource = new MatTableDataSource(this.glAccountData);
|
||||||
//
|
|
||||||
this.glAccountTreeService.treeDataChange.subscribe((glAccountTreeData: any) => {
|
this.glAccountTreeService.treeDataChange.subscribe((glAccountTreeData: any) => {
|
||||||
this.nestedTreeDataSource.data = glAccountTreeData;
|
this.nestedTreeDataSource.data = glAccountTreeData;
|
||||||
this.nestedTreeControl.expand(this.nestedTreeDataSource.data[0]);
|
this.nestedTreeControl.expand(this.nestedTreeDataSource.data[0]);
|
||||||
});
|
});
|
||||||
//
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngAfterViewInit() {
|
ngAfterViewInit() {
|
||||||
@@ -69,11 +63,6 @@ export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
|
|||||||
this.tableDataSource.filter = filterValue.trim().toLowerCase();
|
this.tableDataSource.filter = filterValue.trim().toLowerCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
viewGLAccount(glAccount: any) {
|
|
||||||
console.log(glAccount);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
hasNestedChild = (_: number, node: GLAccountNode) => node.children.length;
|
hasNestedChild = (_: number, node: GLAccountNode) => node.children.length;
|
||||||
|
|
||||||
viewGLAccountNode(glAccount: GLAccountNode) {
|
viewGLAccountNode(glAccount: GLAccountNode) {
|
||||||
@@ -85,6 +74,5 @@ export class ChartOfAccountsComponent implements AfterViewInit, OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private _getChildren = (node: GLAccountNode) => of(node.children);
|
private _getChildren = (node: GLAccountNode) => of(node.children);
|
||||||
//
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-3
@@ -1,5 +1,7 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
import { AccountingService } from '../../accounting.service';
|
import { AccountingService } from '../../accounting.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@@ -17,7 +19,8 @@ export class CreateGlAccountComponent implements OnInit {
|
|||||||
tagData: any;
|
tagData: any;
|
||||||
|
|
||||||
constructor(private formBuilder: FormBuilder,
|
constructor(private formBuilder: FormBuilder,
|
||||||
private accountingService: AccountingService) { }
|
private accountingService: AccountingService,
|
||||||
|
private router: Router) { }
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.createGlAccountForm();
|
this.createGlAccountForm();
|
||||||
@@ -69,8 +72,8 @@ export class CreateGlAccountComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
submit() {
|
submit() {
|
||||||
this.accountingService.createGlAccount(this.glAccountForm.value).subscribe(response => {
|
this.accountingService.createGlAccount(this.glAccountForm.value).subscribe((response: any) => {
|
||||||
console.log(response);
|
this.router.navigate(['/accounting/chart-of-accounts/gl-accounts/view', response.resourceId]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,89 @@
|
|||||||
|
<div fxLayout="row" fxLayoutAlign="end" fxLayoutGap="2%" fxLayout.lt-md="column" class="container m-b-20">
|
||||||
|
<button mat-raised-button color="primary" *ngIf="glAccount.usage.value === 'HEADER'">
|
||||||
|
<mat-icon>add</mat-icon> Subledger Account
|
||||||
|
</button>
|
||||||
|
<button mat-raised-button color="primary" [routerLink]="['/accounting/chart-of-accounts/gl-accounts/view', glAccount.id, 'edit']">
|
||||||
|
<mat-icon>edit</mat-icon> Edit
|
||||||
|
</button>
|
||||||
|
<button mat-raised-button color="warn" *ngIf="!glAccount.disabled">
|
||||||
|
<mat-icon>lock</mat-icon> Disable
|
||||||
|
</button>
|
||||||
|
<button mat-raised-button color="accent" *ngIf="glAccount.disabled">
|
||||||
|
<mat-icon>lock_open</mat-icon> Enable
|
||||||
|
</button>
|
||||||
|
<button mat-raised-button color="warn" (click)="deleteGlAccount()">
|
||||||
|
<mat-icon>delete</mat-icon> Delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="container">
|
||||||
|
|
||||||
|
<mat-card>
|
||||||
|
|
||||||
|
<mat-card-content>
|
||||||
|
|
||||||
|
<div fxLayout="row wrap" class="content">
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Account Type
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.type.value }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
GL Code
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.glCode }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Parent Account Name
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.parent.name }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Tag
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.tagId.name }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Account Usage
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.usage.value }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Manual Entries Allowed
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.manualEntriesAllowed }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%" class="header">
|
||||||
|
Description
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div fxFlex="50%">
|
||||||
|
{{ glAccount.description }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</mat-card-content>
|
||||||
|
|
||||||
|
</mat-card>
|
||||||
|
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
.container {
|
||||||
|
max-width: 37rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
div {
|
||||||
|
margin: 1rem 0;
|
||||||
|
word-wrap: break-word;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header {
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
@@ -0,0 +1,25 @@
|
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { ViewGlAccountComponent } from './view-gl-account.component';
|
||||||
|
|
||||||
|
describe('ViewGlAccountComponent', () => {
|
||||||
|
let component: ViewGlAccountComponent;
|
||||||
|
let fixture: ComponentFixture<ViewGlAccountComponent>;
|
||||||
|
|
||||||
|
beforeEach(async(() => {
|
||||||
|
TestBed.configureTestingModule({
|
||||||
|
declarations: [ ViewGlAccountComponent ]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
}));
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
fixture = TestBed.createComponent(ViewGlAccountComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { Component, OnInit } from '@angular/core';
|
||||||
|
import { ActivatedRoute } from '@angular/router';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'mifosx-view-gl-account',
|
||||||
|
templateUrl: './view-gl-account.component.html',
|
||||||
|
styleUrls: ['./view-gl-account.component.scss']
|
||||||
|
})
|
||||||
|
export class ViewGlAccountComponent implements OnInit {
|
||||||
|
|
||||||
|
glAccount: any;
|
||||||
|
|
||||||
|
constructor(private route: ActivatedRoute) {
|
||||||
|
this.route.data.subscribe((data: { glAccount: any }) => {
|
||||||
|
this.glAccount = data.glAccount;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { Resolve, ActivatedRouteSnapshot } from '@angular/router';
|
||||||
|
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
import { map } from 'rxjs/operators';
|
||||||
|
|
||||||
|
import { AccountingService } from '../../accounting.service';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class ViewGlAccountResolver implements Resolve<Object> {
|
||||||
|
|
||||||
|
constructor(private accountingService: AccountingService) {}
|
||||||
|
|
||||||
|
resolve(route: ActivatedRouteSnapshot): Observable<any> {
|
||||||
|
const id = route.paramMap.get('id');
|
||||||
|
|
||||||
|
return this.accountingService.getGlAccount(id, true).pipe(map((glAccountData: any) => {
|
||||||
|
let accountOptions = [];
|
||||||
|
switch (glAccountData.type.value) {
|
||||||
|
case 'ASSET': accountOptions = glAccountData.assetHeaderAccountOptions;
|
||||||
|
break;
|
||||||
|
case 'EQUITY': accountOptions = glAccountData.equityHeaderAccountOptions;
|
||||||
|
break;
|
||||||
|
case 'EXPENSE': accountOptions = glAccountData.expenseHeaderAccountOptions;
|
||||||
|
break;
|
||||||
|
case 'INCOME': accountOptions = glAccountData.incomeHeaderAccountOptions;
|
||||||
|
break;
|
||||||
|
case 'LIABILITY': accountOptions = glAccountData.liabilityHeaderAccountOptions;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
glAccountData.parent = accountOptions.find((accountOption: any) => {
|
||||||
|
return accountOption.id === glAccountData.parentId;
|
||||||
|
});
|
||||||
|
return glAccountData;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user