Solved a bug where if two evaluations where too fast, they would overwrite each other

This commit is contained in:
Tiago Ribeiro
2024-01-28 18:10:56 +00:00
parent 5e6af11156
commit 01e55f970d
2 changed files with 691 additions and 507 deletions

View File

@@ -1,244 +1,319 @@
import Button from "@/components/Low/Button"; import Button from "@/components/Low/Button";
import ModuleTitle from "@/components/Medium/ModuleTitle"; import ModuleTitle from "@/components/Medium/ModuleTitle";
import {moduleResultText} from "@/constants/ielts"; import { moduleResultText } from "@/constants/ielts";
import {Module} from "@/interfaces"; import { Module } from "@/interfaces";
import {User} from "@/interfaces/user"; import { User } from "@/interfaces/user";
import useExamStore from "@/stores/examStore"; import useExamStore from "@/stores/examStore";
import {calculateBandScore} from "@/utils/score"; import { calculateBandScore } from "@/utils/score";
import clsx from "clsx"; import clsx from "clsx";
import Link from "next/link"; import Link from "next/link";
import {useRouter} from "next/router"; import { useRouter } from "next/router";
import {Fragment, useEffect, useState} from "react"; import { Fragment, useEffect, useState } from "react";
import {BsArrowCounterclockwise, BsBook, BsClipboard, BsEyeFill, BsHeadphones, BsMegaphone, BsPen, BsShareFill} from "react-icons/bs"; import {
import {LevelScore} from "@/constants/ielts"; BsArrowCounterclockwise,
import {getLevelScore} from "@/utils/score"; BsBook,
BsClipboard,
BsEyeFill,
BsHeadphones,
BsMegaphone,
BsPen,
BsShareFill,
} from "react-icons/bs";
import { LevelScore } from "@/constants/ielts";
import { getLevelScore } from "@/utils/score";
interface Score { interface Score {
module: Module; module: Module;
correct: number; correct: number;
total: number; total: number;
missing: number; missing: number;
} }
interface Props { interface Props {
user: User; user: User;
modules: Module[]; modules: Module[];
scores: Score[]; scores: Score[];
isLoading: boolean; isLoading: boolean;
onViewResults: () => void; onViewResults: () => void;
} }
export default function Finish({user, scores, modules, isLoading, onViewResults}: Props) { export default function Finish({
const [selectedModule, setSelectedModule] = useState(modules[0]); user,
const [selectedScore, setSelectedScore] = useState<Score>(scores.find((x) => x.module === modules[0])!); scores,
modules,
isLoading,
onViewResults,
}: Props) {
const [selectedModule, setSelectedModule] = useState(modules[0]);
const [selectedScore, setSelectedScore] = useState<Score>(
scores.find((x) => x.module === modules[0])!,
);
const exams = useExamStore((state) => state.exams); const exams = useExamStore((state) => state.exams);
useEffect(() => setSelectedScore(scores.find((x) => x.module === selectedModule)!), [scores, selectedModule]); useEffect(
() => setSelectedScore(scores.find((x) => x.module === selectedModule)!),
[scores, selectedModule],
);
useEffect(() => console.log(scores), [scores]);
const moduleColors: {[key in Module]: {progress: string; inner: string}} = { const moduleColors: { [key in Module]: { progress: string; inner: string } } =
reading: { {
progress: "text-ielts-reading", reading: {
inner: "bg-ielts-reading-light", progress: "text-ielts-reading",
}, inner: "bg-ielts-reading-light",
listening: { },
progress: "text-ielts-listening", listening: {
inner: "bg-ielts-listening-light", progress: "text-ielts-listening",
}, inner: "bg-ielts-listening-light",
writing: { },
progress: "text-ielts-writing", writing: {
inner: "bg-ielts-writing-light", progress: "text-ielts-writing",
}, inner: "bg-ielts-writing-light",
speaking: { },
progress: "text-ielts-speaking", speaking: {
inner: "bg-ielts-speaking-light", progress: "text-ielts-speaking",
}, inner: "bg-ielts-speaking-light",
level: { },
progress: "text-ielts-level", level: {
inner: "bg-ielts-level-light", progress: "text-ielts-level",
}, inner: "bg-ielts-level-light",
}; },
};
const getTotalExercises = () => { const getTotalExercises = () => {
const exam = exams.find((x) => x.module === selectedModule)!; const exam = exams.find((x) => x.module === selectedModule)!;
if (exam.module === "reading" || exam.module === "listening") { if (exam.module === "reading" || exam.module === "listening") {
return exam.parts.flatMap((x) => x.exercises).length; return exam.parts.flatMap((x) => x.exercises).length;
} }
return exam.exercises.length; return exam.exercises.length;
}; };
const bandScore: number = calculateBandScore(selectedScore.correct, selectedScore.total, selectedModule, user.focus); const bandScore: number = calculateBandScore(
selectedScore.correct,
selectedScore.total,
selectedModule,
user.focus,
);
const showLevel = (level: number) => { const showLevel = (level: number) => {
if (selectedModule === "level") { if (selectedModule === "level") {
const [levelStr, grade] = getLevelScore(level); const [levelStr, grade] = getLevelScore(level);
return ( return (
<div className="flex flex-col items-center justify-center gap-1"> <div className="flex flex-col items-center justify-center gap-1">
<span className="text-xl font-bold">{levelStr}</span> <span className="text-xl font-bold">{levelStr}</span>
<span className="text-xl">{grade}</span> <span className="text-xl">{grade}</span>
</div> </div>
); );
} }
return <span className="text-3xl font-bold">{level}</span>; return <span className="text-3xl font-bold">{level}</span>;
}; };
return ( return (
<> <>
<div className="w-full min-h-full h-fit flex flex-col items-center justify-between gap-8"> <div className="flex h-fit min-h-full w-full flex-col items-center justify-between gap-8">
<ModuleTitle <ModuleTitle
module={selectedModule} module={selectedModule}
totalExercises={getTotalExercises()} totalExercises={getTotalExercises()}
exerciseIndex={getTotalExercises()} exerciseIndex={getTotalExercises()}
minTimer={exams.find((x) => x.module === selectedModule)!.minTimer} minTimer={exams.find((x) => x.module === selectedModule)!.minTimer}
disableTimer disableTimer
/> />
<div className="flex gap-4 self-start"> <div className="flex gap-4 self-start">
{modules.includes("reading") && ( {modules.includes("reading") && (
<div <div
onClick={() => setSelectedModule("reading")} onClick={() => setSelectedModule("reading")}
className={clsx( className={clsx(
"flex gap-2 items-center rounded-xl p-4 cursor-pointer hover:shadow-lg transition duration-300 ease-in-out hover:bg-ielts-reading hover:text-white", "hover:bg-ielts-reading flex cursor-pointer items-center gap-2 rounded-xl p-4 transition duration-300 ease-in-out hover:text-white hover:shadow-lg",
selectedModule === "reading" ? "bg-ielts-reading text-white" : "bg-mti-gray-smoke text-ielts-reading", selectedModule === "reading"
)}> ? "bg-ielts-reading text-white"
<BsBook className="w-6 h-6" /> : "bg-mti-gray-smoke text-ielts-reading",
<span className="font-semibold">Reading</span> )}
</div> >
)} <BsBook className="h-6 w-6" />
{modules.includes("listening") && ( <span className="font-semibold">Reading</span>
<div </div>
onClick={() => setSelectedModule("listening")} )}
className={clsx( {modules.includes("listening") && (
"flex gap-2 items-center rounded-xl p-4 cursor-pointer hover:shadow-lg transition duration-300 ease-in-out hover:bg-ielts-listening hover:text-white", <div
selectedModule === "listening" ? "bg-ielts-listening text-white" : "bg-mti-gray-smoke text-ielts-listening", onClick={() => setSelectedModule("listening")}
)}> className={clsx(
<BsHeadphones className="w-6 h-6" /> "hover:bg-ielts-listening flex cursor-pointer items-center gap-2 rounded-xl p-4 transition duration-300 ease-in-out hover:text-white hover:shadow-lg",
<span className="font-semibold">Listening</span> selectedModule === "listening"
</div> ? "bg-ielts-listening text-white"
)} : "bg-mti-gray-smoke text-ielts-listening",
{modules.includes("writing") && ( )}
<div >
onClick={() => setSelectedModule("writing")} <BsHeadphones className="h-6 w-6" />
className={clsx( <span className="font-semibold">Listening</span>
"flex gap-2 items-center rounded-xl p-4 cursor-pointer hover:shadow-lg transition duration-300 ease-in-out hover:bg-ielts-writing hover:text-white", </div>
selectedModule === "writing" ? "bg-ielts-writing text-white" : "bg-mti-gray-smoke text-ielts-writing", )}
)}> {modules.includes("writing") && (
<BsPen className="w-6 h-6" /> <div
<span className="font-semibold">Writing</span> onClick={() => setSelectedModule("writing")}
</div> className={clsx(
)} "hover:bg-ielts-writing flex cursor-pointer items-center gap-2 rounded-xl p-4 transition duration-300 ease-in-out hover:text-white hover:shadow-lg",
{modules.includes("speaking") && ( selectedModule === "writing"
<div ? "bg-ielts-writing text-white"
onClick={() => setSelectedModule("speaking")} : "bg-mti-gray-smoke text-ielts-writing",
className={clsx( )}
"flex gap-2 items-center rounded-xl p-4 cursor-pointer hover:shadow-lg transition duration-300 ease-in-out hover:bg-ielts-speaking hover:text-white", >
selectedModule === "speaking" ? "bg-ielts-speaking text-white" : "bg-mti-gray-smoke text-ielts-speaking", <BsPen className="h-6 w-6" />
)}> <span className="font-semibold">Writing</span>
<BsMegaphone className="w-6 h-6" /> </div>
<span className="font-semibold">Speaking</span> )}
</div> {modules.includes("speaking") && (
)} <div
{modules.includes("level") && ( onClick={() => setSelectedModule("speaking")}
<div className={clsx(
onClick={() => setSelectedModule("level")} "hover:bg-ielts-speaking flex cursor-pointer items-center gap-2 rounded-xl p-4 transition duration-300 ease-in-out hover:text-white hover:shadow-lg",
className={clsx( selectedModule === "speaking"
"flex gap-2 items-center rounded-xl p-4 cursor-pointer hover:shadow-lg transition duration-300 ease-in-out hover:bg-ielts-level hover:text-white", ? "bg-ielts-speaking text-white"
selectedModule === "level" ? "bg-ielts-level text-white" : "bg-mti-gray-smoke text-ielts-level", : "bg-mti-gray-smoke text-ielts-speaking",
)}> )}
<BsClipboard className="w-6 h-6" /> >
<span className="font-semibold">Level</span> <BsMegaphone className="h-6 w-6" />
</div> <span className="font-semibold">Speaking</span>
)} </div>
</div> )}
{isLoading && ( {modules.includes("level") && (
<div className="w-fit h-fit absolute top-1/2 -translate-y-1/2 left-1/2 -translate-x-1/2 animate-pulse flex flex-col gap-12 items-center"> <div
<span className={clsx("loading loading-infinity w-32", moduleColors[selectedModule].progress)} /> onClick={() => setSelectedModule("level")}
<span className={clsx("font-bold text-2xl text-center", moduleColors[selectedModule].progress)}> className={clsx(
Evaluating your answers, please be patient... "hover:bg-ielts-level flex cursor-pointer items-center gap-2 rounded-xl p-4 transition duration-300 ease-in-out hover:text-white hover:shadow-lg",
<br /> selectedModule === "level"
You can also check it later on your records page! ? "bg-ielts-level text-white"
</span> : "bg-mti-gray-smoke text-ielts-level",
</div> )}
)} >
{!isLoading && ( <BsClipboard className="h-6 w-6" />
<div className="w-full flex gap-9 mt-32 items-center justify-between mb-20"> <span className="font-semibold">Level</span>
<span className="max-w-3xl">{moduleResultText(selectedModule, bandScore)}</span> </div>
<div className="flex gap-9 px-16"> )}
<div </div>
className={clsx("radial-progress overflow-hidden", moduleColors[selectedModule].progress)} {isLoading && (
style={ <div className="absolute left-1/2 top-1/2 flex h-fit w-fit -translate-x-1/2 -translate-y-1/2 animate-pulse flex-col items-center gap-12">
{"--value": (selectedScore.correct / selectedScore.total) * 100, "--thickness": "12px", "--size": "13rem"} as any <span
}> className={clsx(
<div "loading loading-infinity w-32",
className={clsx( moduleColors[selectedModule].progress,
"w-48 h-48 rounded-full flex flex-col items-center justify-center", )}
moduleColors[selectedModule].inner, />
)}> <span
<span className="text-xl">Level</span> className={clsx(
{showLevel(bandScore)} "text-center text-2xl font-bold",
</div> moduleColors[selectedModule].progress,
</div> )}
<div className="flex flex-col gap-5"> >
<div className="flex gap-2"> Evaluating your answers, please be patient...
<div className="w-3 h-3 bg-mti-red-light rounded-full mt-1" /> <br />
<div className="flex flex-col"> You can also check it later on your records page!
<span className="text-mti-red-light"> </span>
{(((selectedScore.total - selectedScore.missing) / selectedScore.total) * 100).toFixed(0)}% </div>
</span> )}
<span className="text-lg">Completion</span> {!isLoading && (
</div> <div className="mb-20 mt-32 flex w-full items-center justify-between gap-9">
</div> <span className="max-w-3xl">
<div className="flex gap-2"> {moduleResultText(selectedModule, bandScore)}
<div className="w-3 h-3 bg-mti-purple-light rounded-full mt-1" /> </span>
<div className="flex flex-col"> <div className="flex gap-9 px-16">
<span className="text-mti-purple-light">{selectedScore.correct.toString().padStart(2, "0")}</span> <div
<span className="text-lg">Correct</span> className={clsx(
</div> "radial-progress overflow-hidden",
</div> moduleColors[selectedModule].progress,
<div className="flex gap-2"> )}
<div className="w-3 h-3 bg-mti-rose-light rounded-full mt-1" /> style={
<div className="flex flex-col"> {
<span className="text-mti-rose-light"> "--value":
{(selectedScore.total - selectedScore.correct).toString().padStart(2, "0")} (selectedScore.correct / selectedScore.total) * 100,
</span> "--thickness": "12px",
<span className="text-lg">Wrong</span> "--size": "13rem",
</div> } as any
</div> }
</div> >
</div> <div
</div> className={clsx(
)} "flex h-48 w-48 flex-col items-center justify-center rounded-full",
</div> moduleColors[selectedModule].inner,
)}
>
<span className="text-xl">Level</span>
{showLevel(bandScore)}
</div>
</div>
<div className="flex flex-col gap-5">
<div className="flex gap-2">
<div className="bg-mti-red-light mt-1 h-3 w-3 rounded-full" />
<div className="flex flex-col">
<span className="text-mti-red-light">
{(
((selectedScore.total - selectedScore.missing) /
selectedScore.total) *
100
).toFixed(0)}
%
</span>
<span className="text-lg">Completion</span>
</div>
</div>
<div className="flex gap-2">
<div className="bg-mti-purple-light mt-1 h-3 w-3 rounded-full" />
<div className="flex flex-col">
<span className="text-mti-purple-light">
{selectedScore.correct.toString().padStart(2, "0")}
</span>
<span className="text-lg">Correct</span>
</div>
</div>
<div className="flex gap-2">
<div className="bg-mti-rose-light mt-1 h-3 w-3 rounded-full" />
<div className="flex flex-col">
<span className="text-mti-rose-light">
{(selectedScore.total - selectedScore.correct)
.toString()
.padStart(2, "0")}
</span>
<span className="text-lg">Wrong</span>
</div>
</div>
</div>
</div>
</div>
)}
</div>
{!isLoading && ( {!isLoading && (
<div className="self-end flex justify-between w-full gap-8 absolute bottom-8 left-0 px-8"> <div className="absolute bottom-8 left-0 flex w-full justify-between gap-8 self-end px-8">
<div className="flex gap-8"> <div className="flex gap-8">
<div className="w-fit flex flex-col items-center gap-1 cursor-pointer"> <div className="flex w-fit cursor-pointer flex-col items-center gap-1">
<button <button
onClick={() => window.location.reload()} onClick={() => window.location.reload()}
className="w-11 h-11 rounded-full bg-mti-purple-light hover:bg-mti-purple flex items-center justify-center transition duration-300 ease-in-out"> className="bg-mti-purple-light hover:bg-mti-purple flex h-11 w-11 items-center justify-center rounded-full transition duration-300 ease-in-out"
<BsArrowCounterclockwise className="text-white w-7 h-7" /> >
</button> <BsArrowCounterclockwise className="h-7 w-7 text-white" />
<span>Play Again</span> </button>
</div> <span>Play Again</span>
<div className="w-fit flex flex-col items-center gap-1 cursor-pointer"> </div>
<button <div className="flex w-fit cursor-pointer flex-col items-center gap-1">
onClick={onViewResults} <button
className="w-11 h-11 rounded-full bg-mti-purple-light hover:bg-mti-purple flex items-center justify-center transition duration-300 ease-in-out"> onClick={onViewResults}
<BsEyeFill className="text-white w-7 h-7" /> className="bg-mti-purple-light hover:bg-mti-purple flex h-11 w-11 items-center justify-center rounded-full transition duration-300 ease-in-out"
</button> >
<span>Review Answers</span> <BsEyeFill className="h-7 w-7 text-white" />
</div> </button>
</div> <span>Review Answers</span>
</div>
</div>
<Link href="/" className="max-w-[200px] w-full self-end"> <Link href="/" className="w-full max-w-[200px] self-end">
<Button color="purple" className="max-w-[200px] self-end w-full"> <Button color="purple" className="w-full max-w-[200px] self-end">
Dashboard Dashboard
</Button> </Button>
</Link> </Link>
</div> </div>
)} )}
</> </>
); );
} }

View File

@@ -1,332 +1,441 @@
/* eslint-disable @next/next/no-img-element */ /* eslint-disable @next/next/no-img-element */
import Head from "next/head"; import { Module } from "@/interfaces";
import {useEffect, useState} from "react"; import { useEffect, useState } from "react";
import {Module} from "@/interfaces";
import Selection from "@/exams/Selection";
import Reading from "@/exams/Reading";
import {Exam, InteractiveSpeakingExercise, SpeakingExercise, UserSolution, Variant, WritingExercise} from "@/interfaces/exam";
import Listening from "@/exams/Listening";
import Writing from "@/exams/Writing";
import {ToastContainer, toast} from "react-toastify";
import Finish from "@/exams/Finish";
import axios from "axios";
import {Stat} from "@/interfaces/user";
import Speaking from "@/exams/Speaking";
import {v4 as uuidv4} from "uuid";
import useUser from "@/hooks/useUser";
import useExamStore from "@/stores/examStore";
import Layout from "@/components/High/Layout";
import AbandonPopup from "@/components/AbandonPopup"; import AbandonPopup from "@/components/AbandonPopup";
import {evaluateSpeakingAnswer, evaluateWritingAnswer} from "@/utils/evaluation"; import Layout from "@/components/High/Layout";
import {useRouter} from "next/router"; import Finish from "@/exams/Finish";
import {getExam} from "@/utils/exams";
import {capitalize} from "lodash";
import Level from "@/exams/Level"; import Level from "@/exams/Level";
import Listening from "@/exams/Listening";
import Reading from "@/exams/Reading";
import Selection from "@/exams/Selection";
import Speaking from "@/exams/Speaking";
import Writing from "@/exams/Writing";
import useUser from "@/hooks/useUser";
import { Exam, UserSolution, Variant } from "@/interfaces/exam";
import { Stat } from "@/interfaces/user";
import useExamStore from "@/stores/examStore";
import {
evaluateSpeakingAnswer,
evaluateWritingAnswer,
} from "@/utils/evaluation";
import { getExam } from "@/utils/exams";
import axios from "axios";
import { useRouter } from "next/router";
import { toast, ToastContainer } from "react-toastify";
import { v4 as uuidv4 } from "uuid";
interface Props { interface Props {
page: "exams" | "exercises"; page: "exams" | "exercises";
} }
export default function ExamPage({page}: Props) { export default function ExamPage({ page }: Props) {
const [hasBeenUploaded, setHasBeenUploaded] = useState(false); const [hasBeenUploaded, setHasBeenUploaded] = useState(false);
const [moduleIndex, setModuleIndex] = useState(0); const [moduleIndex, setModuleIndex] = useState(0);
const [sessionId, setSessionId] = useState(""); const [sessionId, setSessionId] = useState("");
const [exam, setExam] = useState<Exam>(); const [exam, setExam] = useState<Exam>();
const [isEvaluationLoading, setIsEvaluationLoading] = useState(false); const [isEvaluationLoading, setIsEvaluationLoading] = useState(false);
const [showAbandonPopup, setShowAbandonPopup] = useState(false); const [showAbandonPopup, setShowAbandonPopup] = useState(false);
const [avoidRepeated, setAvoidRepeated] = useState(false); const [avoidRepeated, setAvoidRepeated] = useState(false);
const [timeSpent, setTimeSpent] = useState(0); const [timeSpent, setTimeSpent] = useState(0);
const [statsAwaitingEvaluation, setStatsAwaitingEvaluation] = useState<string[]>([]); const [statsAwaitingEvaluation, setStatsAwaitingEvaluation] = useState<
const [variant, setVariant] = useState<Variant>("full"); string[]
>([]);
const [variant, setVariant] = useState<Variant>("full");
const [exams, setExams] = useExamStore((state) => [state.exams, state.setExams]); const [exams, setExams] = useExamStore((state) => [
const [userSolutions, setUserSolutions] = useExamStore((state) => [state.userSolutions, state.setUserSolutions]); state.exams,
const [showSolutions, setShowSolutions] = useExamStore((state) => [state.showSolutions, state.setShowSolutions]); state.setExams,
const [selectedModules, setSelectedModules] = useExamStore((state) => [state.selectedModules, state.setSelectedModules]); ]);
const assignment = useExamStore((state) => state.assignment); const [userSolutions, setUserSolutions] = useExamStore((state) => [
state.userSolutions,
state.setUserSolutions,
]);
const [showSolutions, setShowSolutions] = useExamStore((state) => [
state.showSolutions,
state.setShowSolutions,
]);
const [selectedModules, setSelectedModules] = useExamStore((state) => [
state.selectedModules,
state.setSelectedModules,
]);
const assignment = useExamStore((state) => state.assignment);
const {user} = useUser({redirectTo: "/login"}); const { user } = useUser({ redirectTo: "/login" });
const router = useRouter(); const router = useRouter();
useEffect(() => setSessionId(uuidv4()), []); useEffect(() => setSessionId(uuidv4()), []);
useEffect(() => { useEffect(() => {
if (user?.type === "developer") console.log(exam); if (user?.type === "developer") console.log(exam);
}, [exam, user]); }, [exam, user]);
useEffect(() => { useEffect(() => {
selectedModules.length > 0 && timeSpent === 0 && !showSolutions; selectedModules.length > 0 && timeSpent === 0 && !showSolutions;
if (selectedModules.length > 0 && timeSpent === 0 && !showSolutions) { if (selectedModules.length > 0 && timeSpent === 0 && !showSolutions) {
const timerInterval = setInterval(() => { const timerInterval = setInterval(() => {
setTimeSpent((prev) => prev + 1); setTimeSpent((prev) => prev + 1);
}, 1000); }, 1000);
return () => { return () => {
clearInterval(timerInterval); clearInterval(timerInterval);
}; };
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedModules.length]); }, [selectedModules.length]);
useEffect(() => { useEffect(() => {
if (showSolutions) setModuleIndex(-1); if (showSolutions) setModuleIndex(-1);
}, [showSolutions]); }, [showSolutions]);
useEffect(() => { useEffect(() => {
(async () => { (async () => {
if (selectedModules.length > 0 && exams.length > 0 && moduleIndex < selectedModules.length) { if (
const nextExam = exams[moduleIndex]; selectedModules.length > 0 &&
setExam(nextExam ? updateExamWithUserSolutions(nextExam) : undefined); exams.length > 0 &&
} moduleIndex < selectedModules.length
})(); ) {
// eslint-disable-next-line react-hooks/exhaustive-deps const nextExam = exams[moduleIndex];
}, [selectedModules, moduleIndex, exams]); setExam(nextExam ? updateExamWithUserSolutions(nextExam) : undefined);
}
})();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedModules, moduleIndex, exams]);
useEffect(() => { useEffect(() => {
(async () => { (async () => {
if (selectedModules.length > 0 && exams.length === 0) { if (selectedModules.length > 0 && exams.length === 0) {
const examPromises = selectedModules.map((module) => getExam(module, avoidRepeated, variant)); const examPromises = selectedModules.map((module) =>
Promise.all(examPromises).then((values) => { getExam(module, avoidRepeated, variant),
if (values.every((x) => !!x)) { );
setExams(values.map((x) => x!)); Promise.all(examPromises).then((values) => {
} else { if (values.every((x) => !!x)) {
toast.error("Something went wrong, please try again"); setExams(values.map((x) => x!));
setTimeout(router.reload, 500); } else {
} toast.error("Something went wrong, please try again");
}); setTimeout(router.reload, 500);
} }
})(); });
// eslint-disable-next-line react-hooks/exhaustive-deps }
}, [selectedModules, setExams, exams]); })();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedModules, setExams, exams]);
useEffect(() => { useEffect(() => {
if (selectedModules.length > 0 && exams.length !== 0 && moduleIndex >= selectedModules.length && !hasBeenUploaded && !showSolutions) { if (
const newStats: Stat[] = userSolutions.map((solution) => ({ selectedModules.length > 0 &&
...solution, exams.length !== 0 &&
id: solution.id || uuidv4(), moduleIndex >= selectedModules.length &&
timeSpent, !hasBeenUploaded &&
session: sessionId, !showSolutions
exam: solution.exam!, ) {
module: solution.module!, const newStats: Stat[] = userSolutions.map((solution) => ({
user: user?.id || "", ...solution,
date: new Date().getTime(), id: solution.id || uuidv4(),
...(assignment ? {assignment: assignment.id} : {}), timeSpent,
})); session: sessionId,
exam: solution.exam!,
module: solution.module!,
user: user?.id || "",
date: new Date().getTime(),
...(assignment ? { assignment: assignment.id } : {}),
}));
axios axios
.post<{ok: boolean}>("/api/stats", newStats) .post<{ ok: boolean }>("/api/stats", newStats)
.then((response) => setHasBeenUploaded(response.data.ok)) .then((response) => setHasBeenUploaded(response.data.ok))
.catch(() => setHasBeenUploaded(false)); .catch(() => setHasBeenUploaded(false));
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [selectedModules, moduleIndex, hasBeenUploaded]); }, [selectedModules, moduleIndex, hasBeenUploaded]);
useEffect(() => { useEffect(() => {
if (statsAwaitingEvaluation.length === 0) return setIsEvaluationLoading(false); setIsEvaluationLoading(statsAwaitingEvaluation.length !== 0);
return setIsEvaluationLoading(true); }, [statsAwaitingEvaluation]);
}, [statsAwaitingEvaluation]);
useEffect(() => { useEffect(() => {
if (statsAwaitingEvaluation.length > 0) { if (statsAwaitingEvaluation.length > 0) {
statsAwaitingEvaluation.forEach(checkIfStatHasBeenEvaluated); checkIfStatsHaveBeenEvaluated(statsAwaitingEvaluation);
} }
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, [statsAwaitingEvaluation]); }, [statsAwaitingEvaluation]);
const checkIfStatHasBeenEvaluated = (id: string) => { const checkIfStatsHaveBeenEvaluated = (ids: string[]) => {
setTimeout(async () => { setTimeout(async () => {
const statRequest = await axios.get<Stat>(`/api/stats/${id}`); const awaitedStats = await Promise.all(
const stat = statRequest.data; ids.map(async (id) => (await axios.get<Stat>(`/api/stats/${id}`)).data),
if (stat.solutions.every((x) => x.evaluation !== null)) { );
const userSolution: UserSolution = { const solutionsEvaluated = awaitedStats.every((stat) =>
id, stat.solutions.every((x) => x.evaluation !== null),
exercise: stat.exercise, );
score: stat.score, if (solutionsEvaluated) {
solutions: stat.solutions, const statsUserSolutions: UserSolution[] = awaitedStats.map((stat) => ({
type: stat.type, id: stat.id,
exam: stat.exam, exercise: stat.exercise,
module: stat.module, score: stat.score,
}; solutions: stat.solutions,
type: stat.type,
exam: stat.exam,
module: stat.module,
}));
setUserSolutions(userSolutions.map((x) => (x.exercise === userSolution.exercise ? userSolution : x))); const updatedUserSolutions = userSolutions.map((x) => {
return setStatsAwaitingEvaluation((prev) => prev.filter((x) => x !== id)); const respectiveSolution = statsUserSolutions.find(
} (y) => y.exercise === x.exercise,
);
return respectiveSolution ? respectiveSolution : x;
});
return checkIfStatHasBeenEvaluated(id); setUserSolutions(updatedUserSolutions);
}, 5 * 1000); return setStatsAwaitingEvaluation((prev) =>
}; prev.filter((x) => !ids.includes(x)),
);
}
const updateExamWithUserSolutions = (exam: Exam): Exam => { return checkIfStatsHaveBeenEvaluated(ids);
if (exam.module === "reading" || exam.module === "listening") { }, 5 * 1000);
const parts = exam.parts.map((p) => };
Object.assign(p, {
exercises: p.exercises.map((x) => Object.assign(x, {userSolutions: userSolutions.find((y) => x.id === y.exercise)?.solutions})),
}),
);
return Object.assign(exam, {parts});
}
const exercises = exam.exercises.map((x) => Object.assign(x, {userSolutions: userSolutions.find((y) => x.id === y.exercise)?.solutions})); const updateExamWithUserSolutions = (exam: Exam): Exam => {
return Object.assign(exam, {exercises}); if (exam.module === "reading" || exam.module === "listening") {
}; const parts = exam.parts.map((p) =>
Object.assign(p, {
exercises: p.exercises.map((x) =>
Object.assign(x, {
userSolutions: userSolutions.find((y) => x.id === y.exercise)
?.solutions,
}),
),
}),
);
return Object.assign(exam, { parts });
}
const onFinish = (solutions: UserSolution[]) => { const exercises = exam.exercises.map((x) =>
const solutionIds = solutions.map((x) => x.exercise); Object.assign(x, {
const solutionExams = solutions.map((x) => x.exam); userSolutions: userSolutions.find((y) => x.id === y.exercise)
?.solutions,
}),
);
return Object.assign(exam, { exercises });
};
if (exam && !solutionExams.includes(exam.id)) return; const onFinish = (solutions: UserSolution[]) => {
const solutionIds = solutions.map((x) => x.exercise);
const solutionExams = solutions.map((x) => x.exam);
if (exam && (exam.module === "writing" || exam.module === "speaking") && solutions.length > 0 && !showSolutions) { if (exam && !solutionExams.includes(exam.id)) return;
setHasBeenUploaded(true);
setIsEvaluationLoading(true);
Promise.all( if (
exam.exercises.map(async (exercise) => { exam &&
const evaluationID = uuidv4(); (exam.module === "writing" || exam.module === "speaking") &&
if (exercise.type === "writing") solutions.length > 0 &&
return await evaluateWritingAnswer(exercise, solutions.find((x) => x.exercise === exercise.id)!, evaluationID); !showSolutions
) {
setHasBeenUploaded(true);
setIsEvaluationLoading(true);
if (exercise.type === "interactiveSpeaking" || exercise.type === "speaking") Promise.all(
return await evaluateSpeakingAnswer(exercise, solutions.find((x) => x.exercise === exercise.id)!, evaluationID); exam.exercises.map(async (exercise) => {
}), const evaluationID = uuidv4();
) if (exercise.type === "writing")
.then((responses) => { return await evaluateWritingAnswer(
setStatsAwaitingEvaluation((prev) => [...prev, ...responses.filter((x) => !!x).map((r) => (r as any).id)]); exercise,
setUserSolutions([...userSolutions, ...responses.filter((x) => !!x)] as any); solutions.find((x) => x.exercise === exercise.id)!,
}) evaluationID,
.finally(() => { );
setHasBeenUploaded(false);
});
}
axios.get("/api/stats/update"); if (
exercise.type === "interactiveSpeaking" ||
exercise.type === "speaking"
)
return await evaluateSpeakingAnswer(
exercise,
solutions.find((x) => x.exercise === exercise.id)!,
evaluationID,
);
}),
)
.then((responses) => {
setStatsAwaitingEvaluation((prev) => [
...prev,
...responses.filter((x) => !!x).map((r) => (r as any).id),
]);
setUserSolutions([
...userSolutions,
...responses.filter((x) => !!x),
] as any);
})
.finally(() => {
setHasBeenUploaded(false);
});
}
setUserSolutions([...userSolutions.filter((x) => !solutionIds.includes(x.exercise)), ...solutions]); axios.get("/api/stats/update");
setModuleIndex((prev) => prev + 1);
};
const aggregateScoresByModule = (answers: UserSolution[]): {module: Module; total: number; missing: number; correct: number}[] => { setUserSolutions([
const scores: {[key in Module]: {total: number; missing: number; correct: number}} = { ...userSolutions.filter((x) => !solutionIds.includes(x.exercise)),
reading: { ...solutions,
total: 0, ]);
correct: 0, setModuleIndex((prev) => prev + 1);
missing: 0, };
},
listening: {
total: 0,
correct: 0,
missing: 0,
},
writing: {
total: 0,
correct: 0,
missing: 0,
},
speaking: {
total: 0,
correct: 0,
missing: 0,
},
level: {
total: 0,
correct: 0,
missing: 0,
},
};
answers.forEach((x) => { const aggregateScoresByModule = (
scores[x.module!] = { answers: UserSolution[],
total: scores[x.module!].total + x.score.total, ): { module: Module; total: number; missing: number; correct: number }[] => {
correct: scores[x.module!].correct + x.score.correct, const scores: {
missing: scores[x.module!].missing + x.score.missing, [key in Module]: { total: number; missing: number; correct: number };
}; } = {
}); reading: {
total: 0,
correct: 0,
missing: 0,
},
listening: {
total: 0,
correct: 0,
missing: 0,
},
writing: {
total: 0,
correct: 0,
missing: 0,
},
speaking: {
total: 0,
correct: 0,
missing: 0,
},
level: {
total: 0,
correct: 0,
missing: 0,
},
};
return Object.keys(scores) answers.forEach((x) => {
.filter((x) => scores[x as Module].total > 0) scores[x.module!] = {
.map((x) => ({module: x as Module, ...scores[x as Module]})); total: scores[x.module!].total + x.score.total,
}; correct: scores[x.module!].correct + x.score.correct,
missing: scores[x.module!].missing + x.score.missing,
};
});
const renderScreen = () => { return Object.keys(scores)
if (selectedModules.length === 0) { .filter((x) => scores[x as Module].total > 0)
return ( .map((x) => ({ module: x as Module, ...scores[x as Module] }));
<Selection };
page={page}
user={user!}
disableSelection={page === "exams"}
onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
setModuleIndex(0);
setAvoidRepeated(avoid);
setSelectedModules(modules);
setVariant(variant);
}}
/>
);
}
if (moduleIndex >= selectedModules.length || moduleIndex === -1) { const renderScreen = () => {
return ( if (selectedModules.length === 0) {
<Finish return (
isLoading={isEvaluationLoading} <Selection
user={user!} page={page}
modules={selectedModules} user={user!}
onViewResults={() => { disableSelection={page === "exams"}
setShowSolutions(true); onStart={(modules: Module[], avoid: boolean, variant: Variant) => {
setModuleIndex(0); setModuleIndex(0);
setExam(exams[0]); setAvoidRepeated(avoid);
}} setSelectedModules(modules);
scores={aggregateScoresByModule(userSolutions)} setVariant(variant);
/> }}
); />
} );
}
if (exam && exam.module === "reading") { if (moduleIndex >= selectedModules.length || moduleIndex === -1) {
return <Reading exam={exam} onFinish={onFinish} showSolutions={showSolutions} />; return (
} <Finish
isLoading={isEvaluationLoading}
user={user!}
modules={selectedModules}
onViewResults={() => {
setShowSolutions(true);
setModuleIndex(0);
setExam(exams[0]);
}}
scores={aggregateScoresByModule(userSolutions)}
/>
);
}
if (exam && exam.module === "listening") { if (exam && exam.module === "reading") {
return <Listening exam={exam} onFinish={onFinish} showSolutions={showSolutions} />; return (
} <Reading
exam={exam}
onFinish={onFinish}
showSolutions={showSolutions}
/>
);
}
if (exam && exam.module === "writing") { if (exam && exam.module === "listening") {
return <Writing exam={exam} onFinish={onFinish} showSolutions={showSolutions} />; return (
} <Listening
exam={exam}
onFinish={onFinish}
showSolutions={showSolutions}
/>
);
}
if (exam && exam.module === "speaking") { if (exam && exam.module === "writing") {
return <Speaking exam={exam} onFinish={onFinish} showSolutions={showSolutions} />; return (
} <Writing
exam={exam}
onFinish={onFinish}
showSolutions={showSolutions}
/>
);
}
if (exam && exam.module === "level") { if (exam && exam.module === "speaking") {
return <Level exam={exam} onFinish={onFinish} showSolutions={showSolutions} />; return (
} <Speaking
exam={exam}
onFinish={onFinish}
showSolutions={showSolutions}
/>
);
}
return <>Loading...</>; if (exam && exam.module === "level") {
}; return (
<Level exam={exam} onFinish={onFinish} showSolutions={showSolutions} />
);
}
return ( return <>Loading...</>;
<> };
<ToastContainer />
{user && ( return (
<Layout <>
user={user} <ToastContainer />
className="justify-between" {user && (
focusMode={selectedModules.length !== 0 && !showSolutions && moduleIndex < selectedModules.length} <Layout
onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}> user={user}
<> className="justify-between"
{renderScreen()} focusMode={
{!showSolutions && moduleIndex < selectedModules.length && ( selectedModules.length !== 0 &&
<AbandonPopup !showSolutions &&
isOpen={showAbandonPopup} moduleIndex < selectedModules.length
abandonPopupTitle="Leave Exercise" }
abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress." onFocusLayerMouseEnter={() => setShowAbandonPopup(true)}
abandonConfirmButtonText="Confirm" >
onAbandon={() => router.reload()} <>
onCancel={() => setShowAbandonPopup(false)} {renderScreen()}
/> {!showSolutions && moduleIndex < selectedModules.length && (
)} <AbandonPopup
</> isOpen={showAbandonPopup}
</Layout> abandonPopupTitle="Leave Exercise"
)} abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
</> abandonConfirmButtonText="Confirm"
); onAbandon={() => router.reload()}
onCancel={() => setShowAbandonPopup(false)}
/>
)}
</>
</Layout>
)}
</>
);
} }