From f0f38b335f52bfa36b9cf2788ee462d4230598f1 Mon Sep 17 00:00:00 2001 From: Carlos Mesquita Date: Fri, 23 Aug 2024 21:17:32 +0100 Subject: [PATCH] Part and MC question grid jump to, has a bug on next going to refactor the whole thing --- src/components/Exercises/FillBlanks/index.tsx | 22 +- src/components/Exercises/MultipleChoice.tsx | 8 +- src/components/Low/Button.tsx | 5 +- src/components/Medium/ModuleTitle.tsx | 133 +++++++++++- src/components/Medium/Timer.tsx | 2 +- src/components/QuestionsModal.tsx | 50 ++++- src/components/Solutions/FillBlanks.tsx | 24 ++- src/exams/Level/index.tsx | 203 ++++++++++++------ src/stores/examStore.ts | 6 +- 9 files changed, 339 insertions(+), 114 deletions(-) diff --git a/src/components/Exercises/FillBlanks/index.tsx b/src/components/Exercises/FillBlanks/index.tsx index 9fec8f82..27717d8b 100644 --- a/src/components/Exercises/FillBlanks/index.tsx +++ b/src/components/Exercises/FillBlanks/index.tsx @@ -23,6 +23,7 @@ const FillBlanks: React.FC = ({ const { shuffles, exam, partIndex, questionIndex, exerciseIndex } = useExamStore((state) => state); const [answers, setAnswers] = useState<{ id: string; solution: string }[]>(userSolutions); const hasExamEnded = useExamStore((state) => state.hasExamEnded); + const setCurrentSolution = useExamStore((state) => state.setCurrentSolution); const shuffleMaps = shuffles.find((x) => x.exerciseID == id)?.shuffles; const [currentMCSelection, setCurrentMCSelection] = useState<{ id: string, selection: FillBlanksMCOption }>(); @@ -122,20 +123,9 @@ const FillBlanks: React.FC = ({ ); }; - const onSelection = (id: string, value: string) => { - setAnswers((prev) => [...prev.filter((x) => x.id !== id), { id: id, solution: value }]); - } - - const getShuffles = () => { - let shuffle = {}; - if (shuffleMaps) { - shuffle = { - shuffleMaps: shuffleMaps.filter((map) => - answers.some(answer => answer.id === map.questionID) - ) - } - } - return shuffle; + const onSelection = (questionID: string, value: string) => { + setAnswers((prev) => [...prev.filter((x) => x.id !== questionID), { id: questionID, solution: value }]); + setCurrentSolution({ exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps }); } return ( @@ -221,7 +211,7 @@ const FillBlanks: React.FC = ({ diff --git a/src/components/Exercises/MultipleChoice.tsx b/src/components/Exercises/MultipleChoice.tsx index e4e95d76..1a5d294f 100644 --- a/src/components/Exercises/MultipleChoice.tsx +++ b/src/components/Exercises/MultipleChoice.tsx @@ -81,7 +81,8 @@ export default function MultipleChoice({ id, prompt, type, questions, userSoluti hasExamEnded, userSolutions: storeUserSolutions, setQuestionIndex, - setUserSolutions + setUserSolutions, + setCurrentSolution } = useExamStore((state) => state); const shuffleMaps = shuffles.find((x) => x.exerciseID == id)?.shuffles; @@ -106,6 +107,11 @@ export default function MultipleChoice({ id, prompt, type, questions, userSoluti setAnswers((prev) => [...prev.filter((x) => x.question !== question.id), { option, question: question.id }]); }; + useEffect(()=> { + setCurrentSolution({ exercise: id, solutions: answers, score: calculateScore(), type, shuffleMaps: shuffleMaps }); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [answers]) + const getShuffledSolution = (originalSolution: string, questionShuffleMap: ShuffleMap) => { for (const [newPosition, originalPosition] of Object.entries(questionShuffleMap.map)) { if (originalPosition === originalSolution) { diff --git a/src/components/Low/Button.tsx b/src/components/Low/Button.tsx index 99de3d4b..8f5b8f15 100644 --- a/src/components/Low/Button.tsx +++ b/src/components/Low/Button.tsx @@ -9,6 +9,7 @@ interface Props { className?: string; disabled?: boolean; isLoading?: boolean; + padding?: string; onClick?: () => void; type?: "button" | "reset" | "submit"; } @@ -21,6 +22,7 @@ export default function Button({ className, children, type, + padding = "py-4 px-6", onClick, }: Props) { const colorClassNames: {[key in typeof color]: {[key in typeof variant]: string}} = { @@ -61,7 +63,8 @@ export default function Button({ type={type} onClick={onClick} className={clsx( - "py-4 px-6 rounded-full transition ease-in-out duration-300 disabled:cursor-not-allowed cursor-pointer", + "rounded-full transition ease-in-out duration-300 disabled:cursor-not-allowed cursor-pointer", + padding, colorClassNames[color][variant], className, )} diff --git a/src/components/Medium/ModuleTitle.tsx b/src/components/Medium/ModuleTitle.tsx index c529a227..04dc84e9 100644 --- a/src/components/Medium/ModuleTitle.tsx +++ b/src/components/Medium/ModuleTitle.tsx @@ -1,13 +1,17 @@ -import {Module} from "@/interfaces"; -import useExamStore from "@/stores/examStore"; -import {moduleLabels} from "@/utils/moduleUtils"; +import { Module } from "@/interfaces"; +import { moduleLabels } from "@/utils/moduleUtils"; import clsx from "clsx"; -import {motion} from "framer-motion"; -import {ReactNode, useEffect, useState} from "react"; -import {BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsStopwatch} from "react-icons/bs"; +import { Fragment, ReactNode, useCallback, useState } from "react"; +import { BsBook, BsClipboard, BsHeadphones, BsMegaphone, BsPen, BsStopwatch } from "react-icons/bs"; import ProgressBar from "../Low/ProgressBar"; -import TimerEndedModal from "../TimerEndedModal"; import Timer from "./Timer"; +import { Exam, LevelExam, MultipleChoiceExercise, ShuffleMap, UserSolution } from "@/interfaces/exam"; +import { BsFillGrid3X3GapFill } from "react-icons/bs"; +import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'; +import Button from "../Low/Button"; +import { Dialog, Transition } from "@headlessui/react"; +import useExamStore from "@/stores/examStore"; +import Modal from "../Modal"; interface Props { minTimer: number; @@ -18,13 +22,32 @@ interface Props { disableTimer?: boolean; partLabel?: string; showTimer?: boolean; + showSolutions?: boolean; + runOnClick?: ((questionIndex: number) => void) | undefined; } -export default function ModuleTitle({ - minTimer, module, label, exerciseIndex, totalExercises, disableTimer = false, partLabel, showTimer = true +export default function ModuleTitle({ + minTimer, + module, + label, + exerciseIndex, + totalExercises, + disableTimer = false, + partLabel, + showTimer = true, + showSolutions = false, + runOnClick = undefined }: Props) { + const { + userSolutions, + partIndex, + exam + } = useExamStore((state) => state); + const examExerciseIndex = useExamStore((state) => state.exerciseIndex) - const moduleIcon: {[key in Module]: ReactNode} = { + const [isOpen, setIsOpen] = useState(false); + + const moduleIcon: { [key in Module]: ReactNode } = { reading: , listening: , writing: , @@ -32,6 +55,78 @@ export default function ModuleTitle({ level: , }; + const isMultipleChoiceLevelExercise = () => { + if (exam?.module === 'level' && typeof partIndex === "number" && partIndex > -1) { + const currentExercise = (exam as LevelExam).parts[partIndex].exercises[examExerciseIndex]; + return currentExercise && currentExercise.type === 'multipleChoice'; + } + return false; + }; + + const renderMCQuestionGrid = () => { + if (!isMultipleChoiceLevelExercise() && !userSolutions) return null; + + const currentExercise = (exam as LevelExam).parts[partIndex!].exercises[examExerciseIndex] as MultipleChoiceExercise; + const userSolution = userSolutions!.find((x) => x.exercise == currentExercise.id)!; + const answeredQuestions = new Set(userSolution.solutions.map(sol => sol.question)); + const exerciseOffset = currentExercise.questions[0].id; + const lastExercise = exerciseOffset + (currentExercise.questions.length - 1); + + const getQuestionColor = (questionId: string, solution: string, userQuestionSolution: string | undefined) => { + const questionShuffleMap = userSolutions.reduce((foundMap, userSolution) => { + if (foundMap) return foundMap; + return userSolution.shuffleMaps?.find(map => map.questionID.toString() === questionId.toString()) || null; + }, null as ShuffleMap | null); + const newSolution = questionShuffleMap ? questionShuffleMap?.map[solution] : solution; + + if (!userSolutions) return ""; + + if (!userQuestionSolution) { + return "!bg-mti-gray-davy !border--mti-gray-davy !text-mti-gray-davy !text-white hover:!bg-gray-700"; + } + + return userQuestionSolution === newSolution ? + "!bg-mti-purple-light !text-mti-purple-light !text-white hover:!bg-mti-purple-dark" : + "!bg-mti-rose-light !border-mti-rose-light !text-mti-rose-light !text-white hover:!bg-mti-rose-dark"; + } + return ( + <> +

{`Part ${partIndex + 1} (Questions ${exerciseOffset} - ${lastExercise})`}

+
+ {currentExercise.questions.map((_, index) => { + const questionNumber = exerciseOffset + index; + const isAnswered = answeredQuestions.has(questionNumber); + const solution = currentExercise.questions.find((x) => x.id == questionNumber)!.solution; + + const userQuestionSolution = currentExercise.userSolutions?.find((x) => x.question == questionNumber)?.option; + return ( + + ); + })} +
+

+ Click a question number to jump to that question +

+ + ); + }; + return ( <> {showTimer && } @@ -67,8 +162,24 @@ export default function ModuleTitle({ + {isMultipleChoiceLevelExercise() && ( + <> + + setIsOpen(false)} + className="w-full max-w-md transform overflow-hidden rounded-2xl bg-white shadow-xl transition-all" + > + <> + {renderMCQuestionGrid()} + + + + )} ); -} +} \ No newline at end of file diff --git a/src/components/Medium/Timer.tsx b/src/components/Medium/Timer.tsx index 86f1b68b..58ce4751 100644 --- a/src/components/Medium/Timer.tsx +++ b/src/components/Medium/Timer.tsx @@ -51,7 +51,7 @@ const Timer: React.FC = ({minTimer, disableTimer, standalone = false}) => void; } -export default function QuestionsModal({ isOpen, onClose, blankQuestions = true, finishingWhat = "module" }: Props) { +export default function QuestionsModal({ isOpen, onClose, type = "module", unanswered = false }: Props) { return ( onClose(false)} className="relative z-50"> @@ -34,11 +34,11 @@ export default function QuestionsModal({ isOpen, onClose, blankQuestions = true, leaveTo="opacity-0 scale-95">
- {blankQuestions ? ( + {type === "module" && ( <> Questions Unanswered - Please note that you are finishing the current {finishingWhat} and once you proceed to the next {finishingWhat}, you will no longer be + Please note that you are finishing the current module and once you proceed to the next module, you will no longer be able to change the answers of the current one, including your unanswered questions.

Are you sure you want to continue without completing those questions? @@ -52,14 +52,16 @@ export default function QuestionsModal({ isOpen, onClose, blankQuestions = true,
- ): ( + )} + {type === "blankQuestions" && ( <> - Confirm Submission + Questions Unanswered - Please note that you are finishing the current {finishingWhat} and once you proceed to the next {finishingWhat}, you will no longer be - able to review the answers of the current one.
+ You have left some questions unanswered in the current part.

- Are you sure you want to continue? + If you wish to continue, you can still access this part later using the navigation bar at the top.
+
+ Do you want to proceed to the next part, or would you like to go back and complete the unanswered questions in the current part?
)} + {type === "submit" && ( + <> + Confirm Submission + + {unanswered ? ( + <> + By clicking "Submit," you are finalizing your exam with some questions left unanswered. Once you submit, you will not be able to review or change any of your answers, including the unanswered ones.
+
+ Are you sure you want to submit and complete the exam with unanswered questions? + + ) : ( + <> + By clicking "Submit," you are finalizing your exam. Once you submit, you will not be able to review or change any of your answers.
+
+ Are you sure you want to submit and complete the exam? + + )} + +
+ + +
+ + )} diff --git a/src/components/Solutions/FillBlanks.tsx b/src/components/Solutions/FillBlanks.tsx index 32e9c15d..92dee6b5 100644 --- a/src/components/Solutions/FillBlanks.tsx +++ b/src/components/Solutions/FillBlanks.tsx @@ -1,4 +1,4 @@ -import { FillBlanksExercise, FillBlanksMCOption } from "@/interfaces/exam"; +import { FillBlanksExercise, FillBlanksMCOption, ShuffleMap } from "@/interfaces/exam"; import clsx from "clsx"; import reactStringReplace from "react-string-replace"; import { CommonProps } from "."; @@ -16,13 +16,13 @@ export default function FillBlanksSolutions({ onNext, onBack, }: FillBlanksExercise & CommonProps) { - - // next and back was all messed up and still don't know why, anyways const storeUserSolutions = useExamStore((state) => state.userSolutions); const correctUserSolutions = storeUserSolutions.find( (solution) => solution.exercise === id )?.solutions; + + const shuffles = useExamStore((state) => state.shuffles); const calculateScore = () => { const total = text.match(/({{\d+}})/g)?.length || 0; @@ -65,16 +65,18 @@ export default function FillBlanksSolutions({ return ( {reactStringReplace(line, /({{\d+}})/g, (match) => { - const id = match.replaceAll(/[\{\}]/g, ""); - const userSolution = correctUserSolutions!.find((x) => x.id.toString() === id.toString()); - const answerSolution = solutions.find(sol => sol.id.toString() === id.toString())!.solution; + const questionId = match.replaceAll(/[\{\}]/g, ""); + const userSolution = correctUserSolutions!.find((x) => x.id.toString() === questionId.toString()); + const answerSolution = solutions.find(sol => sol.id.toString() === questionId.toString())!.solution; + const questionShuffleMap = shuffles.find((x) => x.exerciseID == id)?.shuffles.find((y) => y.questionID == questionId); + const newAnswerSolution = questionShuffleMap ? questionShuffleMap.map[answerSolution].toLowerCase() : answerSolution.toLowerCase(); if (!userSolution) { let answerText; if (typeCheckWordsMC(words)) { - const options = words.find((x) => x.id.toString() === id.toString()); + const options = words.find((x) => x.id.toString() === questionId.toString()); const correctKey = Object.keys(options!.options).find(key => - key.toLowerCase() === answerSolution.toLowerCase() + key.toLowerCase() === newAnswerSolution ); answerText = options!.options[correctKey as keyof typeof options]; } else { @@ -97,7 +99,7 @@ export default function FillBlanksSolutions({ : 'letter' in w ? w.letter.toLowerCase() === userSolution.solution.toLowerCase() : 'options' in w - ? w.id === userSolution.id + ? w.id === userSolution.questionId : false ); @@ -113,10 +115,10 @@ export default function FillBlanksSolutions({ let correct; let solutionText; if (typeCheckWordsMC(words)) { - const options = words.find((x) => x.id.toString() === id.toString()); + const options = words.find((x) => x.id.toString() === questionId.toString()); if (options) { const correctKey = Object.keys(options.options).find(key => - key.toLowerCase() === answerSolution.toLowerCase() + key.toLowerCase() === newAnswerSolution ); correct = userSolution.solution == options.options[correctKey as keyof typeof options.options]; solutionText = options.options[correctKey as keyof typeof options.options] || answerSolution; diff --git a/src/exams/Level/index.tsx b/src/exams/Level/index.tsx index a913b2d9..bba8695f 100644 --- a/src/exams/Level/index.tsx +++ b/src/exams/Level/index.tsx @@ -13,6 +13,7 @@ import TextComponent from "./TextComponent"; import PartDivider from "./PartDivider"; import Timer from "@/components/Medium/Timer"; import shuffleExamExercise from "./Shuffle"; +import { Tab } from "@headlessui/react"; interface Props { exam: LevelExam; @@ -33,6 +34,17 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = const levelBgColor = "bg-ielts-level-light"; const [multipleChoicesDone, setMultipleChoicesDone] = useState<{ id: string; amount: number }[]>([]); const [showQuestionsModal, setShowQuestionsModal] = useState(false); + const [continueAnyways, setContinueAnyways] = useState(false); + + const [seenParts, setSeenParts] = useState(showSolutions ? exam.parts.map((_, index) => index) : [0]); + const [lastSolution, setLastSolution] = useState(undefined); + + const [questionModalKwargs, setQuestionModalKwargs] = useState<{ + type?: "module" | "blankQuestions" | "submit"; unanswered?: boolean | undefined; onClose: (next?: boolean) => void | undefined; + }>({ + type: "blankQuestions", + onClose: function (x: boolean | undefined) { if (x) { setShowQuestionsModal(false); nextExercise(); } else { setShowQuestionsModal(false) } } + }); const { setBgColor } = useExamStore((state) => state); const { userSolutions, setUserSolutions } = useExamStore((state) => state); @@ -48,7 +60,28 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = const [contextWord, setContextWord] = useState(undefined); const [contextWordLine, setContextWordLine] = useState(undefined); + const [currentSolution, setCurrentSolution] = useExamStore((state) => [state.currentSolution, state.setCurrentSolution]) + const [showSolutionsSave, setShowSolutionsSave] = useState(showSolutions ? userSolutions.filter((x) => x.module === "level") : undefined) + + useEffect(() => { + if (typeof currentSolution !== "undefined") { + setUserSolutions([...userSolutions.filter((x) => x.exercise !== currentSolution.exercise), { ...currentSolution, module: "level" as Module, exam: exam.id, shuffleMaps: exam.shuffle ? [...shuffles.find((x) => x.exerciseID == currentExercise?.id)?.shuffles!] : [] }]); + setCurrentSolution(undefined); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [currentSolution]) + + useEffect(()=> { + if (showSolutions) { + const solutionShuffles = userSolutions.map(solution => ({ + exerciseID: solution.exercise, + shuffles: solution.shuffleMaps || [] + })); + setShuffles(solutionShuffles); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + },[]); useEffect(() => { if (hasExamEnded && exerciseIndex === -1) { @@ -56,27 +89,21 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = } }, [hasExamEnded, exerciseIndex, setExerciseIndex]); - const getExercise = () => { + const getExercise = () => {; let exercise = exam.parts[partIndex]?.exercises[exerciseIndex]; if (!exercise) return undefined; - exercise = { ...exercise, userSolutions: userSolutions.find((x) => x.exercise === exercise.id)?.solutions || [], }; - if (showSolutions) { - setShuffles([...shuffles.filter((x) => x.exerciseID !== exercise.id), { exerciseID: exercise.id, shuffles: userSolutions.find((x) => x.exercise === exercise.id)!.shuffleMaps!}]); - } else { - exercise = shuffleExamExercise(exam.shuffle, exercise, showSolutions, userSolutions, shuffles, setShuffles); - } + + exercise = shuffleExamExercise(exam.shuffle, exercise, showSolutions, userSolutions, shuffles, setShuffles); + return exercise; }; useEffect(() => { - - if (exerciseIndex !== -1) { - setCurrentExercise(getExercise()); - } + setCurrentExercise(getExercise()); // eslint-disable-next-line react-hooks/exhaustive-deps }, [partIndex, exerciseIndex, exam.parts[partIndex].context]); @@ -108,24 +135,31 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = const nextExercise = (solution?: UserSolution) => { scrollToTop(); - if (solution) { - setUserSolutions([...userSolutions.filter((x) => x.exercise !== solution.exercise), { ...solution, module: "level" as Module, exam: exam.id, shuffleMaps: exam.shuffle ? [...shuffles.find((x) => x.exerciseID == currentExercise?.id)?.shuffles!] : [] }]); - } - - /*if (storeQuestionIndex > 0 || currentExercise?.type == "fillBlanks") { - setMultipleChoicesDone((prev) => [...prev.filter((x) => x.id !== currentExercise!.id), { id: currentExercise!.id, amount: currentExercise?.type == "fillBlanks" ? currentExercise.words.length - 1 : storeQuestionIndex }]); - }*/ if (exerciseIndex + 1 < exam.parts[partIndex].exercises.length && !hasExamEnded) { setExerciseIndex(exerciseIndex + 1); return; } - if (partIndex + 1 < exam.parts.length && !hasExamEnded && (showQuestionsModal || showSolutions)) { + if (partIndex + 1 === exam.parts.length && !hasExamEnded && !showQuestionsModal && !showSolutions && !continueAnyways) { + setLastSolution(solution); + modalKwargs(); + setShowQuestionsModal(true); + return; + } + + if (partIndex + 1 < exam.parts.length && !hasExamEnded) { + if (!answeredEveryQuestion(partIndex) && !continueAnyways && !showSolutions) { + modalKwargs(); + setShowQuestionsModal(true); + return; + } + if (!showSolutions && exam.parts[0].intro) { setShowPartDivider(true); setBgColor(levelBgColor); } + setSeenParts((prev) => [...prev, partIndex + 1]) setPartIndex(partIndex + 1); setExerciseIndex(!!exam.parts[partIndex + 1].context ? -1 : 0); setStoreQuestionIndex(0); @@ -133,28 +167,9 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = return; } - if (partIndex + 1 < exam.parts.length && !hasExamEnded && !showQuestionsModal && !showSolutions) { - setShowQuestionsModal(true); - return; - } - - if ( - solution && - ![...userSolutions.filter((x) => x.exercise !== solution?.exercise).map((x) => x.score.missing), solution?.score.missing].every( - (x) => x === 0, - ) && - !showSolutions && - !editing && - !hasExamEnded - ) { - setShowQuestionsModal(true); - return; - } - setHasExamEnded(false); - - if (solution) { - onFinish([...userSolutions.filter((x) => x.exercise !== solution.exercise), { ...solution, module: "level" as Module, exam: exam.id, shuffleMaps: exam.shuffle ? [...shuffles.find((x) => x.exerciseID == currentExercise?.id)?.shuffles!] : [] }]); + if (typeof showSolutionsSave !== "undefined") { + onFinish(showSolutionsSave); } else { onFinish(userSolutions); } @@ -200,19 +215,28 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = }, [exerciseIndex]) const calculateExerciseIndex = () => { - if (partIndex === 0) { + if (exam.parts[0].intro) { + return exam.parts.reduce((acc, curr, index) => { + if (index < partIndex) { + return acc + countExercises(curr.exercises) + } + return acc; + }, 0) + (storeQuestionIndex + 1); + } else { + if (partIndex === 0) { + return ( + (exerciseIndex === -1 ? 0 : exerciseIndex + 1) + storeQuestionIndex //+ multipleChoicesDone.reduce((acc, curr) => acc + curr.amount, 0) + ); + } + const exercisesPerPart = exam.parts.map((x) => x.exercises.length); + const exercisesDone = exercisesPerPart.filter((_, index) => index < partIndex).reduce((acc, curr) => curr + acc, 0); return ( - (exerciseIndex === -1 ? 0 : exerciseIndex + 1) + storeQuestionIndex //+ multipleChoicesDone.reduce((acc, curr) => acc + curr.amount, 0) + exercisesDone + + (exerciseIndex === -1 ? 0 : exerciseIndex + 1) + + storeQuestionIndex + + multipleChoicesDone.reduce((acc, curr) => { return acc + curr.amount }, 0) ); } - const exercisesPerPart = exam.parts.map((x) => x.exercises.length); - const exercisesDone = exercisesPerPart.filter((_, index) => index < partIndex).reduce((acc, curr) => curr + acc, 0); - return ( - exercisesDone + - (exerciseIndex === -1 ? 0 : exerciseIndex + 1) + - storeQuestionIndex - + multipleChoicesDone.reduce((acc, curr) => { return acc + curr.amount }, 0) - ); }; const renderText = () => ( @@ -247,8 +271,8 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = } } - const modalKwargs = () => { - const allSolutionsCorrectLength = exam.parts[partIndex].exercises.every((exercise) => { + const answeredEveryQuestion = (partIndex: number) => { + return exam.parts[partIndex].exercises.every((exercise) => { const userSolution = userSolutions.find(x => x.exercise === exercise.id); if (exercise.type === "multipleChoice") { return userSolution?.solutions.length === exercise.questions.length; @@ -258,27 +282,81 @@ export default function Level({ exam, showSolutions = false, onFinish, editing = } return false; }); - - return { - blankQuestions: !allSolutionsCorrectLength, - finishingWhat: "part", - onClose: partIndex !== exam.parts.length - 1 ? ( - function (x: boolean | undefined) { if (x) { setShowQuestionsModal(false); nextExercise(); } else { setShowQuestionsModal(false) } } - ) : function (x: boolean | undefined) { if (x) { setShowQuestionsModal(false); onFinish(userSolutions); } else { setShowQuestionsModal(false) } } - } - } + useEffect(() => { + if (continueAnyways) { + nextExercise(lastSolution); + setContinueAnyways(false); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [continueAnyways]); + + const modalKwargs = () => { + const kwargs: { type: "module" | "blankQuestions" | "submit", unanswered: boolean, onClose: (next?: boolean) => void; } = { + type: "blankQuestions", + unanswered: false, + onClose: function (x: boolean | undefined) { if (x) { setContinueAnyways(true); setShowQuestionsModal(false); } else { setShowQuestionsModal(false) } } + }; + + if (partIndex === exam.parts.length - 1) { + kwargs.type = "submit" + kwargs.unanswered = !exam.parts.every((_, partIndex) => answeredEveryQuestion(partIndex)); + kwargs.onClose = function (x: boolean | undefined) { if (x) { setContinueAnyways(true); setShowQuestionsModal(false); } else { setShowQuestionsModal(false) } }; + } + setQuestionModalKwargs(kwargs); + } + + const mcNavKwargs = { + userSolutions: userSolutions, + exam: exam, + partIndex: partIndex, + showSolutions: showSolutions, + "setExerciseIndex": setExerciseIndex, + "setPartIndex": setPartIndex, + "runOnClick": setStoreQuestionIndex + } + + return ( <>
- + { !(partIndex === 0 && storeQuestionIndex === 0 && showPartDivider) && } {exam.parts[0].intro && showPartDivider ? { setShowPartDivider(false); setBgColor("bg-white") }} /> : ( <> + {exam.parts[0].intro && ( +
+ + + {exam.parts.map((_, index) => + { + if (!seenParts.includes(index)) { + e.preventDefault(); + } else { + setExerciseIndex(0); + setStoreQuestionIndex(0); + } + }} + className={({ selected }) => + clsx( + "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-ielts-level/80", + "ring-white ring-opacity-60 focus:outline-none", + "transition duration-300 ease-in-out", + selected && "bg-white shadow", + seenParts.includes(index) ? "hover:bg-white/70" : "cursor-not-allowed" + ) + } + >{`Part ${index + 1}`} + ) + } + + +
+ )} x.exercises))} disableTimer={showSolutions || editing} showTimer={false} + {...mcNavKwargs} />
void; setShuffles: (shuffles: Shuffles[]) => void; setBgColor: (bgColor: string) => void; + setCurrentSolution: (currentSolution: UserSolution | undefined) => void; reset: () => void; } @@ -58,7 +60,8 @@ export const initialState: ExamState = { questionIndex: 0, inactivity: 0, shuffles: [], - bgColor: "bg-white" + bgColor: "bg-white", + currentSolution: undefined }; const useExamStore = create((set) => ({ @@ -80,6 +83,7 @@ const useExamStore = create((set) => ({ setInactivity: (inactivity: number) => set(() => ({inactivity})), setShuffles: (shuffles: Shuffles[]) => set(() => ({shuffles})), setBgColor: (bgColor) => set(() => ({bgColor})), + setCurrentSolution: (currentSolution: UserSolution | undefined) => set(() => ({currentSolution})), reset: () => set(() => initialState), }));