devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Seems to have solved some other issues

Browse Source
This commit is contained in:
Tiago Ribeiro
2023-07-27 15:41:34 +01:00
parent 77692d270e
commit d38ca76182
5 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/exams/Finish.tsx
View File

@@ -53,6 +53,10 @@ export default function Finish({user, scores, modules, isLoading, onViewResults}
},
};
useEffect(() => {
console.log({selectedScore, selectedModule, scores});
}, [scores, selectedModule, selectedScore]);
return (
<>
<div className="w-full min-h-full h-fit flex flex-col items-center justify-between gap-8">

8
src/exams/Listening.tsx
View File

@@ -25,7 +25,7 @@ export default function Listening({exam, showSolutions = false, onFinish}: Props
const [userSolutions, setUserSolutions] = useState<UserSolution[]>(exam.exercises.map((x) => defaultUserSolutions(x, exam)));
const [showBlankModal, setShowBlankModal] = useState(false);
const hasExamEnded = useExamStore((state) => state.hasExamEnded);
const [hasExamEnded, setHasExamEnded] = useExamStore((state) => [state.hasExamEnded, state.setHasExamEnded]);
const confirmFinishModule = (keepGoing?: boolean) => {
if (!keepGoing) {
@@ -33,7 +33,7 @@ export default function Listening({exam, showSolutions = false, onFinish}: Props
return;
}
onFinish(userSolutions.map((x) => ({...x, module: "reading", exam: exam.id})));
onFinish(userSolutions.map((x) => ({...x, module: "listening", exam: exam.id})));
};
const nextExercise = (solution?: UserSolution) => {
@@ -46,11 +46,13 @@ export default function Listening({exam, showSolutions = false, onFinish}: Props
return;
}
if (!userSolutions.map((x) => x.score.missing).every((x) => x === 0) && !hasExamEnded) {
if (!userSolutions.map((x) => x.score.missing).every((x) => x === 0) && !showSolutions && !hasExamEnded) {
setShowBlankModal(true);
return;
}
setHasExamEnded(false);
if (solution) {
onFinish(
[...userSolutions.filter((x) => x.exercise !== solution.exercise), solution].map((x) => ({...x, module: "listening", exam: exam.id})),

2
src/exams/Reading.tsx
View File

@@ -106,7 +106,7 @@ export default function Reading({exam, showSolutions = false, onFinish}: Props)
return;
}
if (!userSolutions.map((x) => x.score.missing).every((x) => x === 0) && !hasExamEnded) {
if (!userSolutions.map((x) => x.score.missing).every((x) => x === 0) && !showSolutions && !hasExamEnded) {
setShowBlankModal(true);
return;
}

3
src/exams/Speaking.tsx
View File

@@ -20,6 +20,7 @@ interface Props {
export default function Speaking({exam, showSolutions = false, onFinish}: Props) {
const [exerciseIndex, setExerciseIndex] = useState(0);
const [userSolutions, setUserSolutions] = useState<UserSolution[]>(exam.exercises.map((x) => defaultUserSolutions(x, exam)));
const [hasExamEnded, setHasExamEnded] = useExamStore((state) => [state.hasExamEnded, state.setHasExamEnded]);
const nextExercise = (solution?: UserSolution) => {
if (solution) {
@@ -33,6 +34,8 @@ export default function Speaking({exam, showSolutions = false, onFinish}: Props)
if (exerciseIndex >= exam.exercises.length) return;
setHasExamEnded(false);
if (solution) {
onFinish(
[...userSolutions.filter((x) => x.exercise !== solution.exercise), solution].map((x) => ({...x, module: "speaking", exam: exam.id})),

4
src/exams/Writing.tsx
View File

@@ -21,6 +21,8 @@ export default function Writing({exam, showSolutions = false, onFinish}: Props)
const [exerciseIndex, setExerciseIndex] = useState(0);
const [userSolutions, setUserSolutions] = useState<UserSolution[]>(exam.exercises.map((x) => defaultUserSolutions(x, exam)));
const [hasExamEnded, setHasExamEnded] = useExamStore((state) => [state.hasExamEnded, state.setHasExamEnded]);
const nextExercise = (solution?: UserSolution) => {
if (solution) {
setUserSolutions((prev) => [...prev.filter((x) => x.exercise !== solution.exercise), solution]);
@@ -33,6 +35,8 @@ export default function Writing({exam, showSolutions = false, onFinish}: Props)
if (exerciseIndex >= exam.exercises.length) return;
setHasExamEnded(false);
if (solution) {
onFinish(
[...userSolutions.filter((x) => x.exercise !== solution.exercise), solution].map((x) => ({...x, module: "writing", exam: exam.id})),