diff --git a/src/components/features/quiz/Task.js b/src/components/features/quiz/Task.js index c700bf6e..075bfe70 100644 --- a/src/components/features/quiz/Task.js +++ b/src/components/features/quiz/Task.js @@ -1,7 +1,7 @@ import moment from "moment"; import React, { useState } from "react"; import { useSelector } from "react-redux"; -import { useParams, useNavigate } from "react-router-dom"; +import { useNavigate, useParams } from "react-router-dom"; import { questionsSelector } from "@redux/quizSlice"; @@ -40,7 +40,6 @@ export const TaskQuiz = ({ timer }) => { return; } - // setLoadingSendAnswers(true); // .finally(() => setLoadingSendAnswers(false)); @@ -51,39 +50,38 @@ export const TaskQuiz = ({ timer }) => { data: { user_id: userId, user_questionnaire_uuid: uuid, - userResponses: JSON.stringify(userResponses) + userResponses: JSON.stringify(userResponses), }, - }) - .then(() => { - showNotification({ - show: true, - text: "Тест успешно пройден", - type: "success", - }); - navigate("/quiz"); - // if (String(res?.status)[0] !== "2") { - // showNotification({ - // show: true, - // text: res?.message || "", - // type: "error", - // }); - // return; - // } - }) - // .catch((e) => { + }).then(() => { + showNotification({ + show: true, + text: "Тест успешно пройден", + type: "success", + }); + navigate("/quiz"); + // if (String(res?.status)[0] !== "2") { // showNotification({ // show: true, - // text: e?.message || "", + // text: res?.message || "", // type: "error", // }); - // }) + // return; + // } + }); + // .catch((e) => { + // showNotification({ + // show: true, + // text: e?.message || "", + // type: "error", + // }); + // }) } //установка таймера на вопрос если он существует if (questions[index + 1]?.time_limit !== "00:00:00") setValueTimer(); // переход на следующий вопрос - setIndex((prev) => questions[prev + 1] ? prev + 1 : prev); + setIndex((prev) => (questions[prev + 1] ? prev + 1 : prev)); }; const complete = (e) => { diff --git a/src/hooks/useHandlerFieldTest.js b/src/hooks/useHandlerFieldTest.js index 762d0824..e8fdadfd 100644 --- a/src/hooks/useHandlerFieldTest.js +++ b/src/hooks/useHandlerFieldTest.js @@ -3,13 +3,16 @@ import { useState } from "react"; export const useHandlerFieldTest = ({ questions, indexQuestion }) => { const [userResponses, setUserResponses] = useState([]); const handleChangeCheckbox = (e) => { - setUserResponses((prev) => - [...prev.filter((item) => item.question_id !== questions[indexQuestion].id), + setUserResponses((prev) => [ + ...prev.filter( + (item) => item.question_id !== questions[indexQuestion].id + ), { question_id: questions[indexQuestion].id, response_body: e.target.value, - answer_id: e.target.id ? e.target.id : questions[indexQuestion].id - }]) + answer_id: e.target.id ? e.target.id : questions[indexQuestion].id, + }, + ]); }; // const handleFieldsForm = (e) => { @@ -25,5 +28,5 @@ export const useHandlerFieldTest = ({ questions, indexQuestion }) => { const handleChange = (e) => { handleChangeCheckbox(e); }; - return { handleChange, userResponses}; + return { handleChange, userResponses }; };