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

Merge branch 'finn/UIfixes' into development

Browse source
This commit is contained in:
piratefinn 2018-04-16 15:42:02 +01:00
commit 48fd3114b2
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/dashboard/dashboard-customer.component.ts
View file

@ -240,6 +240,8 @@ export class DashboardCustomerComponent implements OnInit {
this.barChartDataCategory = [ this.barChartDataCategory = [
{data: barChartDataCategoryInitial, label: 'Series A'}, {data: barChartDataCategoryInitial, label: 'Series A'},
]; ];
this.showCategoryBarChart = true;
if (this.weekList1) {
let doughnutChartDataCategoryInitial = this.weekList1.map(function(a) {return a.value;}); let doughnutChartDataCategoryInitial = this.weekList1.map(function(a) {return a.value;});
this.doughnutChartDataCategory = [ this.doughnutChartDataCategory = [
{data: doughnutChartDataCategoryInitial, label: 'Series A'}, {data: doughnutChartDataCategoryInitial, label: 'Series A'},
@ -247,7 +249,7 @@ export class DashboardCustomerComponent implements OnInit {
// setTimeout is currently a workaround for ng2-charts labels // setTimeout is currently a workaround for ng2-charts labels
setTimeout(() => this.doughnutChartLabelsCategory = this.weekList1.map(function(a) {return a.category;}), 0); setTimeout(() => this.doughnutChartLabelsCategory = this.weekList1.map(function(a) {return a.category;}), 0);
this.showCategoryDoughnutChart = true; this.showCategoryDoughnutChart = true;
this.showCategoryBarChart = true; }
} }
private setDate () { private setDate () {