From 2057f08e40be17c360ddad211a447ce6cf2adc1b Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Wed, 6 Nov 2019 21:49:17 -0500 Subject: [PATCH] [M] Rename time selection to grading period --- src/components/navigation/navigation.scss | 2 +- src/components/navigation/navigation.ts | 20 ++++++++++---------- src/components/navigation/navigation.vue | 4 ++-- src/logic/course.ts | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/components/navigation/navigation.scss b/src/components/navigation/navigation.scss index db48f74..fc7fac7 100644 --- a/src/components/navigation/navigation.scss +++ b/src/components/navigation/navigation.scss @@ -27,7 +27,7 @@ width: 110px; } -#nav-time-selection +#nav-grading-period { // Float right position: absolute; diff --git a/src/components/navigation/navigation.ts b/src/components/navigation/navigation.ts index d1189dd..e71bbc1 100644 --- a/src/components/navigation/navigation.ts +++ b/src/components/navigation/navigation.ts @@ -17,7 +17,7 @@ export default class Navigation extends Vue @Prop({required: true}) courses: Course[]; - private selectedTime: string = 'All Year'; + private gradingPeriod: string = 'All Year'; // Instance public static instance: Navigation; @@ -30,9 +30,9 @@ export default class Navigation extends Vue // Check selected time if (!this.$cookies.isKey('va.selected-time')) { - this.$cookies.set('va.selected-time', this.selectedTime, '10y'); + this.$cookies.set('va.selected-time', this.gradingPeriod, '10y'); } - this.selectedTime = this.$cookies.get('va.selected-time'); + this.gradingPeriod = this.$cookies.get('va.selected-time'); } /** @@ -162,25 +162,25 @@ export default class Navigation extends Vue } /** - * Select time + * Select grading period * * @param command Term 1, Term 2, All Year, etc. */ - public selectTime(command: string) + public selectGradingPeriod(command: string) { - this.selectedTime = command; + this.gradingPeriod = command; this.$cookies.set('va.selected-time', command, '10y'); // Call event - this.$emit('select-time', this.getSelectedTimeCode()); + this.$emit('select-time', this.getSelectedGradingPeriod()); } /** * Get code for selected time */ - public getSelectedTimeCode(): number + public getSelectedGradingPeriod(): number { - if (this.selectedTime == 'All Year') return -1; - else return +this.selectedTime.replace('Term ', '') - 1; + if (this.gradingPeriod == 'All Year') return -1; + else return +this.gradingPeriod.replace('Term ', '') - 1; } } diff --git a/src/components/navigation/navigation.vue b/src/components/navigation/navigation.vue index 5dabc77..c89a0b8 100644 --- a/src/components/navigation/navigation.vue +++ b/src/components/navigation/navigation.vue @@ -16,8 +16,8 @@ :key="course.name">{{course.name}} - - + + {{selectedTime}} diff --git a/src/logic/course.ts b/src/logic/course.ts index ab31b7c..d02b393 100644 --- a/src/logic/course.ts +++ b/src/logic/course.ts @@ -128,7 +128,7 @@ export default class Course */ get assignments(): Assignment[] { - let timeCode = Navigation.instance.getSelectedTimeCode(); + let timeCode = Navigation.instance.getSelectedGradingPeriod(); // All year if (timeCode == -1)