From be376586cc955e5a37db2f39d161ae4309806723 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Sun, 8 Sep 2024 11:31:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D0=B5=D0=B9?=
 =?UTF-8?q?=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=BE=D0=B2=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D0=BC=D0=B8=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B0=D0=BC=D0=B8=20=D0=BE=D1=82=20=D1=84?=
 =?UTF-8?q?=D0=B8=D1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../questions/Images/ImageVariant.tsx               |  3 +++
 .../ViewPublicationPage/questions/Images/index.tsx  |  7 +++++--
 lib/model/questionTypes/emoji.ts                    |  2 ++
 lib/model/questionTypes/images.ts                   |  2 ++
 lib/model/questionTypes/variant.ts                  |  1 +
 lib/model/questionTypes/varimg.ts                   |  3 +++
 lib/stores/quizView.ts                              |  3 +++
 lib/utils/hooks/useQuestionFlowControl.ts           |  2 ++
 lib/utils/sendQuestionAnswer.ts                     | 13 ++++++++++++-
 9 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx
index 1077def..f5ce58c 100644
--- a/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx
+++ b/lib/components/ViewPublicationPage/questions/Images/ImageVariant.tsx
@@ -30,6 +30,9 @@ export const ImageVariant = ({ questionId, variant, index }: ImagesProps) => {
     }
   };
 
+  console.log("answers");
+  console.log(answers);
+
   return (
     <Box
       sx={{
diff --git a/lib/components/ViewPublicationPage/questions/Images/index.tsx b/lib/components/ViewPublicationPage/questions/Images/index.tsx
index 5387b01..438ce08 100644
--- a/lib/components/ViewPublicationPage/questions/Images/index.tsx
+++ b/lib/components/ViewPublicationPage/questions/Images/index.tsx
@@ -1,7 +1,7 @@
 import { useRootContainerSize } from "@contexts/RootContainerWidthContext";
 import type { QuizQuestionImages } from "@model/questionTypes/images";
 import { Box, RadioGroup, Typography, useTheme } from "@mui/material";
-import { useQuizViewStore } from "@stores/quizView";
+import { createQuizViewStore, useQuizViewStore } from "@stores/quizView";
 import { ImageVariant } from "./ImageVariant";
 
 type ImagesProps = {
@@ -14,7 +14,10 @@ export const Images = ({ currentQuestion }: ImagesProps) => {
   const answer = answers.find(({ questionId }) => questionId === currentQuestion.id)?.answer;
   const isTablet = useRootContainerSize() < 1000;
   const isMobile = useRootContainerSize() < 500;
-
+  const a = createQuizViewStore().getState();
+  console.log(currentQuestion);
+  console.log("store");
+  console.log(a);
   return (
     <Box>
       <Typography
diff --git a/lib/model/questionTypes/emoji.ts b/lib/model/questionTypes/emoji.ts
index a9db0cf..7be9d58 100644
--- a/lib/model/questionTypes/emoji.ts
+++ b/lib/model/questionTypes/emoji.ts
@@ -20,5 +20,7 @@ export interface QuizQuestionEmoji extends QuizQuestionBase {
     back: string | null;
     originalBack: string | null;
     autofill: boolean;
+    ownPlaceholder?: string;
+    isLargeCheck?: boolean;
   };
 }
diff --git a/lib/model/questionTypes/images.ts b/lib/model/questionTypes/images.ts
index f310fc1..1bf3693 100644
--- a/lib/model/questionTypes/images.ts
+++ b/lib/model/questionTypes/images.ts
@@ -28,5 +28,7 @@ export interface QuizQuestionImages extends QuizQuestionBase {
     originalBack: string | null;
     autofill: boolean;
     largeCheck: boolean;
+    ownPlaceholder?: string;
+    isLargeCheck?: boolean;
   };
 }
diff --git a/lib/model/questionTypes/variant.ts b/lib/model/questionTypes/variant.ts
index 706875b..5e8aef8 100644
--- a/lib/model/questionTypes/variant.ts
+++ b/lib/model/questionTypes/variant.ts
@@ -23,5 +23,6 @@ export interface QuizQuestionVariant extends QuizQuestionBase {
     back: string | null;
     originalBack: string | null;
     autofill: boolean;
+    ownPlaceholder?: string;
   };
 }
diff --git a/lib/model/questionTypes/varimg.ts b/lib/model/questionTypes/varimg.ts
index 84ad2bb..09fb604 100644
--- a/lib/model/questionTypes/varimg.ts
+++ b/lib/model/questionTypes/varimg.ts
@@ -20,5 +20,8 @@ export interface QuizQuestionVarImg extends QuizQuestionBase {
     autofill: boolean;
     largeCheck: boolean;
     replText: string;
+    /** Чекбокс "Можно несколько" */
+    multi?: boolean;
+    ownPlaceholder?: string;
   };
 }
diff --git a/lib/stores/quizView.ts b/lib/stores/quizView.ts
index 2720189..8dca52c 100644
--- a/lib/stores/quizView.ts
+++ b/lib/stores/quizView.ts
@@ -57,7 +57,10 @@ export const createQuizViewStore = () =>
           updateAnswer(questionId, answer, points) {
             set(
               (state) => {
+                console.log(state);
                 const index = state.answers.findIndex((answer) => questionId === answer.questionId);
+                console.log("state");
+                console.log(state.answers);
 
                 if (index < 0) {
                   state.answers.push({ questionId, answer });
diff --git a/lib/utils/hooks/useQuestionFlowControl.ts b/lib/utils/hooks/useQuestionFlowControl.ts
index f8feaff..02405b9 100644
--- a/lib/utils/hooks/useQuestionFlowControl.ts
+++ b/lib/utils/hooks/useQuestionFlowControl.ts
@@ -33,6 +33,8 @@ export function useQuestionFlowControl() {
   //Изменение стейта (переменной currentQuestionId) ведёт к пересчёту что же за объект сейчас используется. Мы каждый раз просто ищем в списке
   const currentQuestion = sortedQuestions.find((question) => question.id === currentQuestionId) ?? sortedQuestions[0];
 
+  // console.log(currentQuestion)
+
   //Индекс текущего вопроса только если квиз линейный
   const linearQuestionIndex = //: number | null
     currentQuestion && sortedQuestions.every(({ content }) => content.rule.parentId !== "root") // null when branching enabled
diff --git a/lib/utils/sendQuestionAnswer.ts b/lib/utils/sendQuestionAnswer.ts
index bf66ce3..f603794 100644
--- a/lib/utils/sendQuestionAnswer.ts
+++ b/lib/utils/sendQuestionAnswer.ts
@@ -101,11 +101,22 @@ export function sendQuestionAnswer(
         const answer = questionAnswer.answer;
         if (!Array.isArray(answer)) throw new Error("Cannot send answer in select question");
 
+        console.log("до фильтра");
+        console.log(question.content.variants);
+        //Оставляем только выбранные варианты
         const selectedVariants = question.content.variants.filter((v) => answer.includes(v.id));
+        console.log("после фильтра");
+        console.log(selectedVariants);
+        let answerString = ``;
+        selectedVariants.forEach((e) => {
+          answerString += `\`${e.answer}\`,`;
+        });
+        answerString = answerString.slice(0, -1);
 
         return sendAnswer({
           questionId: question.id,
-          body: selectedVariants.map((v) => v.answer).join(", "),
+          body: answerString,
+          // body: selectedVariants.map((v) => v.answer).join(", "),
           qid: quizId,
         });
       }