diff --git a/src/pages/history/history.html b/src/pages/history/history.html index ea20fc9e..087fe953 100644 --- a/src/pages/history/history.html +++ b/src/pages/history/history.html @@ -82,7 +82,9 @@

1

Timeset - *placeholder* + One Month + Three Months + Six Months diff --git a/src/pages/history/history.ts b/src/pages/history/history.ts index f1cae0e0..527a65a1 100644 --- a/src/pages/history/history.ts +++ b/src/pages/history/history.ts @@ -23,19 +23,22 @@ export class HistoryPage { this.history = res; this.chartData(res) }) -} -chartData(res){ - let dates = res.map(day => day.date).sort() - let values = (index) => { - let value = res.map(val => val.value[index]) - return value } - this.generateChart(dates, values) -} + + chartData(data){ + let dates = data.map(day => day.date).sort() + let values = (index) => { + let value = data.map(val => val.value[index]) + return value + } + this.generateChart(dates, values) + } + lineChartData = { labels: [], datasets:[] } + lineChartOptions = { elements: { line:{ @@ -58,7 +61,8 @@ chartData(res){ }] } } - generateChart = (dates, values) => { + + generateChart = (dates, values) => { let ctx = this.lineChart.nativeElement; const myLineChart = new Chart(ctx, { type:'line', @@ -78,5 +82,4 @@ chartData(res){ myLineChart.update() } - }