From a7a150e07cf01cf6c18493682aa4544f8d000386 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 9 Jul 2019 14:22:19 +0100 Subject: [PATCH] Made a new section as per TomS's request :-) --- src/app/app.module.ts | 2 ++ src/app/dashboard/dashboard.routing.ts | 7 ++++ .../more-graphs-and-tables.component.html | 33 +++++++++++++++++ .../more-graphs-and-tables.component.ts | 35 +++++++++++++++++++ src/app/dashboard/suppliers.component.ts | 2 +- src/app/layouts/full-layout.component.html | 8 +++++ 6 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 src/app/dashboard/more-graphs-and-tables.component.html create mode 100644 src/app/dashboard/more-graphs-and-tables.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index ab6f003..1f44ff4 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -43,6 +43,7 @@ import { DashboardModule } from './dashboard/dashboard.module'; import { DxChartModule } from 'devextreme-angular'; import { StackedBarChartComponent } from './panels/stacked-bar.component'; import { SuppliersComponent } from './dashboard/suppliers.component'; +import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component'; @@ -69,6 +70,7 @@ import { SuppliersComponent } from './dashboard/suppliers.component'; SIDEBAR_TOGGLE_DIRECTIVES, AsideToggleDirective, SuppliersComponent, + MoreStuffComponent, P404Component, P500Component, ], diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index 8e3d80a..6fba7de 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -17,7 +17,9 @@ import { PayrollLogComponent } from './payroll-log.component'; import { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; import { TrailMapComponent } from './trail-map.component'; +import { MoreStuffComponent } from './more-graphs-and-tables.component'; import { SuppliersComponent } from './suppliers.component'; + // Using child path to allow for FullLayout theming const routes: Routes = [ { path: '', redirectTo: '/dashboard', pathMatch: 'full' }, @@ -89,6 +91,11 @@ const routes: Routes = [ path: 'suppliers', component: SuppliersComponent, data: { title: 'Suppliers' } + }, + { + path: 'more-graphs-and-tables', + component: MoreStuffComponent, + data: { title: 'More Stuff'} } ], } diff --git a/src/app/dashboard/more-graphs-and-tables.component.html b/src/app/dashboard/more-graphs-and-tables.component.html new file mode 100644 index 0000000..781cdf1 --- /dev/null +++ b/src/app/dashboard/more-graphs-and-tables.component.html @@ -0,0 +1,33 @@ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamePostcodeSpend
Tom's Tippity Top Toenails Ltd.LA11LY£250,000.00
Selena's Scratching Sticks Inc.WS15PQ£5.00
Big Barry and Son's Balloon Store and Clown Outfits Corp.PF43RD£22.00
+
+
diff --git a/src/app/dashboard/more-graphs-and-tables.component.ts b/src/app/dashboard/more-graphs-and-tables.component.ts new file mode 100644 index 0000000..628f58c --- /dev/null +++ b/src/app/dashboard/more-graphs-and-tables.component.ts @@ -0,0 +1,35 @@ +import { Component, OnInit, AfterViewInit, Input, Output, EventEmitter, ViewChild, TemplateRef } from '@angular/core'; +import { ApiService } from '../providers/api-service'; +import { AgmCoreModule } from '@agm/core'; +import { BsModalService, ModalDirective } from 'ngx-bootstrap/modal'; +import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; + +interface RecurSupplierData { + name : string; +} + +@Component({ + templateUrl: 'more-graphs-and-tables.component.html', +}) +export class MoreStuffComponent implements OnInit, AfterViewInit { + @Input() public recurList: Array; + @Output() public onClick = new EventEmitter(); + @Input() public categories: any; + + + public recurClick(event: any): void { + this.onClick.emit( event ); + } + + constructor( + private api: ApiService, + ) { } + + ngOnInit(): void { + + } + + ngAfterViewInit() { + } + +} diff --git a/src/app/dashboard/suppliers.component.ts b/src/app/dashboard/suppliers.component.ts index 7367d03..badbc76 100644 --- a/src/app/dashboard/suppliers.component.ts +++ b/src/app/dashboard/suppliers.component.ts @@ -26,7 +26,7 @@ export class SuppliersComponent implements OnInit, AfterViewInit { ) { } ngOnInit(): void { - + } ngAfterViewInit() { diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 9432f1d..c4369e8 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -102,6 +102,14 @@ +