From 076a1ee52e725022d92ff5eb48b5630ef5345f8b Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 9 Nov 2019 20:21:09 -0500 Subject: [PATCH] [O] Return graded assignments by default --- src/logic/course.ts | 13 +++++++++---- src/pages/overall/overall-line/overall-line.ts | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/logic/course.ts b/src/logic/course.ts index 26af686..c097fdf 100644 --- a/src/logic/course.ts +++ b/src/logic/course.ts @@ -136,7 +136,7 @@ export default class Course if (this.level == 'None' || this.level == 'Unknown' || this.scaleUp == -1) return false; // Skip courses without graded assignments - if (this.gradedAssignments.length == 0) return false; + if (this.assignments.length == 0) return false; // Skip if there are no grading scale // if (course.grading.method == 'NOT_GRADED') return; @@ -148,7 +148,7 @@ export default class Course /** * Get assignments of the selected time */ - get assignments(): Assignment[] + get rawSelectedAssignments(): Assignment[] { let timeCode = Navigation.instance.getSelectedGradingPeriod(); @@ -162,12 +162,17 @@ export default class Course return this.computed.termAssignments[timeCode]; } + private filteredAssignmentsCache: Assignment[]; + /** * Get graded assignments */ - get gradedAssignments(): Assignment[] + get assignments(): Assignment[] { - return this.assignments.filter(a => a.complete == 'Complete'); + if (this.filteredAssignmentsCache != null) + this.filteredAssignmentsCache = this.rawSelectedAssignments.filter(a => a.complete == 'Complete'); + + return this.filteredAssignmentsCache; } // TODO: Optimize this diff --git a/src/pages/overall/overall-line/overall-line.ts b/src/pages/overall/overall-line/overall-line.ts index 35507ee..5ca86ff 100644 --- a/src/pages/overall/overall-line/overall-line.ts +++ b/src/pages/overall/overall-line/overall-line.ts @@ -108,7 +108,7 @@ export default class OverallLine extends Vue private getCourseSeries(course: Course) { // Graded assignments - let assignments = course.gradedAssignments.slice().reverse(); + let assignments = course.assignments.slice().reverse(); // Create series return {