diff --git a/src/app/pages/charts/components/chartJs/chartJs.component.ts b/src/app/pages/charts/components/chartJs/chartJs.component.ts index 76641b0d..847dce88 100644 --- a/src/app/pages/charts/components/chartJs/chartJs.component.ts +++ b/src/app/pages/charts/components/chartJs/chartJs.component.ts @@ -17,8 +17,14 @@ import {chartColors} from "../../../../theme/theme.constants"; }) export class ChartJs { - public labels = ["Sleeping", "Designing", "Coding", "Cycling"]; - public data = [20, 40, 5, 35]; + public labels = { + one: ["Sleeping", "Designing", "Coding", "Cycling"], + two: ["April", "May", "June", "Jule", "August", "September", "October", "November", "December"] + }; + public data = { + one: [20, 40, 5, 35], + two: [[1, 9, 3, 4, 5, 6, 7, 8, 2].map((e) => {return Math.sin(e) * 25 + 25})] + }; public colours = chartColors; public options = { scaleShowLabelBackdrop : false, @@ -32,6 +38,17 @@ export class ChartJs { constructor(private _chartJsService:ChartJsService) { } + ngOnInit() { + // var self = this; + // setInterval(() => { + // + // var temp = [...this.data.two]; + // temp[0].unshift(temp[0].pop()); + // this.data.two = temp; + // + // }, 300); + } + chartType(type) { return type; } diff --git a/src/app/pages/charts/components/chartJs/chartJs.html b/src/app/pages/charts/components/chartJs/chartJs.html index 95c8887e..2a666eff 100644 --- a/src/app/pages/charts/components/chartJs/chartJs.html +++ b/src/app/pages/charts/components/chartJs/chartJs.html @@ -2,7 +2,7 @@
+ [legend]="true" [colours]="colours" [options]="options" [data]="data.one" [chartType]="chartType('Pie')" [labels]="labels.one" (chartClick)="changeData($event)">
@@ -10,7 +10,7 @@
+ [legend]="true" [colours]="colours" [options]="options" [data]="data.one" [chartType]="chartType('Doughnut')" [labels]="labels.one" (chartClick)="changeData($event)">
@@ -18,8 +18,25 @@
+ [legend]="true" [colours]="colours" [options]="options" [data]="data.one" [chartType]="chartType('PolarArea')" [labels]="labels.one" (chartClick)="changeData($event)"> - + +
+ + +
+
+ + + + +
+
+ + + +