From 0890d5a67c869cd9227bff0f0b89ccb417455e62 Mon Sep 17 00:00:00 2001
From: IlyaDoronin <ryletd@gmail.com>
Date: Tue, 5 Dec 2023 22:55:21 +0300
Subject: [PATCH] feat: Branching Data logic

---
 src/pages/Questions/BranchingModal/Settings.tsx  | 8 ++++----
 src/pages/Questions/ButtonsOptions.tsx           | 3 ++-
 src/pages/ViewPublicationPage/questions/Date.tsx | 7 ++++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/Questions/BranchingModal/Settings.tsx b/src/pages/Questions/BranchingModal/Settings.tsx
index 975c1a9e..a5db68d4 100644
--- a/src/pages/Questions/BranchingModal/Settings.tsx
+++ b/src/pages/Questions/BranchingModal/Settings.tsx
@@ -10,7 +10,7 @@ import { AnyTypedQuizQuestion } from "../../../model/questionTypes/shared"
 import { SelectChangeEvent } from '@mui/material/Select';
 import CalendarIcon from "@icons/CalendarIcon";
 import { DatePicker } from "@mui/x-date-pickers";
-import * as dayjs from 'dayjs'
+import dayjs from 'dayjs'
 import { TimePicker } from '@mui/x-date-pickers/TimePicker';
 import InfoIcon from "@icons/Info";
 import { DeleteIcon } from "@icons/questionsPage/deleteIcon";
@@ -289,12 +289,12 @@ const DateInputsType = ({ parentQuestion, targetQuestion, ruleIndex, setParentQu
                 </Typography>
             }
             <DatePicker
-                value={parentQuestion.content.rule.main[ruleIndex].rules[0].answers[0]}
+                defaultValue={dayjs(new Date(parentQuestion.content.rule.main[ruleIndex].rules[0].answers[0]).toLocaleDateString())}
                 onChange={(dateString) => {
-                    const date = dateString?.$d?.toLocaleDateString("ru-RU", { year: "numeric", month: "2-digit", day: "2-digit" });
+                    const date = dateString?.toDate().toLocaleDateString("ru-RU", { year: "numeric", month: "2-digit", day: "2-digit" });
                     let newParentQuestion = JSON.parse(JSON.stringify(parentQuestion))
                     newParentQuestion.content.rule.main[ruleIndex].rules[0].answers = [date]
-                    // setParentQuestion(newParentQuestion)
+                    setParentQuestion(newParentQuestion)
                 }}
                 slots={{
                     openPickerIcon: () => <CalendarIcon />,
diff --git a/src/pages/Questions/ButtonsOptions.tsx b/src/pages/Questions/ButtonsOptions.tsx
index 929372d2..a2472488 100644
--- a/src/pages/Questions/ButtonsOptions.tsx
+++ b/src/pages/Questions/ButtonsOptions.tsx
@@ -56,7 +56,8 @@ const {openBranchingPanel} = useQuestionsStore.getState()
             return enqueueSnackbar("У корня нет условий ветвления")
         }
         if (parentId.length !== 0) {
-            updateOpenBranchingPanel(value)
+            // updateOpenBranchingPanel(value)
+            openedModal()
         }
 
     }
diff --git a/src/pages/ViewPublicationPage/questions/Date.tsx b/src/pages/ViewPublicationPage/questions/Date.tsx
index 115d1201..ff64a02c 100644
--- a/src/pages/ViewPublicationPage/questions/Date.tsx
+++ b/src/pages/ViewPublicationPage/questions/Date.tsx
@@ -17,6 +17,7 @@ export const Date = ({ currentQuestion }: DateProps) => {
     answers.find(
       ({ questionId }) => questionId === currentQuestion.content.id
     ) ?? {};
+  const [day, month, year] = answer?.split(".") || [];
 
   return (
     <Box>
@@ -30,7 +31,11 @@ export const Date = ({ currentQuestion }: DateProps) => {
         }}
       >
         <DatePicker
-          selected={answer ? new window.Date(answer) : new window.Date()}
+          selected={
+            answer
+              ? new window.Date(`${month}.${day}.${year}`)
+              : new window.Date()
+          }
           onChange={(date) =>
             updateAnswer(
               currentQuestion.content.id,