diff --git a/src/exams/pdf/details/radial.result.tsx b/src/exams/pdf/details/radial.result.tsx index c895be0f..8149fcca 100644 --- a/src/exams/pdf/details/radial.result.tsx +++ b/src/exams/pdf/details/radial.result.tsx @@ -4,13 +4,14 @@ import React from "react"; import {View, Text, Image} from "@react-pdf/renderer"; import {styles} from "../styles"; import {ModuleScore} from "@/interfaces/module.scores"; +import {calculateBandScore} from "@/utils/score"; export const RadialResult = ({module, score, total, png}: ModuleScore) => ( {module} - {Math.floor(score)} + {calculateBandScore(score, total, module, "academic")} out of 9.0 diff --git a/src/utils/score.ts b/src/utils/score.ts index 26aa526a..a3b508fa 100644 --- a/src/utils/score.ts +++ b/src/utils/score.ts @@ -103,7 +103,7 @@ const levelMarking: {[key: number]: number} = { 0: 0, // Beginner }; -const moduleMarkings: {[key in Module]: {[key in Type]: {[key: number]: number}}} = { +const moduleMarkings: {[key in Module | "Overall"]: {[key in Type]: {[key: number]: number}}} = { reading: { academic: academicMarking, general: readingGeneralMarking, @@ -124,9 +124,13 @@ const moduleMarkings: {[key in Module]: {[key in Type]: {[key: number]: number}} academic: levelMarking, general: levelMarking, }, + Overall: { + academic: levelMarking, + general: levelMarking, + }, }; -export const calculateBandScore = (correct: number, total: number, module: Module, type: Type) => { +export const calculateBandScore = (correct: number, total: number, module: Module | "Overall", type: Type) => { const marking = moduleMarkings[module][type]; const percentage = (correct * 100) / total;