SQuiz/frontAnswerer
2
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fix setting current question to result

Browse Source
This commit is contained in:
nflnkr 2024-02-15 21:29:45 +03:00
parent 9459970624
commit 0391f44828
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
lib/utils/hooks/useQuestionFlowControl.ts
View File

@ -4,6 +4,7 @@ import { useCallback, useDebugValue, useMemo, useState } from "react";
import { isResultQuestionEmpty } from "../../components/ViewPublicationPage/tools/checkEmptyData"; import { isResultQuestionEmpty } from "../../components/ViewPublicationPage/tools/checkEmptyData";
import moment from "moment"; import moment from "moment";
import { useQuizData } from "@contexts/QuizDataContext"; import { useQuizData } from "@contexts/QuizDataContext";
import { enqueueSnackbar } from "notistack";
export function useQuestionFlowControl() { export function useQuestionFlowControl() {
@ -35,12 +36,12 @@ export function useQuestionFlowControl() {
const nextQuestionIdPointsLogic = () => { const nextQuestionIdPointsLogic = () => {
return questions.find(question => return questions.find(question =>
question.type === "result" && question.content.rule.parentId === "line" question.type === "result" && question.content.rule.parentId === "line"
) );
} };
const nextQuestionIdMainLogic = () => { const nextQuestionIdMainLogic = () => {
const questionAnswer = answers.find(({ questionId }) => questionId === currentQuestion.id); const questionAnswer = answers.find(({ questionId }) => questionId === currentQuestion.id);
//Если ответ существует и не является объектом момента //Если ответ существует и не является объектом момента
if (questionAnswer && !moment.isMoment(questionAnswer.answer)) { if (questionAnswer && !moment.isMoment(questionAnswer.answer)) {
//Ответы должны храниться в массиве //Ответы должны храниться в массиве
@ -72,10 +73,10 @@ export function useQuestionFlowControl() {
}; };
const calculateNextQuestionId = useMemo(() => { const calculateNextQuestionId = useMemo(() => {
if (Boolean(settings.cfg.score)) { if (Boolean(settings.cfg.score)) {
return nextQuestionIdPointsLogic() return nextQuestionIdPointsLogic();
} }
return nextQuestionIdMainLogic() return nextQuestionIdMainLogic();
}, [answers, currentQuestion, questions]) }, [answers, currentQuestion, questions]);
const prevQuestion = linearQuestionIndex !== null const prevQuestion = linearQuestionIndex !== null
? questions[linearQuestionIndex - 1] ? questions[linearQuestionIndex - 1]
@ -86,50 +87,50 @@ export function useQuestionFlowControl() {
const findResultPointsLogic = () => { const findResultPointsLogic = () => {
const results = questions const results = questions
.filter(e => e.type === "result" && e.content.rule.minScore !== undefined && e.content.rule.minScore <= pointsSum) .filter(e => e.type === "result" && e.content.rule.minScore !== undefined && e.content.rule.minScore <= pointsSum);
const numbers = results.map(e => e.type === "result" && e.content.rule.minScore !== undefined ? e.content.rule.minScore : 0) const numbers = results.map(e => e.type === "result" && e.content.rule.minScore !== undefined ? e.content.rule.minScore : 0);
const indexOfNext = Math.max(...numbers) const indexOfNext = Math.max(...numbers);
console.log(results) console.log(results);
console.log(numbers) console.log(numbers);
console.log(indexOfNext) console.log(indexOfNext);
return results[numbers.indexOf(indexOfNext)] return results[numbers.indexOf(indexOfNext)];
} };
const getNextQuestion = () => { const getNextQuestion = () => {
let next let next;
console.log(11111111111) console.log(11111111111);
//Искать можно двумя логиками. Основной и балловой //Искать можно двумя логиками. Основной и балловой
if (Boolean(settings.cfg.score)) { if (Boolean(settings.cfg.score)) {
//Балловая //Балловая
console.log(222222222) console.log(222222222);
//Ищем линейно //Ищем линейно
if (linearQuestionIndex !== null) { if (linearQuestionIndex !== null) {
console.log(33333333333) console.log(33333333333);
next = questions[linearQuestionIndex + 1] next = questions[linearQuestionIndex + 1];
console.log(4444444) console.log(4444444);
console.log("перед ифом", next) console.log("перед ифом", next);
if (next?.type === "result" || next == undefined) next = findResultPointsLogic() if (next?.type === "result" || next == undefined) next = findResultPointsLogic();
console.log(5555555555) console.log(5555555555);
} }
} else { } else {
console.log(6666666) console.log(6666666);
//Основная //Основная
if (linearQuestionIndex !== null) { if (linearQuestionIndex !== null) {
console.log(777777777) console.log(777777777);
//Ищем линейно //Ищем линейно
next = questions[linearQuestionIndex + 1] ?? questions.find(question => next = questions[linearQuestionIndex + 1] ?? questions.find(question =>
question.type === "result" && question.content.rule.parentId === "line" question.type === "result" && question.content.rule.parentId === "line"
) );
} else { } else {
console.log(88888888888888) console.log(88888888888888);
//Ищем ветвлением //Ищем ветвлением
next = questions.find(q => q.id === calculateNextQuestionId || q.content.id === calculateNextQuestionId); next = questions.find(q => q.id === calculateNextQuestionId || q.content.id === calculateNextQuestionId);
} }
@ -137,23 +138,22 @@ export function useQuestionFlowControl() {
console.log("next", next); console.log("next", next);
if (!next && currentQuestion.type !== "result") throw new Error("Не найден следующий вопрос"); if (!next && currentQuestion.type !== "result") throw new Error("Не найден следующий вопрос");
return next; return next;
} };
const nextQuestion = getNextQuestion() const nextQuestion = getNextQuestion();
const showResult = useCallback(() => { const showResult = useCallback(() => {
if (nextQuestion?.type !== "result") throw new Error("Current question is not result"); if (nextQuestion?.type !== "result") throw new Error("Current question is not result");
if (isResultQuestionEmpty(nextQuestion)) {
setCurrentQuizStep("contactform");
return;
}
setCurrentQuestion(nextQuestion); setCurrentQuestion(nextQuestion);
if (settings.cfg.resultInfo.showResultForm === "after") setCurrentQuizStep("contactform"); if (
settings.cfg.resultInfo.showResultForm === "after"
|| isResultQuestionEmpty(nextQuestion)
) setCurrentQuizStep("contactform");
}, [nextQuestion, settings.cfg.resultInfo.showResultForm]); }, [nextQuestion, settings.cfg.resultInfo.showResultForm]);
const showResultAfterContactForm = useCallback(() => { const showResultAfterContactForm = useCallback(() => {
if (currentQuestion.type !== "result") throw new Error("Current question is not result"); if (currentQuestion.type !== "result") throw new Error("Current question is not result");
if (isResultQuestionEmpty(currentQuestion)) { if (isResultQuestionEmpty(currentQuestion)) {
console.warn("Result question is empty"); enqueueSnackbar("Данные отправлены");
return; return;
} }