azalea/VeracrossAnalyzerDemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[U] Update usage

Browse Source
This commit is contained in:
Hykilpikonna
2019-12-07 12:32:57 -05:00
parent bac9e3524c
commit 022c7ec50f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/course.ts
+3 -3
View File
@@ -233,7 +233,7 @@ export default class Course
// Calculate // Calculate
if (this.termGrading[term].method == 'PERCENT_TYPE') if (this.termGrading[term].method == 'PERCENT_TYPE')
{ {
return GPAUtils.getPercentTypeAverage(this, this.assignments); return GPAUtils.getPercentTypeAverage(this.termGrading[term], this.assignments);
} }
else if (this.termGrading[term].method == 'TOTAL_MEAN') else if (this.termGrading[term].method == 'TOTAL_MEAN')
{ {
@@ -270,8 +270,8 @@ export default class Course
let scoreMax = typeAssignments.reduce((sum, a) => sum + a.scoreMax, 0); let scoreMax = typeAssignments.reduce((sum, a) => sum + a.scoreMax, 0);
// Calculate weight // Calculate weight
let weight = this.grading.method == 'PERCENT_TYPE' let weight = this.termGrading[0].method == 'PERCENT_TYPE'
? this.grading.weightingMap[type] : scoreMax / totalScoreMax; ? this.termGrading[0].weightingMap[type] : scoreMax / totalScoreMax;
// Return // Return
return {name: type, id: typeAssignments[0].typeId, weight: +(weight * 100).toFixed(2), return {name: type, id: typeAssignments[0].typeId, weight: +(weight * 100).toFixed(2),