Colour fixes

This commit is contained in:
Tom Slater 2019-08-21 11:51:10 +01:00
parent 2e00e87574
commit 2cb17c12dd
5 changed files with 44 additions and 8 deletions

View file

@ -73,6 +73,7 @@
[datasets]="barChartDataCategory" [datasets]="barChartDataCategory"
[labels]="barChartLabelsCategory" [labels]="barChartLabelsCategory"
[options]="barChartOptionsCategory" [options]="barChartOptionsCategory"
[colors]="barChartColoursCategory"
[legend]="barChartLegendCategory" [legend]="barChartLegendCategory"
[chartType]="barChartTypeCategory" [chartType]="barChartTypeCategory"
(chartHover)="chartHovered($event)" (chartHover)="chartHovered($event)"

View file

@ -42,16 +42,17 @@ export class DashboardCustomerComponent implements OnInit {
public doughnutChartColoursCategory: any[] = [ public doughnutChartColoursCategory: any[] = [
{ {
backgroundColor:[ backgroundColor:[
'red', '#ffa1b5',
'green', 'green',
'blue', '#52afed',
'purple', 'purple',
'yellow', 'yellow',
'brown', 'brown',
'magenta', 'magenta',
'cyan', 'cyan',
'orange', 'orange',
'pink' 'red',
'#000000'
] ]
}]; }];
@ -117,7 +118,22 @@ export class DashboardCustomerComponent implements OnInit {
public barChartLegendCategory:boolean = false; public barChartLegendCategory:boolean = false;
public barChartDataCategory:any[]=[]; public barChartDataCategory:any[]=[];
public barChartLabelsCategory:string[] = []; public barChartLabelsCategory:string[] = [];
public barChartColoursCategory: any[] = [
{
backgroundColor:[
'#ffa1b5',
'green',
'#52afed',
'purple',
'yellow',
'brown',
'magenta',
'cyan',
'orange',
'red',
'#000000'
]
}];
weekPurchaseList = { weekPurchaseList = {

View file

@ -68,6 +68,7 @@
[datasets]="doughnutChartDataCategory" [datasets]="doughnutChartDataCategory"
[labels]="doughnutChartLabelsCategory" [labels]="doughnutChartLabelsCategory"
[options]="doughnutChartOptionsCategory" [options]="doughnutChartOptionsCategory"
[colors]="doughnutChartColoursCategory"
[legend]="chartLegend" [legend]="chartLegend"
[chartType]="chartType" [chartType]="chartType"
(chartHover)="chartHovered($event)" (chartHover)="chartHovered($event)"

View file

@ -80,6 +80,23 @@ export class DashboardComponent {
public chartLegend = true; public chartLegend = true;
public doughnutChartDataCategory: any[] = []; public doughnutChartDataCategory: any[] = [];
public doughnutChartLabelsCategory: string[] = []; public doughnutChartLabelsCategory: string[] = [];
public doughnutChartColoursCategory: any[] = [
{
backgroundColor:[
'#ffa1b5',
'green',
'#52afed',
'purple',
'yellow',
'brown',
'magenta',
'cyan',
'orange',
'red',
'#000000'
]
}];
public doughnutChartOptionsCategory:any = { public doughnutChartOptionsCategory:any = {
tooltips: { tooltips: {
@ -121,16 +138,17 @@ export class DashboardComponent {
public barChartColoursCategory: any[] = [ public barChartColoursCategory: any[] = [
{ {
backgroundColor:[ backgroundColor:[
'red', '#ffa1b5',
'green', 'green',
'blue', '#52afed',
'purple', 'purple',
'yellow', 'yellow',
'brown', 'brown',
'magenta', 'magenta',
'cyan', 'cyan',
'orange', 'orange',
'pink' 'red',
'#000000'
] ]
}]; }];

View file

@ -27,7 +27,7 @@ export class PiePanel implements OnInit {
'magenta', 'magenta',
'cyan', 'cyan',
'orange', 'orange',
'pink' 'pink',
] ]
}, },
{ borderColor:[ { borderColor:[