Pear-Trading/FoodLoop-Web
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'tyu-tyu/chart' into felix/customranges

Browse source
This commit is contained in:
Tom Slater 2019-08-16 13:58:13 +01:00
commit 1070c5de3b
5 changed files with 31 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app/dashboard/more-graphs-and-tables.component.ts
View file

@ -22,10 +22,12 @@ export class MoreStuffComponent implements OnInit {
) {
this.bubbleChartBegin = moment().format('YYYY-MM-DD');
this.bubbleChartEnd = moment().format('YYYY-MM-DD');
this.lineChartBegin = moment().format('YYYY-MM-DD');
this.lineChartEnd = moment().format('YYYY-MM-DD');
}
ngOnInit(): void {
this.loadYearSpend();
this.loadYearSpend(false, ('January 1, 2018'), ('January 1, 2019'));
this.loadSupplierBubble(false, ('January 1, 2018'), ('January 1, 2019')); // pass start and end date ranges to this as Date()s
this.loadSupplierHistory();
}
@ -275,6 +277,17 @@ export class MoreStuffComponent implements OnInit {
return Math.random();
}
lineChartUpdate() {
console.log("start_range input box: " + this.lineChartBegin.date);
console.log("start_range : " + new Date(this.lineChartBegin));
console.log("end_range input box: " + this.lineChartEnd);
console.log("end_range : " + new Date(this.lineChartEnd));
this.loadSupplierBubble(true, (this.bubbleChartBegin), (this.bubbleChartEnd));
console.log("Bubble chart updating...");
}
@ViewChild('supplierChart', {read: BaseChartDirective, static: false}) supplierChart: BaseChartDirective;
private loadSupplierHistory() {