diff --git a/src/app/accounting/accounting-routing.module.ts b/src/app/accounting/accounting-routing.module.ts index 2fd1115f1..87e67e1e8 100644 --- a/src/app/accounting/accounting-routing.module.ts +++ b/src/app/accounting/accounting-routing.module.ts @@ -9,6 +9,7 @@ import { CreateJournalEntryComponent } from './create-journal-entry/create-journ import { SearchJournalEntryComponent } from './search-journal-entry/search-journal-entry.component'; import { FinancialActivityMappingsComponent } from './financial-activity-mappings/financial-activity-mappings.component'; import { CreateFinancialActivityMappingComponent } from './financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component'; +import { ViewFinancialActivityMappingComponent } from './financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component'; const routes: Routes = [ Route.withShell([ @@ -58,6 +59,11 @@ const routes: Routes = [ path: 'create', component: CreateFinancialActivityMappingComponent, data: { title: extract('Create Financial Activity Mapping'), breadcrumb: 'Create' }, + }, + { + path: 'view/:id', + component: ViewFinancialActivityMappingComponent, + data: {title: extract('View Financial Activity Mapping'), routeParamBreadcrumb: 'id' } } ] } diff --git a/src/app/accounting/accounting.module.ts b/src/app/accounting/accounting.module.ts index 7da53a664..51ed13b09 100644 --- a/src/app/accounting/accounting.module.ts +++ b/src/app/accounting/accounting.module.ts @@ -13,6 +13,7 @@ import { CreateJournalEntryComponent } from './create-journal-entry/create-journ import { SearchJournalEntryComponent } from './search-journal-entry/search-journal-entry.component'; import { FinancialActivityMappingsComponent } from './financial-activity-mappings/financial-activity-mappings.component'; import { CreateFinancialActivityMappingComponent } from './financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component'; +import { ViewFinancialActivityMappingComponent } from './financial-activity-mappings/view-financial-activity-mapping/view-financial-activity-mapping.component'; @NgModule({ imports: [ @@ -31,7 +32,8 @@ import { CreateFinancialActivityMappingComponent } from './financial-activity-ma CreateJournalEntryComponent, SearchJournalEntryComponent, FinancialActivityMappingsComponent, - CreateFinancialActivityMappingComponent + CreateFinancialActivityMappingComponent, + ViewFinancialActivityMappingComponent ], entryComponents: [ RevertTransactionComponent, diff --git a/src/app/accounting/accounting.service.ts b/src/app/accounting/accounting.service.ts index bda29d274..eea41ca2d 100644 --- a/src/app/accounting/accounting.service.ts +++ b/src/app/accounting/accounting.service.ts @@ -83,4 +83,8 @@ export class AccountingService { return this.http.post('/financialactivityaccounts', financialActivityAccount); } + getFinancialActivityAccount(financialActivityAccountId: number) { + return this.http.get(`/financialactivityaccounts/${financialActivityAccountId}`); + } + } diff --git a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.scss b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.scss index aeead06e0..d774f68da 100644 --- a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.scss +++ b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.scss @@ -1,3 +1,3 @@ .container { - width: 37rem; + max-width: 37rem; } diff --git a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts index 363f79725..2b6782a82 100644 --- a/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts +++ b/src/app/accounting/financial-activity-mappings/create-financial-activity-mapping/create-financial-activity-mapping.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; import { AccountingService } from '../../accounting.service'; @@ -16,7 +17,8 @@ export class CreateFinancialActivityMappingComponent implements OnInit { financialActivityData: any; constructor(private formBuider: FormBuilder, - private accountingService: AccountingService) { } + private accountingService: AccountingService, + private router: Router) { } ngOnInit() { this.createFinancialActivityMappingForm(); @@ -57,8 +59,8 @@ export class CreateFinancialActivityMappingComponent implements OnInit { submit() { this.accountingService.createFinancialActivityAccount(this.financialActivityMappingForm.value) - .subscribe(response => { - console.log(response); + .subscribe((response: any) => { + this.router.navigate(['/accounting/financial-activity-mappings/view', response.resourceId]); }); } diff --git a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html index 1949e07bf..66db0c521 100644 --- a/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html +++ b/src/app/accounting/financial-activity-mappings/financial-activity-mappings.component.html @@ -24,7 +24,7 @@