From cc5b7b2793ced51e380281c3fdf376746b9e60d6 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 29 Sep 2019 18:02:40 -0400 Subject: [PATCH] [O] Remove dataset, move data to series --- .../overall/graph-average/graph-average.ts | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/pages/overall/graph-average/graph-average.ts b/src/pages/overall/graph-average/graph-average.ts index 9f94259..c296a32 100644 --- a/src/pages/overall/graph-average/graph-average.ts +++ b/src/pages/overall/graph-average/graph-average.ts @@ -16,17 +16,6 @@ export default class GraphAverage extends Vue { let settings = { - // Dataset - dataset: - { - source: this.courses.map(course => - { - // [Course name, GPA, MaxGPA] - return [course.name, GPAUtils.getGP(course, course.letterGrade), - GPAUtils.getGP(course, 'A+')]; - }) - }, - // X axis represents course names xAxis: { @@ -48,14 +37,31 @@ export default class GraphAverage extends Vue }, // Data - series: [2, 1].map(i => - { - return { + series: + [ + { type: 'bar', barGap: '-100%', - encode: {x: 0, y: i} + data: this.courses.map(course => [course.name, GPAUtils.getGP(course, 'A+')]), + }, + { + type: 'bar', + barGap: '-100%', + data: this.courses.map(course => [course.name, GPAUtils.getGP(course, course.letterGrade)]), + + label: + { + show: true, + rotate: 90 + } } - }) + ], + + // Disable tooltip + tooltip: + { + show: false + } }; // TODO: Remove this