From faeac6b360ba6958bc7b78f2d80727ffc0254721 Mon Sep 17 00:00:00 2001 From: Felix Date: Thu, 4 Jul 2019 16:36:06 +0100 Subject: [PATCH] Changed name of new-section to suppliers --- src/app/app.module.ts | 4 ++-- .../dashboard/dashboard-customer.component.ts | 2 +- src/app/dashboard/dashboard.routing.ts | 8 ++++---- ...component.html => suppliers.component.html} | 6 +++--- ...ion.component.ts => suppliers.component.ts} | 18 +++++++++++++----- src/app/layouts/full-layout.component.html | 4 ++-- 6 files changed, 25 insertions(+), 17 deletions(-) rename src/app/dashboard/{new-section.component.html => suppliers.component.html} (82%) rename src/app/dashboard/{new-section.component.ts => suppliers.component.ts} (56%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7fb44f7..ab6f003 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -42,7 +42,7 @@ import { DashboardModule } from './dashboard/dashboard.module'; import { DxChartModule } from 'devextreme-angular'; import { StackedBarChartComponent } from './panels/stacked-bar.component'; -import { NewSectionComponent } from './dashboard/new-section.component'; +import { SuppliersComponent } from './dashboard/suppliers.component'; @@ -68,7 +68,7 @@ import { NewSectionComponent } from './dashboard/new-section.component'; BreadcrumbsComponent, SIDEBAR_TOGGLE_DIRECTIVES, AsideToggleDirective, - NewSectionComponent, + SuppliersComponent, P404Component, P500Component, ], diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts index ccca9ee..4005cc4 100644 --- a/src/app/dashboard/dashboard-customer.component.ts +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -7,7 +7,7 @@ import { CustBarSnippetComponent } from '../snippets/cust-snippet-bar.component' import { PiePanel } from '../panels/pie-panel.component'; import { DataType } from '../shared/data-types.enum'; import * as moment from 'moment'; -import { NewSectionComponent } from '../dashboard/new-section.component'; +import { SuppliersComponent } from '../dashboard/suppliers.component'; import { StackedBarChartComponent } from '../panels/stacked-bar.component'; diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index 9df0646..faef8f5 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -17,7 +17,7 @@ import { PayrollLogComponent } from './payroll-log.component'; import { LeaderboardComponent } from './leaderboard.component'; import { MapComponent } from './map.component'; import { TrailMapComponent } from './trail-map.component'; -import { NewSectionComponent } from './new-section.component'; +import { SuppliersComponent } from './suppliers.component'; // Using child path to allow for FullLayout theming const routes: Routes = [ @@ -87,9 +87,9 @@ const routes: Routes = [ data: { title: 'Give Feedback' }, }, { - path: 'new-section', - component: NewSectionComponent, - data: { title: 'New Section' } + path: 'suppliers', + component: SuppliersComponent, + data: { title: 'Suppliers' } } ], } diff --git a/src/app/dashboard/new-section.component.html b/src/app/dashboard/suppliers.component.html similarity index 82% rename from src/app/dashboard/new-section.component.html rename to src/app/dashboard/suppliers.component.html index c80e223..b953729 100644 --- a/src/app/dashboard/new-section.component.html +++ b/src/app/dashboard/suppliers.component.html @@ -10,8 +10,8 @@ - - + + diff --git a/src/app/dashboard/new-section.component.ts b/src/app/dashboard/suppliers.component.ts similarity index 56% rename from src/app/dashboard/new-section.component.ts rename to src/app/dashboard/suppliers.component.ts index 28ec0ff..badbc76 100644 --- a/src/app/dashboard/new-section.component.ts +++ b/src/app/dashboard/suppliers.component.ts @@ -4,11 +4,22 @@ 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: 'new-section.component.html', + templateUrl: 'suppliers.component.html', }) -export class NewSectionComponent implements OnInit, AfterViewInit { +export class SuppliersComponent 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, @@ -21,7 +32,4 @@ export class NewSectionComponent implements OnInit, AfterViewInit { ngAfterViewInit() { } - - - } diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 0769c82..9432f1d 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -95,10 +95,10 @@