From 6659f65763b3c161ec0510585eb5419b8dc48802 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 9 Nov 2019 17:19:30 -0500 Subject: [PATCH] [F] Fix multiple assignment creating multiple dates issue --- src/pages/overall/overall-line/overall-line.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/overall/overall-line/overall-line.ts b/src/pages/overall/overall-line/overall-line.ts index 407125c..17e7017 100644 --- a/src/pages/overall/overall-line/overall-line.ts +++ b/src/pages/overall/overall-line/overall-line.ts @@ -79,22 +79,26 @@ export default class OverallLine extends Vue */ private getCourseSeries(course: Course) { + // Graded assignments + let assignments = course.gradedAssignments.slice().reverse(); + + // Create series return { name: course.name, type: 'line', smooth: true, - data: course.gradedAssignments.slice().reverse().map((assignment, i, array) => + data: this.toDateRange([...assignments.map(a => a.time)].map((time, i) => { // Find subset before this assignment - let subset = array.filter(a => a.time <= assignment.time); + let subset = assignments.filter(a => a.time <= time); console.log(subset); // Find grade if (course.grading.method == 'PERCENT_TYPE') - return [assignment.time, GPAUtils.getPercentTypeAverage(course, subset)]; + return [time, GPAUtils.getPercentTypeAverage(course, subset)]; if (course.grading.method == 'TOTAL_MEAN') - return [assignment.time, GPAUtils.getTotalMeanAverage(subset)]; - }) + return [time, GPAUtils.getTotalMeanAverage(subset)]; + })) } }