Skip to content

fix(scholarship): correct the scholarship calculation #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtemSBulgakov merged 1 commit into from
Sep 30, 2026
+5 −0
Merged

fix(scholarship): correct the scholarship calculation #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/scholarship/ScholarshipCalculator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export default function ScholarshipCalculator() {
const newGPA = calculateGPA(newMarks);
const newScholarship = calculateScholarship(
newGPA,
newMarks,
FORMULA_B_MIN,
FORMULA_B_MAX_MAPPING[course],
);
Expand Down Expand Up @@ -142,6 +143,7 @@ export default function ScholarshipCalculator() {
const newMarks = calculateMarksFromGPA(gpa);
const newScholarship = calculateScholarship(
gpa,
newMarks,
FORMULA_B_MIN,
FORMULA_B_MAX_MAPPING[course],
);
Expand Down
3 changes: 3 additions & 0 deletions src/components/scholarship/calculate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@ export function calculateGPA(marks: Mark[]): number {
*/
export function calculateScholarship(
GPA: number,
marks: Mark[],
Bmin: number,
Bmax: number,
): number {
// If any C or D marks appear, return 0
if (marks.some((v) => v === "C" || v === "D")) return 0;
// Formula for scholarship
const S = Bmin + (Bmax - Bmin) * Math.pow((GPA - 2) / 3, 2.5);
// Round down to the nearest multiple of 100
Expand Down
Loading