From ccf6adad4b6b0e847e023386072f3b5dcc219aef Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 10 Jul 2019 12:22:26 +0100 Subject: [PATCH] Updating/removing some old files, preparing to add bubble chart --- src/app/app.module.ts | 7 ++-- .../dashboard/dashboard-customer.component.ts | 5 ++- .../more-graphs-and-tables.component.html | 41 +++++-------------- .../more-graphs-and-tables.component.ts | 15 +++---- src/app/dashboard/suppliers.component.html | 26 ++++++------ ...html => stacked-bar.component.html.broken} | 0 ...ent.ts => stacked-bar.component.ts.broken} | 0 7 files changed, 36 insertions(+), 58 deletions(-) rename src/app/panels/{stacked-bar.component.html => stacked-bar.component.html.broken} (100%) rename src/app/panels/{stacked-bar.component.ts => stacked-bar.component.ts.broken} (100%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1f44ff4..1f9dd9a 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -40,8 +40,8 @@ import { P500Component } from './pages/500.component'; import { AuthModule } from './auth/auth.module'; import { DashboardModule } from './dashboard/dashboard.module'; -import { DxChartModule } from 'devextreme-angular'; -import { StackedBarChartComponent } from './panels/stacked-bar.component'; +import { ChartsModule } from 'ng2-charts'; +// import { StackedBarChartComponent } from './panels/stacked-bar.component'; import { SuppliersComponent } from './dashboard/suppliers.component'; import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component'; @@ -51,7 +51,6 @@ import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component imports: [ BrowserModule, HttpClientModule, - DxChartModule, NgxPaginationModule, BsDropdownModule.forRoot(), TabsModule.forRoot(), @@ -62,7 +61,7 @@ import { MoreStuffComponent } from './dashboard/more-graphs-and-tables.component ], declarations: [ AppComponent, - StackedBarChartComponent, + // StackedBarChartComponent, FullLayoutComponent, SimpleLayoutComponent, NAV_DROPDOWN_DIRECTIVES, diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index 1c81ca0..caf631f 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -9,8 +9,11 @@ import { DataType } from '../shared/data-types.enum'; import * as moment from 'moment'; import { SuppliersComponent } from '../dashboard/suppliers.component'; import { MoreStuffComponent } from '../dashboard/more-graphs-and-tables.component'; -import { StackedBarChartComponent } from '../panels/stacked-bar.component'; +// import { StackedBarChartComponent } from '../panels/stacked-bar.component'; +interface RecurSupplierData { + name : string; +} @Component({ templateUrl: 'dashboard-customer.component.html' diff --git a/src/app/dashboard/more-graphs-and-tables.component.html b/src/app/dashboard/more-graphs-and-tables.component.html index 781cdf1..0382c67 100644 --- a/src/app/dashboard/more-graphs-and-tables.component.html +++ b/src/app/dashboard/more-graphs-and-tables.component.html @@ -1,33 +1,14 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
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
+
+
+
+

Weekly Spending by Category

+
+
+
+ +
+
-
+ \ No newline at end of file diff --git a/src/app/dashboard/more-graphs-and-tables.component.ts b/src/app/dashboard/more-graphs-and-tables.component.ts index c4b6cb0..fffc519 100644 --- a/src/app/dashboard/more-graphs-and-tables.component.ts +++ b/src/app/dashboard/more-graphs-and-tables.component.ts @@ -4,19 +4,18 @@ 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; -} +// interface RecurSupplierData { +// name : string; +// } @Component({ templateUrl: 'more-graphs-and-tables.component.html', }) -export class MoreStuffComponent implements OnInit, AfterViewInit { // if you wanna rename this, replace in all files 'MoreStuffComponent' with desired name and 'more-graphs-and-tables.component' with another desired name - @Input() public recurList: Array; +export class MoreStuffComponent implements OnInit { // if you wanna rename this, replace in all files 'MoreStuffComponent' with desired name and 'more-graphs-and-tables.component' with another desired name + // @Input() public recurList: Array; @Output() public onClick = new EventEmitter(); @Input() public categories: any; - public recurClick(event: any): void { this.onClick.emit( event ); } @@ -28,8 +27,4 @@ export class MoreStuffComponent implements OnInit, AfterViewInit { // if you wa ngOnInit(): void { } - - ngAfterViewInit() { - } - } diff --git a/src/app/dashboard/suppliers.component.html b/src/app/dashboard/suppliers.component.html index b0a29f2..fcf79dd 100644 --- a/src/app/dashboard/suppliers.component.html +++ b/src/app/dashboard/suppliers.component.html @@ -1,4 +1,4 @@ - +
@@ -13,20 +13,20 @@ - - - + + + - - - - - - - - - + + + + + + + + +
Bill's BuildingsLA13RB£34.64Tom's Tippity Top Toenails Ltd.LA11LY£250,000.00
Sam's SnakeTRY3R3£567.76
LloydsABV134£9.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/panels/stacked-bar.component.html b/src/app/panels/stacked-bar.component.html.broken similarity index 100% rename from src/app/panels/stacked-bar.component.html rename to src/app/panels/stacked-bar.component.html.broken diff --git a/src/app/panels/stacked-bar.component.ts b/src/app/panels/stacked-bar.component.ts.broken similarity index 100% rename from src/app/panels/stacked-bar.component.ts rename to src/app/panels/stacked-bar.component.ts.broken