From b9aacedd620ee431bd8d3683b76ae855bd1dd7d7 Mon Sep 17 00:00:00 2001 From: Nastya Date: Sat, 30 Dec 2023 21:51:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=BE=D0=B4=D1=8B=20=D0=B1=D0=B5=D0=B7?= =?UTF-8?q?=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8=20=D0=B3=D0=BE=D0=B2=D0=BE?= =?UTF-8?q?=D1=80=D1=8F=D1=82=20=D0=BF=D0=BE=D1=80=D1=8F=D0=B4=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2=D1=8B=D0=B9=20=D0=BD=D0=BE=D0=BC=D0=B5=D1=80,=20=D0=BA?= =?UTF-8?q?=D0=B2=D0=B8=D0=B7=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=20=D0=B3=D0=BE=D0=B2=D0=BE=D1=80=D1=8F=D1=82?= =?UTF-8?q?=20=D1=82=D0=B8=D0=BF=20=D0=B8=20=D0=BA=D0=BE=D0=BB=D0=B2=D0=BE?= =?UTF-8?q?=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=B2?= =?UTF-8?q?=D0=BD=D1=83=D1=82=D1=80=D0=B8,=20=D1=82=D0=B5=D1=81=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/model/quiz/quiz.ts | 2 ++ src/pages/Questions/BranchingMap/CsComponent.tsx | 2 +- src/pages/Questions/BranchingMap/helper.ts | 2 +- src/pages/ViewPublicationPage/Footer.tsx | 2 +- src/pages/createQuize/QuizCard.tsx | 12 +++++++++++- src/pages/startPage/EditPage.tsx | 1 + src/utils/checkQuestionHint.ts | 4 +++- 7 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/model/quiz/quiz.ts b/src/model/quiz/quiz.ts index 0de02cdc..7ce0d363 100644 --- a/src/model/quiz/quiz.ts +++ b/src/model/quiz/quiz.ts @@ -55,6 +55,8 @@ export interface Quiz { average_time: number; /** set true if squiz realize group functionality */ super: boolean; + + questions_count: number; /** group of new quiz */ group_id: number; } diff --git a/src/pages/Questions/BranchingMap/CsComponent.tsx b/src/pages/Questions/BranchingMap/CsComponent.tsx index c2cb3168..994572fa 100644 --- a/src/pages/Questions/BranchingMap/CsComponent.tsx +++ b/src/pages/Questions/BranchingMap/CsComponent.tsx @@ -142,7 +142,7 @@ function CsComponent({ { data: { id: targetQuestion.content.id, - label: targetQuestion.title === "" || targetQuestion.title === " " ? "noname" : targetQuestion.title, + label: targetQuestion.title === "" || targetQuestion.title === " " ? "noname №" + targetQuestion.page : targetQuestion.title, parentType: parentNodeContentId } }, diff --git a/src/pages/Questions/BranchingMap/helper.ts b/src/pages/Questions/BranchingMap/helper.ts index a158e26c..2d328fa1 100644 --- a/src/pages/Questions/BranchingMap/helper.ts +++ b/src/pages/Questions/BranchingMap/helper.ts @@ -21,7 +21,7 @@ export const storeToNodes = (questions: AnyTypedQuizQuestion[]) => { if (question.content.rule.parentId) { nodes.push({data: { id: question.content.id, - label: question.title === "" || question.title === " " ? "noname" : question.title, + label: question.title === "" || question.title === " " ? "noname №" + question.page : question.title, parentType: question.content.rule.parentId }}) // nodes.push({ diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx index d4d368ea..51b56a6f 100644 --- a/src/pages/ViewPublicationPage/Footer.tsx +++ b/src/pages/ViewPublicationPage/Footer.tsx @@ -157,7 +157,7 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh if (!question.required) {//вопрос не обязателен и не нашли совпадений между ответами и условиями ветвления console.log("вопрос не обязателен ищем дальше") const defaultQ = question.content.rule.default - if (defaultQ) return defaultQ + if (defaultQ.length > 1 && defaultQ !== " ") return defaultQ //Вопросы типа страница, ползунок, своё поле для ввода и дата не могут иметь больше 1 ребёнка. Пользователь не может настроить там дефолт //Кинуть на ребёнка надо даже если там нет дефолта if ( diff --git a/src/pages/createQuize/QuizCard.tsx b/src/pages/createQuize/QuizCard.tsx index 02e8d0e8..ab6154ef 100755 --- a/src/pages/createQuize/QuizCard.tsx +++ b/src/pages/createQuize/QuizCard.tsx @@ -27,6 +27,8 @@ export default function QuizCard({ quiz, openCount = 0, applicationCount = 0, co navigate("/edit"); } + const questionCount = useRef(quiz.questions_count.toString() || "") + return ( - {quiz.name} + { + quiz.name.length === 0 || quiz.name === " " ? + quiz.config.type === "form" ? + "Анкета " + questionCount.current + : + "Квиз " + questionCount.current + : + quiz.name + } { const getData = async () => { diff --git a/src/utils/checkQuestionHint.ts b/src/utils/checkQuestionHint.ts index 95378457..dcdba809 100644 --- a/src/utils/checkQuestionHint.ts +++ b/src/utils/checkQuestionHint.ts @@ -53,9 +53,11 @@ export const checkQuestionHint = (questions: AnyTypedQuizQuestion, quiz:Quiz): R question.content.rule.main.forEach((condition: QuestionBranchingRuleMain) => { buffer.forEach((oldCondition: QuestionBranchingRuleMain) => { if (areRulesEqual(condition.rules, oldCondition.rules)) { + const q = getQuestionByContentId(condition.next) + const oldq = getQuestionByContentId(oldCondition.next) pushProblem( question.content.id, - `У вопроса "${getQuestionByContentId(condition.next)?.title || "noname"}" и "${getQuestionByContentId(oldCondition.next)?.title || "noname"}" одинаковые условия ветвления`, + `У вопроса "${q?.title || "noname №" + q?.page}" и "${oldq?.title || "noname №" + oldq?.page}" одинаковые условия ветвления`, question.title ) }