diff --git a/src/model/quiz/quiz.ts b/src/model/quiz/quiz.ts index d5e16d01..ada7bbdb 100644 --- a/src/model/quiz/quiz.ts +++ b/src/model/quiz/quiz.ts @@ -50,6 +50,7 @@ export interface Quiz { question_cnt: number; /** count passings */ passed_count: number; + sessions_count: number; /** average time of passing */ average_time: number; /** set true if squiz realize group functionality */ @@ -108,6 +109,7 @@ export interface RawQuiz { question_cnt: number; /** count passings */ passed_count: number; + sessions_count: number; /** average time of passing */ average_time: number; /** set true if squiz realize group functionality */ diff --git a/src/pages/Questions/QuestionsPage.tsx b/src/pages/Questions/QuestionsPage.tsx index 10056da3..5e16966b 100755 --- a/src/pages/Questions/QuestionsPage.tsx +++ b/src/pages/Questions/QuestionsPage.tsx @@ -42,7 +42,7 @@ export default function QuestionsPage({ const { openedModalSettingsId } = useUiTools(); const isMobile = useMediaQuery(theme.breakpoints.down(660)); const quiz = useCurrentQuiz(); - const navigate = useNavigate() + const navigate = useNavigate(); const { questions } = useQuestionsStore(); useLayoutEffect(() => { updateEditSomeQuestion(); @@ -51,8 +51,6 @@ export default function QuestionsPage({ const ref = useRef(); if (!quiz) return null; - - return ( <> { const { questions } = useQuestionsStore(); const quiz = useCurrentQuiz(); - const navigate = useNavigate() + const navigate = useNavigate(); const results = useQuestionsStore().questions.filter( (q): q is QuizQuestionResult => q.type === "result", ); @@ -59,7 +63,6 @@ export const ResultSettings = () => { [results], ); - const cnsl = results.filter((q) => q.content.usage); const shouldBlock = true; // Replace this diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index f75bc37b..0c402205 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -116,6 +116,7 @@ export const Footer = ({ } const isEmpty = checkEmptyData({ resultData: nextQuestion }); + console.log("isEmpty", isEmpty) if (nextQuestion) { if (nextQuestion && quiz?.config.resultInfo.when === "before") { if (isEmpty) { @@ -221,7 +222,7 @@ export const Footer = ({ const questionIndex = questions.findIndex(({ id }) => id === question.id); const previousQuestion = questions[questionIndex - 1]; - followPreviousStep + followPreviousStep; if (previousQuestion) { setCurrentQuestion(previousQuestion); } diff --git a/src/pages/ViewPublicationPage/questions/Number.tsx b/src/pages/ViewPublicationPage/questions/Number.tsx index 7047bb3f..8a4c805f 100644 --- a/src/pages/ViewPublicationPage/questions/Number.tsx +++ b/src/pages/ViewPublicationPage/questions/Number.tsx @@ -122,7 +122,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { onChange={({ target }) => { updateAnswer( currentQuestion.content.id, - window.Number(target.value.replace (/\D/, '')) > max + window.Number(target.value.replace(/\D/, "")) > max ? String(max) : window.Number(target.value) < min ? String(min) @@ -155,7 +155,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { placeholder="0" value={minRange} onChange={({ target }) => { - setMinRange(target.value.replace (/\D/, '')); + setMinRange(target.value.replace(/\D/, "")); if (window.Number(target.value) >= window.Number(maxRange)) { updateMinRangeDebounced(`${maxRange}—${maxRange}`, true); @@ -181,7 +181,7 @@ export const Number = ({ currentQuestion }: NumberProps) => { placeholder="0" value={maxRange} onChange={({ target }) => { - setMaxRange(target.value.replace (/\D/, '')); + setMaxRange(target.value.replace(/\D/, "")); if (window.Number(target.value) <= window.Number(minRange)) { updateMaxRangeDebounced(`${minRange}—${minRange}`, true); diff --git a/src/pages/ViewPublicationPage/questions/Variant.tsx b/src/pages/ViewPublicationPage/questions/Variant.tsx index bcd9e650..885a7674 100644 --- a/src/pages/ViewPublicationPage/questions/Variant.tsx +++ b/src/pages/ViewPublicationPage/questions/Variant.tsx @@ -117,11 +117,11 @@ export const Variant = ({ currentQuestion }: VariantProps) => { )} - {currentQuestion.content.back && ( + {currentQuestion.content.back && currentQuestion.content.back !== " " && ( diff --git a/src/pages/ViewPublicationPage/questions/Varimg.tsx b/src/pages/ViewPublicationPage/questions/Varimg.tsx index 62c65677..18838898 100644 --- a/src/pages/ViewPublicationPage/questions/Varimg.tsx +++ b/src/pages/ViewPublicationPage/questions/Varimg.tsx @@ -138,8 +138,8 @@ export const Varimg = ({ currentQuestion }: VarimgProps) => { style={{ width: "100%", height: "100%", objectFit: "cover" }} alt="" /> - ) : variant?.extendedText || isMobile ? ( - "Выберите вариант ответа ниже" + ) : (currentQuestion.content.replText !== " " && currentQuestion.content.replText.length > 0) ? currentQuestion.content.replText : variant?.extendedText || isMobile ? ( + "Выберите вариант ответа ниже" ) : ( "Выберите вариант ответа слева" )} diff --git a/src/pages/createQuize/MyQuizzesFull.tsx b/src/pages/createQuize/MyQuizzesFull.tsx index 16a8895d..1c94b0fc 100644 --- a/src/pages/createQuize/MyQuizzesFull.tsx +++ b/src/pages/createQuize/MyQuizzesFull.tsx @@ -75,15 +75,15 @@ export default function MyQuizzesFull({ mb: "60px", }} > - {quizes.map((quiz) => ( - { + return - ))} + })} {children} diff --git a/src/pages/createQuize/QuizCard.tsx b/src/pages/createQuize/QuizCard.tsx index 0dae2c01..910f3f3a 100755 --- a/src/pages/createQuize/QuizCard.tsx +++ b/src/pages/createQuize/QuizCard.tsx @@ -98,8 +98,8 @@ export default function QuizCard({ > {quiz.name.length === 0 || quiz.name === " " ? quiz.config.type === "form" - ? "Анкета " + questionCount.current - : "Квиз " + questionCount.current + ? "Form " + quiz.backendId + : "Quiz " + quiz.backendId : quiz.name} {selectedVariantIndex === -1 ? widthPreview < 650 - ? "Выберите вариант ниже" - : "Выберите вариант" + ? question?.content.replText || "Выберите вариант ниже" + : question?.content.replText || "Выберите вариант" : "Картинка отсутствует"} )}