From eb7be2b92d5d290d28cc03f153939745b2596795 Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Wed, 10 Apr 2019 16:11:50 -0700 Subject: [PATCH 1/2] Readability --- src/pages/history/history.ts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/pages/history/history.ts b/src/pages/history/history.ts index 9c714ba0..1f1dbcc9 100644 --- a/src/pages/history/history.ts +++ b/src/pages/history/history.ts @@ -22,19 +22,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:{ @@ -57,7 +60,8 @@ chartData(res){ }] } } - generateChart = (dates, values) => { + + generateChart = (dates, values) => { let ctx = this.lineChart.nativeElement; const myLineChart = new Chart(ctx, { type:'line', @@ -77,5 +81,4 @@ chartData(res){ myLineChart.update() } - } From ff68f5e32d0cb245d993891d6c79bc2ec913e609 Mon Sep 17 00:00:00 2001 From: AlexRingrose Date: Wed, 10 Apr 2019 17:38:29 -0700 Subject: [PATCH 2/2] Chart selectors --- src/pages/history/history.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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