From 3c632c04886e4684aeab45c5c1579288b5cb87d9 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Fri, 6 Dec 2019 18:18:38 -0500 Subject: [PATCH] Revert "[U] Update usage" This reverts commit dc3365b594dee761a7ef867f4ac09ca8d7f78d7b. --- src/logic/course.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/logic/course.ts b/src/logic/course.ts index 846a717..64d447f 100644 --- a/src/logic/course.ts +++ b/src/logic/course.ts @@ -4,7 +4,6 @@ import {CourseUtils} from '@/logic/utils/course-utils'; import Navigation from '@/components/navigation/navigation'; import {GPAUtils} from '@/logic/utils/gpa-utils'; import CacheUtils from '@/logic/utils/cache-utils'; -import cache from '@/logic/utils/cache-utils'; /** * Objects of this interface represent assignment grades. @@ -68,6 +67,8 @@ export default class Course allYearGrade: number }; + cache: CacheUtils = new CacheUtils(); + /** * Construct a course with a course json object * @@ -171,7 +172,7 @@ export default class Course */ get assignments(): Assignment[] { - return cache('Assignments', () => + return this.cache.get('Assignments', () => { return this.rawSelectedAssignments.filter(a => a.complete == 'Complete'); }); @@ -182,7 +183,7 @@ export default class Course */ get letterGrade(): string { - return cache('LetterGrade', () => + return this.cache.get('LetterGrade', () => { // Get scale let scale = GPAUtils.findScale(this.numericGrade); @@ -197,7 +198,7 @@ export default class Course */ get numericGrade(): number { - return cache('NumericGrade', () => + return this.cache.get('NumericGrade', () => { // Calculate if (this.grading.method == 'PERCENT_TYPE') @@ -217,7 +218,7 @@ export default class Course */ get assignmentTypes(): AssignmentType[] { - return cache('AssignmentTypes', () => + return this.cache.get('AssignmentTypes', () => { // Get all types let types = this.assignments.map(a => a.type);