Changed name of new-section to suppliers

This commit is contained in:
Felix 2019-07-04 16:36:06 +01:00
parent db5d9495e2
commit faeac6b360
6 changed files with 25 additions and 17 deletions

View file

@ -42,7 +42,7 @@ import { DashboardModule } from './dashboard/dashboard.module';
import { DxChartModule } from 'devextreme-angular'; import { DxChartModule } from 'devextreme-angular';
import { StackedBarChartComponent } from './panels/stacked-bar.component'; 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, BreadcrumbsComponent,
SIDEBAR_TOGGLE_DIRECTIVES, SIDEBAR_TOGGLE_DIRECTIVES,
AsideToggleDirective, AsideToggleDirective,
NewSectionComponent, SuppliersComponent,
P404Component, P404Component,
P500Component, P500Component,
], ],

View file

@ -7,7 +7,7 @@ import { CustBarSnippetComponent } from '../snippets/cust-snippet-bar.component'
import { PiePanel } from '../panels/pie-panel.component'; import { PiePanel } from '../panels/pie-panel.component';
import { DataType } from '../shared/data-types.enum'; import { DataType } from '../shared/data-types.enum';
import * as moment from 'moment'; 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'; import { StackedBarChartComponent } from '../panels/stacked-bar.component';

View file

@ -17,7 +17,7 @@ import { PayrollLogComponent } from './payroll-log.component';
import { LeaderboardComponent } from './leaderboard.component'; import { LeaderboardComponent } from './leaderboard.component';
import { MapComponent } from './map.component'; import { MapComponent } from './map.component';
import { TrailMapComponent } from './trail-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 // Using child path to allow for FullLayout theming
const routes: Routes = [ const routes: Routes = [
@ -87,9 +87,9 @@ const routes: Routes = [
data: { title: 'Give Feedback' }, data: { title: 'Give Feedback' },
}, },
{ {
path: 'new-section', path: 'suppliers',
component: NewSectionComponent, component: SuppliersComponent,
data: { title: 'New Section' } data: { title: 'Suppliers' }
} }
], ],
} }

View file

@ -10,8 +10,8 @@
</thead> </thead>
<tbody> <tbody>
<!-- table body - name, postcode and spend data should be presented here in cost descending order --> <!-- table body - name, postcode and spend data should be presented here in cost descending order -->
<!-- <tr recur-result *ngFor="let recur of recurList" [categories]="categories" [recur]="recur" (onClick)="recurClick($event, template)"></tr> --> <tr recur-result *ngFor="let recur of recurList" tr.names="name" tr.recur="recur" (onClick)="recurClick($event, template)"></tr>
<tr> <!-- <tr>
<td>Supplier's Name</td> <td>Supplier's Name</td>
<td>Supplier's Postcode</td> <td>Supplier's Postcode</td>
<td>Supplier's Spend</td> <td>Supplier's Spend</td>
@ -26,7 +26,7 @@
<td>Supplier 3's Postcode</td> <td>Supplier 3's Postcode</td>
<td>Supplier 3's Spend</td> <td>Supplier 3's Spend</td>
</tr> </tr>
</tbody> </tbody> -->
</table> </table>
</div> </div>
</div> </div>

View file

@ -4,11 +4,22 @@ import { AgmCoreModule } from '@agm/core';
import { BsModalService, ModalDirective } from 'ngx-bootstrap/modal'; import { BsModalService, ModalDirective } from 'ngx-bootstrap/modal';
import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service'; import { BsModalRef } from 'ngx-bootstrap/modal/bs-modal-ref.service';
interface RecurSupplierData {
name : string;
}
@Component({ @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<RecurSupplierData>;
@Output() public onClick = new EventEmitter();
@Input() public categories: any;
public recurClick(event: any): void {
this.onClick.emit( event );
}
constructor( constructor(
private api: ApiService, private api: ApiService,
@ -21,7 +32,4 @@ export class NewSectionComponent implements OnInit, AfterViewInit {
ngAfterViewInit() { ngAfterViewInit() {
} }
} }

View file

@ -95,10 +95,10 @@
</a> </a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" routerLinkActive="active" [routerLink]="['/new-section']"> <a class="nav-link" routerLinkActive="active" [routerLink]="['/suppliers']">
<div class="row no-gutters align-items-center"> <div class="row no-gutters align-items-center">
<div class="col-2"><i class="icon-speedometer"></i></div> <div class="col-2"><i class="icon-speedometer"></i></div>
<div class="col-10">New section</div> <div class="col-10">Suppliers</div>
</div> </div>
</a> </a>
</li> </li>