SQuiz/frontPanel
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'branching-button2' of penahub.gitlab.yandexcloud.net:frontend/squiz into branching-button2

Browse Source
This commit is contained in:
Nastya 2023-12-04 19:49:57 +03:00
commit 575fe9f080
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/Questions/ButtonsOptions.tsx
View File

@ -22,6 +22,7 @@ import type { AnyTypedQuizQuestion } from "../../model/questionTypes/shared";
import { updateOpenedModalSettingsId } from "@root/questions/actions";
import { useCurrentQuiz } from "@root/quizes/hooks";
import {enqueueSnackbar} from "notistack";
import {useQuestionsStore} from "@root/questions/store";
interface Props {
@ -41,14 +42,13 @@ export default function ButtonsOptions({
const isWrappMiniButtonSetting = useMediaQuery(theme.breakpoints.down(920));
const quiz = useCurrentQuiz();
const {openBranchingPanel} = useQuestionsStore.getState()
const openedModal = () => {
updateOpenedModalSettingsId(question.id)
};
const handleClickBranching = (_, value) => {
const parentId = question.content.rule.parentId
console.log(parentId)
console.log(parentId.length)
if (parentId.length === 0 ){
return enqueueSnackbar("Вопрос не учавствует в ветвлении")
}
@ -57,6 +57,7 @@ export default function ButtonsOptions({
}
if (parentId.length !== 0) {
setTimeout(() => updateOpenBranchingPanel(!value), 10)
openedModal()
}
}
@ -97,7 +98,7 @@ export default function ButtonsOptions({
),
title: "Ветвление",
value: "branching",
myFunc: openedModal, handleClickBranching
myFunc: handleClickBranching(question.id, openBranchingPanel),
},
];

4
src/pages/Questions/ButtonsOptionsAndPict.tsx
View File

@ -57,8 +57,6 @@ export default function ButtonsOptionsAndPict({
const handleClickBranching = (_, value) => {
const parentId = question.content.rule.parentId
console.log(parentId)
console.log(parentId.length)
if (parentId.length === 0 ) {
return enqueueSnackbar("Вопрос не учавствует в ветвлении")
}
@ -67,6 +65,7 @@ export default function ButtonsOptionsAndPict({
}
if (parentId.length !== 0) {
setTimeout(() => updateOpenBranchingPanel(!value), 10)
updateOpenedModalSettingsId(question.id)
}
}
@ -206,7 +205,6 @@ export default function ButtonsOptionsAndPict({
onMouseEnter={() => setButtonHover("branching")}
onMouseLeave={() => setButtonHover("")}
onClick={() => {
updateOpenedModalSettingsId(question.id)
handleClickBranching(question.id, openBranchingPanel)
}}
sx={{

3
src/pages/Questions/QuestionsPage.tsx
View File

@ -24,7 +24,8 @@ export default function QuestionsPage() {
const { openedModalSettingsId } = useQuestionsStore();
const isMobile = useMediaQuery(theme.breakpoints.down(660));
const quiz = useCurrentQuiz();
const openBranchingPanel = useQuestionsStore.getState()
const {openBranchingPanel} = useQuestionsStore.getState()
if (!quiz) return null;