diff --git a/src/components/Medium/ModuleTitle.tsx b/src/components/Medium/ModuleTitle.tsx
index e84127fb..55c8d72c 100644
--- a/src/components/Medium/ModuleTitle.tsx
+++ b/src/components/Medium/ModuleTitle.tsx
@@ -88,7 +88,7 @@ export default function ModuleTitle({minTimer, module, label, exerciseIndex, tot
{moduleLabels[module]} exam {label && `- ${label}`}
-
+
Exercise {exerciseIndex}/{totalExercises}
diff --git a/src/exams/Listening.tsx b/src/exams/Listening.tsx
index 30ac3eef..e0b428ba 100644
--- a/src/exams/Listening.tsx
+++ b/src/exams/Listening.tsx
@@ -8,6 +8,7 @@ import Button from "@/components/Low/Button";
import BlankQuestionsModal from "@/components/BlankQuestionsModal";
import useExamStore from "@/stores/examStore";
import {defaultUserSolutions} from "@/utils/exams";
+import {countExercises} from "@/utils/moduleUtils";
interface Props {
exam: ListeningExam;
@@ -133,7 +134,7 @@ export default function Listening({exam, showSolutions = false, onFinish}: Props
}
minTimer={exam.minTimer}
module="listening"
- totalExercises={exam.parts.flatMap((x) => x.exercises).length}
+ totalExercises={countExercises(exam.parts.flatMap((x) => x.exercises))}
disableTimer={showSolutions}
/>
{renderAudioPlayer()}
diff --git a/src/exams/Reading.tsx b/src/exams/Reading.tsx
index 2e72be74..5c5e8919 100644
--- a/src/exams/Reading.tsx
+++ b/src/exams/Reading.tsx
@@ -18,6 +18,7 @@ import Button from "@/components/Low/Button";
import BlankQuestionsModal from "@/components/BlankQuestionsModal";
import useExamStore from "@/stores/examStore";
import {defaultUserSolutions} from "@/utils/exams";
+import {countExercises} from "@/utils/moduleUtils";
interface Props {
exam: ReadingExam;
@@ -209,7 +210,7 @@ export default function Reading({exam, showSolutions = false, onFinish}: Props)
) || 0) + (exerciseIndex === -1 ? 0 : 1)
}
module="reading"
- totalExercises={exam.parts.flatMap((x) => x.exercises).length}
+ totalExercises={countExercises(exam.parts.flatMap((x) => x.exercises))}
disableTimer={showSolutions}
label={exerciseIndex === -1 ? undefined : convertCamelCaseToReadable(exam.parts[partIndex].exercises[exerciseIndex].type)}
/>
diff --git a/src/exams/Speaking.tsx b/src/exams/Speaking.tsx
index 187a8d23..7e3db61f 100644
--- a/src/exams/Speaking.tsx
+++ b/src/exams/Speaking.tsx
@@ -5,6 +5,7 @@ import {infoButtonStyle} from "@/constants/buttonStyles";
import {UserSolution, SpeakingExam} from "@/interfaces/exam";
import useExamStore from "@/stores/examStore";
import {defaultUserSolutions} from "@/utils/exams";
+import {countExercises} from "@/utils/moduleUtils";
import {convertCamelCaseToReadable} from "@/utils/string";
import {mdiArrowRight} from "@mdi/js";
import Icon from "@mdi/react";
@@ -72,7 +73,7 @@ export default function Speaking({exam, showSolutions = false, onFinish}: Props)
minTimer={exam.minTimer}
exerciseIndex={exerciseIndex + 1}
module="speaking"
- totalExercises={exam.exercises.length}
+ totalExercises={countExercises(exam.exercises)}
disableTimer={showSolutions}
/>
{exerciseIndex > -1 &&
diff --git a/src/exams/Writing.tsx b/src/exams/Writing.tsx
index 1dc9ee11..e317117a 100644
--- a/src/exams/Writing.tsx
+++ b/src/exams/Writing.tsx
@@ -5,6 +5,7 @@ import {infoButtonStyle} from "@/constants/buttonStyles";
import {UserSolution, WritingExam} from "@/interfaces/exam";
import useExamStore from "@/stores/examStore";
import {defaultUserSolutions} from "@/utils/exams";
+import {countExercises} from "@/utils/moduleUtils";
import {mdiArrowRight} from "@mdi/js";
import Icon from "@mdi/react";
import clsx from "clsx";
@@ -71,7 +72,7 @@ export default function Writing({exam, showSolutions = false, onFinish}: Props)
minTimer={exam.minTimer}
exerciseIndex={exerciseIndex + 1}
module="writing"
- totalExercises={exam.exercises.length}
+ totalExercises={countExercises(exam.exercises)}
disableTimer={showSolutions}
/>
{exerciseIndex > -1 &&
diff --git a/src/pages/(admin)/Lists/ExamList.tsx b/src/pages/(admin)/Lists/ExamList.tsx
index 38c75088..051df902 100644
--- a/src/pages/(admin)/Lists/ExamList.tsx
+++ b/src/pages/(admin)/Lists/ExamList.tsx
@@ -6,6 +6,7 @@ import {Exam} from "@/interfaces/exam";
import {Type, User} from "@/interfaces/user";
import useExamStore from "@/stores/examStore";
import {getExamById} from "@/utils/exams";
+import {countExercises} from "@/utils/moduleUtils";
import {createColumnHelper, flexRender, getCoreRowModel, useReactTable} from "@tanstack/react-table";
import axios from "axios";
import clsx from "clsx";
@@ -71,10 +72,10 @@ export default function ExamList({user}: {user: User}) {
const getTotalExercises = (exam: Exam) => {
if (exam.module === "reading" || exam.module === "listening") {
- return exam.parts.flatMap((x) => x.exercises).length;
+ return countExercises(exam.parts.flatMap((x) => x.exercises));
}
- return exam.exercises.length;
+ return countExercises(exam.exercises);
};
const defaultColumns = [
diff --git a/src/utils/moduleUtils.ts b/src/utils/moduleUtils.ts
index abe9ed54..db6463a4 100644
--- a/src/utils/moduleUtils.ts
+++ b/src/utils/moduleUtils.ts
@@ -1,4 +1,5 @@
import {Module} from "@/interfaces";
+import {Exercise} from "@/interfaces/exam";
export const MODULE_ARRAY: Module[] = ["reading", "listening", "writing", "speaking"];
@@ -16,3 +17,14 @@ export const sortByModule = (a: {module: Module}, b: {module: Module}) => {
export const sortByModuleName = (a: string, b: string) => {
return MODULE_ARRAY.findIndex((x) => a === x) - MODULE_ARRAY.findIndex((x) => b === x);
};
+
+export const countExercises = (exercises: Exercise[]) => {
+ const lengthMap = exercises.map((e) => {
+ if (e.type === "multipleChoice") return e.questions.length;
+ if (e.type === "interactiveSpeaking") return e.prompts.length;
+
+ return 1;
+ });
+
+ return lengthMap.reduce((accumulator, current) => accumulator + current, 0);
+};