From 8846a8be5dfc4641cf63bea26378f7ae52832800 Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 7 Dec 2019 11:25:23 -0500 Subject: [PATCH] [O] Get assignments return all selected terms assignments --- src/logic/course.ts | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/logic/course.ts b/src/logic/course.ts index f8203ca..0bb56e1 100644 --- a/src/logic/course.ts +++ b/src/logic/course.ts @@ -174,29 +174,11 @@ export default class Course /** * Get assignments of the selected time */ - get rawSelectedAssignments(): Assignment[] - { - let timeCode = Navigation.instance.getSelectedGradingPeriod(); - - // All year - if (timeCode == -1) - { - return this.rawAssignments; - } - - // Specific time - return this.computed.termAssignments[timeCode]; - } - - /** - * Get graded assignments - */ get assignments(): Assignment[] { - return this.cache.get('Assignments', () => - { - return this.rawSelectedAssignments.filter(a => a.complete == 'Complete'); - }); + return this.gradingPeriods + .flatMap(term => this.computed.termAssignments[term]) + .filter(a => a.complete == 'Complete'); } /**