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

Misc chart work

Browse source 
Search feature on both suppliers and the pagination feature on the spend history still not functional
This commit is contained in:
Tom Slater 2019-08-30 16:50:19 +01:00
parent d7f9d7e755
commit 42e310b36a
11 changed files with 84 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,9 @@ export class MoreStuffComponent implements OnInit {
bubbleChartBegin: any;
bubbleChartEnd: any;
cached_graph_data: any;
isBubbleChartLoaded = false;
isLineChartLoaded = false;
isBubbleChartLoaded:boolean = false;
isLineChartLoaded:boolean = false;
isSupplierChartLoaded:boolean = false;
constructor(
private api: ApiService,
@ -31,7 +32,7 @@ export class MoreStuffComponent implements OnInit {
}
ngOnInit(): void {
this.loadYearSpend(false, ('0'), ('0'));
this.loadYearSpend();
this.loadSupplierBubble(false, ('0'), ('0'));
this.loadSupplierHistory();
}
@ -131,9 +132,6 @@ export class MoreStuffComponent implements OnInit {
// console.log("variable \"this.isBubbleChartLoaded\": " + this.isBubbleChartLoaded);
}
private bubbleChartUpdate() {
console.log("test change");
}
public supplierBubbleChartType: ChartType = 'bubble';
public supplierBubbleChartData: any[] = [
{
@ -275,7 +273,7 @@ export class MoreStuffComponent implements OnInit {
}
lineChartUpdate() {
this.loadYearSpend(true, (this.lineChartBegin), (this.lineChartEnd));
this.loadYearSpend();
}
@ -300,27 +298,48 @@ export class MoreStuffComponent implements OnInit {
this.supplierMonthChartLabels = labels.slice(0,15);
}
)
this.isSupplierChartLoaded = true;
}
supplierChartUpdate() {
this.api.loadMiscUrl('organisation/external/supplier_history').subscribe(
result => {
let labels = [];
let year = [];
let half = [];
let quarter = [];
result.data.map(item => {
labels.push(item.name);
year.push(item.year_total);
half.push(item.half_total);
quarter.push(item.quarter_total);
});
this.supplierMonthChartData[0].data = quarter.slice(0,15);
this.supplierMonthChartData[1].data = half.slice(0,15);
this.supplierMonthChartData[2].data = year.slice(0,15);
this.supplierMonthChartLabels = labels.slice(0,15);
}
)
private supplierChartNext() {
result => {
let labels = [];
let year = [];
let half = [];
let quarter = [];
result.data.map(item => {
labels.push(item.name);
year.push(item.year_total);
half.push(item.half_total);
quarter.push(item.quarter_total);
});
this.supplierMonthChartData[0].data = quarter.slice(16,30);
this.supplierMonthChartData[1].data = half.slice(16,30);
this.supplierMonthChartData[2].data = year.slice(16,30);
this.supplierMonthChartLabels = labels.slice(16,30);
}
this.isSupplierChartLoaded = true;
}
private supplierChartPrevious() {
result => {
let labels = [];
let year = [];
let half = [];
let quarter = [];
result.data.map(item => {
labels.push(item.name);
year.push(item.year_total);
half.push(item.half_total);
quarter.push(item.quarter_total);
});
this.supplierMonthChartData[0].data = quarter.slice(0,15);
this.supplierMonthChartData[1].data = half.slice(0,15);
this.supplierMonthChartData[2].data = year.slice(0,15);
this.supplierMonthChartLabels = labels.slice(0,15);
}
this.isSupplierChartLoaded = true;
}
public supplierMonthChartData: any[] = [
{
data: [],