From fddd2d3cbaf2c6cbca551b97c06a81f78f7e3170 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Wed, 27 Dec 2023 20:26:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B5=D1=82=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=83=D0=BC=D0=B5=D0=B5=D1=82=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D1=82=D1=8C=20=D1=81=D0=BB=D0=B5=D0=B4=D1=83=D1=8E?=
 =?UTF-8?q?=D1=89=D0=B8=D0=B9=20=D0=B2=D0=BE=D0=BF=D1=80=D0=BE=D1=81=20?=
 =?UTF-8?q?=D1=81=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2=D0=B8=D0=B5=D0=BC=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20=D0=B8=20=D1=83=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=B5=D1=82=20=D0=B8=D1=81=D0=BA=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ViewPublicationPage/Footer.tsx | 51 +++++++++++++++---------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/pages/ViewPublicationPage/Footer.tsx b/src/pages/ViewPublicationPage/Footer.tsx
index 1720dadc..054a3d9f 100644
--- a/src/pages/ViewPublicationPage/Footer.tsx
+++ b/src/pages/ViewPublicationPage/Footer.tsx
@@ -9,8 +9,8 @@ import type { AnyTypedQuizQuestion, QuizQuestionBase } from "../../model/questio
 import { getQuestionByContentId } from "@root/questions/actions";
 import { enqueueSnackbar } from "notistack";
 import { NameplateLogoFQ } from "@icons/NameplateLogoFQ";
-import {NameplateLogoFQDark} from "@icons/NameplateLogoFQDark";
-import {modes} from "../../utils/themes/Publication/themePublication";
+import { NameplateLogoFQDark } from "@icons/NameplateLogoFQDark";
+import { modes } from "../../utils/themes/Publication/themePublication";
 import { checkEmptyData } from "../ResultPage/cards/ResultCard";
 
 type FooterProps = {
@@ -116,10 +116,14 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh
   };
 
   const getNextQuestionId = () => {
+    console.log("net")
+    console.log(question)
+    let readyBeNextQuestion = "";
+
+    //вопрос обязателен, анализируем ответ и условия ветвления
     if (answers.length) {
       const answer = answers.find(({ questionId }) => questionId === question.content.id);
 
-      let readyBeNextQuestion = "";
 
       (question as QuizQuestionBase).content.rule.main.forEach(({ next, rules }) => {
         let longerArray = Math.max(
@@ -146,8 +150,23 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh
         }
       });
 
-      return readyBeNextQuestion;
+      if (readyBeNextQuestion) return readyBeNextQuestion;
     }
+
+    if (!question.required) {//вопрос не обязателен и не нашли совпадений между ответами и условиями ветвления
+      console.log("вопрос не обязателен ищем дальше")
+      const defaultQ = question.content.rule.default
+      if (defaultQ) return defaultQ
+
+    }
+    //ничё не нашли, ищем резулт 
+    console.log("ничё не нашли, ищем резулт ")
+    return questions.find(q => {
+      console.log('q.type === "result"', q.type === "result")
+      console.log('q.content.rule.parentId === question.content.id', q.content.rule.parentId === question.content.id)
+      return q.type === "result" && q.content.rule.parentId === question.content.id
+    })?.content.id
+
   };
 
   const followPreviousStep = () => {
@@ -195,22 +214,18 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh
 
     const nextQuestionId = getNextQuestionId();
 
+    console.log(nextQuestionId)
     if (nextQuestionId) {
       const nextQuestion = getQuestionByContentId(nextQuestionId);
+      console.log(nextQuestion)
 
-      if (nextQuestion?.type && nextQuestion.type !== "result") {
-        setCurrentQuestion(nextQuestion);
-        return;
+      if (nextQuestion?.type && nextQuestion.type === "result") {
+        showResult(nextQuestion);
       } else {
-        enqueueSnackbar("не могу получить последующий вопрос");
+        setCurrentQuestion(nextQuestion);
       }
     } else {
-      const nextQuestion = getQuestionByContentId(question.content.rule.default);
-      if (nextQuestion?.type && nextQuestion.type !== "result") {
-        setCurrentQuestion(nextQuestion);
-      } else {
-        showResult(nextQuestion);
-      }
+      enqueueSnackbar("не могу получить последующий вопрос");
     }
   };
 
@@ -237,9 +252,9 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh
         }}
       >
         {mode[quiz.config.theme] ? (
-            <NameplateLogoFQ style={{ fontSize: "34px", width:"200px", height:"auto" }} />
-        ):(
-            <NameplateLogoFQDark style={{ fontSize: "34px", width:"200px", height:"auto" }} />
+          <NameplateLogoFQ style={{ fontSize: "34px", width: "200px", height: "auto" }} />
+        ) : (
+          <NameplateLogoFQDark style={{ fontSize: "34px", width: "200px", height: "auto" }} />
         )
 
         }
@@ -311,7 +326,7 @@ export const Footer = ({ setCurrentQuestion, question, setShowContactForm, setSh
         <Button
           disabled={disablePreviousButton}
           variant="contained"
-          sx={{ fontSize: "16px", padding: "10px 15px", "& :disabled": {color: `{hsl((theme.palette.primary.main) 30%)}`} }}
+          sx={{ fontSize: "16px", padding: "10px 15px", "& :disabled": { color: `{hsl((theme.palette.primary.main) 30%)}` } }}
           onClick={followPreviousStep}
         >
           ← Назад