From 6d3e14555813c23e0e8485fa880614c82437bdac Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 7 Dec 2019 14:29:46 -0500 Subject: [PATCH] [O] Use course.getAssignmentsBefore() --- src/pages/overall/overall-line/overall-line.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/overall/overall-line/overall-line.ts b/src/pages/overall/overall-line/overall-line.ts index 726440a..e27eaef 100644 --- a/src/pages/overall/overall-line/overall-line.ts +++ b/src/pages/overall/overall-line/overall-line.ts @@ -119,13 +119,12 @@ export default class OverallLine extends Vue data: this.toDateRange([...new Set(assignments.map(a => a.time))].map(time => { // Find subset before this assignment - let subset = assignments.filter(a => a.time <= time); + let subset = course.getAssignmentsBefore(time); // Find grade - if (course.grading.method == 'PERCENT_TYPE') - return [time, GPAUtils.getPercentTypeAverage(course, subset)]; - if (course.grading.method == 'TOTAL_MEAN') - return [time, GPAUtils.getTotalMeanAverage(subset)]; + if (course.termGrading[subset.term].method == 'PERCENT_TYPE') + return [time, GPAUtils.getPercentTypeAverage(course.termGrading[subset.term], subset.assignments)]; + else return [time, GPAUtils.getTotalMeanAverage(subset.assignments)]; })) } }