From 1e45b418b8cd4a7cbbc61a718d0f67103b320ded Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Tue, 24 Sep 2019 22:20:58 -0400 Subject: [PATCH] [O] Encapsulate getGP() with letter grade passed in --- src/utils/gpa-utils.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/utils/gpa-utils.ts b/src/utils/gpa-utils.ts index d36911b..702c32a 100644 --- a/src/utils/gpa-utils.ts +++ b/src/utils/gpa-utils.ts @@ -62,7 +62,7 @@ export class GPAUtils let totalGPA = 0; courses.forEach(course => { - totalGPA += this.getGP(course); + totalGPA += this.getGP(course, course.letterGrade); }); // Get average GPA, round to two decimal places @@ -76,14 +76,15 @@ export class GPAUtils * Calculate GPA for a course * * @param course Course + * @param letterGrade Letter grade */ - public static getGP(course: Course): number + public static getGP(course: Course, letterGrade?: string): number { // Find the GPA for this course. for (let scale of this.SCALE) { // Letter grades are the same - if (scale[this.LETTER] == course.letterGrade) + if (scale[this.LETTER] == letterGrade) { // Get grade and add it let grade = scale[this.GPA];