-
-
-
- }>
-
-
-
- )
-}
-
-export default LaTeXInput
\ No newline at end of file
diff --git a/src/Components/LatextInput/LaTeXInputMemo.tsx b/src/Components/LatextInput/LaTeXInputMemo.tsx
index 9a3838f..674bc71 100644
--- a/src/Components/LatextInput/LaTeXInputMemo.tsx
+++ b/src/Components/LatextInput/LaTeXInputMemo.tsx
@@ -1,5 +1,4 @@
import TextArea from 'antd/es/input/TextArea';
-import { useFormikContext } from 'formik';
import React, { Suspense, useEffect, useState } from 'react';
import { parseTextAndLatex } from '../../utils/parseTextAndLatex';
import LatexPreview from '../CustomFields/MathComponent';
@@ -49,15 +48,24 @@ const LaTeXInputMemo: React.FC
-
- {ShowLatexOption &&
-
-
-
-
-
- {t("header.show_preview")}
-
-
-
-
- }
-{showPreview &&
-
- {Preview?.map((item:any,index:number)=>{
- if(item?.isLatex){
- return
-}
- handelEditModal(item)} className='LatexPreview'>
- }
- return
- {item?.text}
-
- })}
-
{Preview?.map((item: any, index: number) => {
if (item?.isLatex) {
+ console.log(item?.text);
+
return (
- = React.memo(({ field ,form, label, ...prop
)}
- handleEditModal(item)} className='LatexPreview'>
-
+ handleEditModal(item)} className='LatexPreview'>
+ {item?.text}
;
@@ -104,9 +114,10 @@ const LaTeXInputMemo: React.FC
- 
+
{/*
+
+
+ )
+}
+
+export default FormTable
\ No newline at end of file
diff --git a/src/Pages/Admin/Roles/Permissions/Page.tsx b/src/Pages/Admin/Roles/Permissions/Page.tsx
index 59d3c2c..bcd3423 100644
--- a/src/Pages/Admin/Roles/Permissions/Page.tsx
+++ b/src/Pages/Admin/Roles/Permissions/Page.tsx
@@ -4,8 +4,6 @@ import { Spin } from "antd";
import useSetPageTitle from "../../../../Hooks/useSetPageTitle";
import PageHeader from "../../../../Layout/Dashboard/PageHeader";
import FilterLayout from "../../../../Layout/Dashboard/FilterLayout";
-import FormikForm from "../../../../Layout/Dashboard/FormikForm";
-import { getInitialValues } from "./Model/formUtil";
const Table = lazy(() => import("./Table"));
const TableHeader = () => {
@@ -29,12 +27,8 @@ const TableHeader = () => {
filterTitle="page_header.permissions"
haveFilter={false}
/>
-
-
-
-
+
-
- {({ values,isValid,handleSubmit }) => (
-
-
- )}
-
-
-
-
-
-
-
+
- {
- handleFormSubmit(values);
- }}
->
- {({ values,isValid ,handleSubmit}) => (
-
- )}
-
-
-
-
-
-
- { t("header.show_hint")}
-
-
-
- { t("header.show_MMl")}
-
-
-
-
- );
@@ -337,119 +294,13 @@ const handleNavigateToPage = () => {
}
if (objectToEdit?.isBase) {
return (
-
-
-
-
-
-
-
+
-
- {({ values,isValid,handleSubmit }) => (
-
-
- )}
-
-
-
-
-
-
-
-
+
-
- {
- handleSubmit(values);
- }}
->
- {({ values , dirty,isValid,handleSubmit }) => (
-
- )}
-
-
-
-
+
+
+
+
+
+ )
+}
+
+export default BaseFormContainer
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/AddForm/Form.tsx b/src/Pages/Admin/question/Model/AddForm/Form.tsx
new file mode 100644
index 0000000..a8734f4
--- /dev/null
+++ b/src/Pages/Admin/question/Model/AddForm/Form.tsx
@@ -0,0 +1,72 @@
+import { Form, Formik, useFormikContext } from 'formik'
+import { useTranslation } from 'react-i18next'
+import { MdOutlineArrowForwardIos } from 'react-icons/md'
+import { getInitialValues, getValidationSchema } from '../../formUtil'
+import Header from '../../../../../Components/exercise/Header'
+import { useNavigate } from 'react-router-dom'
+import { Spin } from 'antd'
+import ModelForm from "../../Model/ModelForm";
+
+const FormContainer = ({handleFormSubmit,Loading,handleValidateSingleQuestion}:{handleFormSubmit:any,Loading:any,handleValidateSingleQuestion:any}) => {
+ const [t] = useTranslation()
+ const navigate = useNavigate();
+
+ const handleNavigateToPage = () => {
+ const cleanedUrl = location.pathname?.replace("/Question/add", "");
+ navigate(cleanedUrl);
+ };
+ const handleCancel = () => {
+ navigate(-1);
+ };
+
+
+ return (
+
+
+ {({ values,isValid,handleSubmit ,dirty}) => (
+
+
+ )}
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default FormContainer
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/AddForm/ValidationFn.ts b/src/Pages/Admin/question/Model/AddForm/ValidationFn.ts
new file mode 100644
index 0000000..d521647
--- /dev/null
+++ b/src/Pages/Admin/question/Model/AddForm/ValidationFn.ts
@@ -0,0 +1,100 @@
+import { toast } from "react-toastify";
+
+export const handleValidateSingleQuestion = (values:any,isValid:boolean,handleSubmit:any,t:any)=>{
+ const haveMoreThanOneAnswer = values?.answers?.length > 1;
+ const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
+ const haveImageOrContent = haveOneAnswerRight && values?.answers?.some((item:any)=> !(item?.content) && !(item.content_image) )
+ const content = values.content ;
+ const content_image = values.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ console.log(haveImageOrContent,"haveImageOrContent");
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+
+ if(!haveMoreThanOneAnswer){
+ toast.error(t("validation.it_should_have_more_than_one_answers")) ;
+ return false ;
+ }
+ if(!haveOneAnswerRight){
+ toast.error(t("validation.it_should_have_more_than_one_correct_answers")) ;
+ return false ;
+ }
+ if(haveImageOrContent){
+ toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
+ return false
+ }
+
+ console.log(1);
+
+ if(isValid){
+ handleSubmit(values)
+ }
+
+}
+export const handleValidateBaseQuestion = (values: any,isValid:boolean,handleSubmit:any,t:any) => {
+ const content = values.content ;
+ const content_image = values.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ console.log(2);
+
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+ console.log(1);
+
+ const isValidate = values?.Questions?.every((Question: any, QuestionsIndex: number) => {
+
+
+ const content = Question.content ;
+ const content_image = Question.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+
+
+ //// answers
+ const answers = Question?.answers;
+ const haveAnswers = answers?.length > 0;
+ const haveMoreThanOneAnswer = haveAnswers && answers?.length > 1;
+ const haveOneAnswerRight = haveMoreThanOneAnswer && answers?.some((item: any) => item?.isCorrect === 1 || item.isCorrect === true);
+ const haveImageOrContent = haveOneAnswerRight && answers?.some((item:any)=> !(item?.content) && !(item.content_image) )
+
+
+
+
+ if (!haveAnswers) {
+ toast.error(t("validation.it_should_have_more_than_one_answers"));
+ return false;
+ }
+
+ if (!haveMoreThanOneAnswer) {
+ toast.error(t("validation.it_should_have_more_than_one_answers"));
+ return false;
+ }
+
+ if (!haveOneAnswerRight) {
+ toast.error(t("validation.it_should_have_more_than_one_correct_answers"));
+ return false;
+ }
+
+ if(haveImageOrContent){
+ toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
+ return false
+ }
+
+ return true
+ });
+
+ console.log(1);
+
+if(isValid && isValidate){
+ console.log(2);
+ handleSubmit(values)
+}
+
+};
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/EditForm/BaseFormContainer.tsx b/src/Pages/Admin/question/Model/EditForm/BaseFormContainer.tsx
new file mode 100644
index 0000000..c0b70b6
--- /dev/null
+++ b/src/Pages/Admin/question/Model/EditForm/BaseFormContainer.tsx
@@ -0,0 +1,108 @@
+import { Form, Formik } from 'formik';
+import React from 'react'
+import { MdOutlineArrowForwardIos } from 'react-icons/md';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { getInitialValuesBase, getValidationSchemaBase } from '../../formUtil';
+import { Checkbox, Popover, Spin } from 'antd';
+import { SettingFilled } from '@ant-design/icons';
+import { CheckboxProps } from 'antd/lib';
+import { LocalStorageEnum } from '../../../../../enums/LocalStorageEnum';
+import { useObjectToEdit } from '../../../../../zustand/ObjectToEditState';
+import ModelForm from "../../Model/Malty/Form";
+
+const BaseFormContainer = ({objectToEdit,handleSubmit,Loading,handleValidateBaseQuestion,t}:{objectToEdit:any,handleSubmit:any,Loading:any,handleValidateBaseQuestion:any,t:any}) => {
+ const location = useLocation();
+ const navigate = useNavigate();
+ const { ShowHint,setShowHint , ShowLatexOption,setShowLatexOption } =
+ useObjectToEdit();
+ const handleCancel = () => {
+ navigate(-1);
+ };
+ const handleNavigateToPage = () => {
+ const cleanedUrl = location.pathname.replace(/\/Question\/\d+$/, "");
+ navigate(cleanedUrl);
+ };
+
+ const onChangeHint: CheckboxProps['onChange'] = (e) => {
+ setShowHint(e.target.checked);
+ localStorage?.setItem(LocalStorageEnum.HINT_INPUT,e.target.checked ? "true" : "false" )
+ };
+
+ const onChangeLatexOption: CheckboxProps['onChange'] = (e) => {
+ setShowLatexOption(e.target.checked);
+ localStorage?.setItem(LocalStorageEnum.LATEX_OPTION_INPUT,e.target.checked ? "true" : "false" )
+ };
+
+
+ const contentSetting = (
+
+ {
+ handleFormSubmit(values);
+ }}
+
+ >
+ {({ values,isValid ,handleSubmit,dirty}) => (
+
+ )}
+
+
+
+
+
+
+ { t("header.show_hint")}
+
+
+
+ { t("header.show_MMl")}
+
+
+
+
+ );
+
+
+ return (
+
+
+
+
+
+ )
+}
+
+export default BaseFormContainer
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx b/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx
new file mode 100644
index 0000000..338e91e
--- /dev/null
+++ b/src/Pages/Admin/question/Model/EditForm/FormContainer.tsx
@@ -0,0 +1,110 @@
+import { Form, Formik } from 'formik';
+import React from 'react'
+import { MdOutlineArrowForwardIos } from 'react-icons/md';
+import { useLocation, useNavigate } from 'react-router-dom';
+import { getInitialValues, getValidationSchema } from '../../formUtil';
+import { Checkbox, Popover, Spin } from 'antd';
+import { SettingFilled } from '@ant-design/icons';
+import { CheckboxProps } from 'antd/lib';
+import { LocalStorageEnum } from '../../../../../enums/LocalStorageEnum';
+import { useObjectToEdit } from '../../../../../zustand/ObjectToEditState';
+import ModelForm from "../../Model/ModelForm";
+
+const FormContainer = ({objectToEdit,handleSubmit,Loading,handleValidateSingleQuestion,t}:{objectToEdit:any,handleSubmit:any,Loading:any,handleValidateSingleQuestion:any,t:any}) => {
+ const location = useLocation();
+ const navigate = useNavigate();
+ const { ShowHint,setShowHint , ShowLatexOption,setShowLatexOption } =
+ useObjectToEdit();
+ const handleCancel = () => {
+ navigate(-1);
+ };
+ const handleNavigateToPage = () => {
+ const cleanedUrl = location.pathname.replace(/\/Question\/\d+$/, "");
+ navigate(cleanedUrl);
+ };
+
+ const onChangeHint: CheckboxProps['onChange'] = (e) => {
+ setShowHint(e.target.checked);
+ localStorage?.setItem(LocalStorageEnum.HINT_INPUT,e.target.checked ? "true" : "false" )
+ };
+
+ const onChangeLatexOption: CheckboxProps['onChange'] = (e) => {
+ setShowLatexOption(e.target.checked);
+ localStorage?.setItem(LocalStorageEnum.LATEX_OPTION_INPUT,e.target.checked ? "true" : "false" )
+ };
+
+
+ const contentSetting = (
+
+
+ {({ values,isValid,handleSubmit,dirty }) => (
+
+
+ )}
+
+
+
+
+
+
+ { t("header.show_hint")}
+
+
+
+ { t("header.show_MMl")}
+
+
+
+
+ );
+
+
+ return (
+
+
+
+
+ )
+}
+
+export default FormContainer
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/EditForm/ValidationFn.ts b/src/Pages/Admin/question/Model/EditForm/ValidationFn.ts
new file mode 100644
index 0000000..d521647
--- /dev/null
+++ b/src/Pages/Admin/question/Model/EditForm/ValidationFn.ts
@@ -0,0 +1,100 @@
+import { toast } from "react-toastify";
+
+export const handleValidateSingleQuestion = (values:any,isValid:boolean,handleSubmit:any,t:any)=>{
+ const haveMoreThanOneAnswer = values?.answers?.length > 1;
+ const haveOneAnswerRight = haveMoreThanOneAnswer && values?.answers?.some((item:any)=> item?.isCorrect === 1 || item.isCorrect === true )
+ const haveImageOrContent = haveOneAnswerRight && values?.answers?.some((item:any)=> !(item?.content) && !(item.content_image) )
+ const content = values.content ;
+ const content_image = values.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ console.log(haveImageOrContent,"haveImageOrContent");
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+
+ if(!haveMoreThanOneAnswer){
+ toast.error(t("validation.it_should_have_more_than_one_answers")) ;
+ return false ;
+ }
+ if(!haveOneAnswerRight){
+ toast.error(t("validation.it_should_have_more_than_one_correct_answers")) ;
+ return false ;
+ }
+ if(haveImageOrContent){
+ toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
+ return false
+ }
+
+ console.log(1);
+
+ if(isValid){
+ handleSubmit(values)
+ }
+
+}
+export const handleValidateBaseQuestion = (values: any,isValid:boolean,handleSubmit:any,t:any) => {
+ const content = values.content ;
+ const content_image = values.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ console.log(2);
+
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+ console.log(1);
+
+ const isValidate = values?.Questions?.every((Question: any, QuestionsIndex: number) => {
+
+
+ const content = Question.content ;
+ const content_image = Question.content_image ;
+ const haveContentOrContentImage = !!content || !!content_image ;
+ if(!haveContentOrContentImage){
+ toast.error(`${t("validation.one_of_image_and_content_should_be_enter_in_question")}`);
+ return false;
+ }
+
+
+ //// answers
+ const answers = Question?.answers;
+ const haveAnswers = answers?.length > 0;
+ const haveMoreThanOneAnswer = haveAnswers && answers?.length > 1;
+ const haveOneAnswerRight = haveMoreThanOneAnswer && answers?.some((item: any) => item?.isCorrect === 1 || item.isCorrect === true);
+ const haveImageOrContent = haveOneAnswerRight && answers?.some((item:any)=> !(item?.content) && !(item.content_image) )
+
+
+
+
+ if (!haveAnswers) {
+ toast.error(t("validation.it_should_have_more_than_one_answers"));
+ return false;
+ }
+
+ if (!haveMoreThanOneAnswer) {
+ toast.error(t("validation.it_should_have_more_than_one_answers"));
+ return false;
+ }
+
+ if (!haveOneAnswerRight) {
+ toast.error(t("validation.it_should_have_more_than_one_correct_answers"));
+ return false;
+ }
+
+ if(haveImageOrContent){
+ toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
+ return false
+ }
+
+ return true
+ });
+
+ console.log(1);
+
+if(isValid && isValidate){
+ console.log(2);
+ handleSubmit(values)
+}
+
+};
\ No newline at end of file
diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
index a7e3fb8..5f31229 100644
--- a/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
+++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/ChoiceFields.tsx
@@ -21,7 +21,6 @@ const ChoiceFields = React.memo(
setFieldValue:any;
values:any
}) => {
- console.log(567)
const [t] = useTranslation();
const { ShowHint } = useObjectToEdit();
const handleDeleteChoice = () => {
@@ -120,7 +119,6 @@ const ChoiceFields = React.memo(
}
, (prevProps, nextProps) => {
console.log(prevProps.values?.Questions?.[prevProps?.parent_index]?.answers?.[prevProps?.index] === nextProps.values?.Questions?.[nextProps?.parent_index]?.answers?.[prevProps?.index]);
- console.log(2255);
return prevProps.values?.Questions?.[prevProps?.parent_index]?.answers?.[prevProps?.index] === nextProps.values?.Questions?.[nextProps?.parent_index]?.answers?.[prevProps?.index];
});
diff --git a/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx b/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
index 974c558..883b9a9 100644
--- a/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
+++ b/src/Pages/Admin/question/Model/Malty/ChoiceField/Choices.tsx
@@ -113,8 +113,6 @@ const Choices = React.memo( ({setFieldValue ,values,parent_index }:any) => {
);
}, (prevProps, nextProps) => {
- console.log(prevProps.values?.Questions?.[prevProps?.parent_index]?.answers === nextProps.values?.Questions?.[nextProps?.parent_index]?.answers);
- console.log(22);
return prevProps.values?.Questions?.[prevProps?.parent_index]?.answers === nextProps.values?.Questions?.[nextProps?.parent_index]?.answers;
});
diff --git a/src/Pages/Admin/question/Model/Malty/Form.tsx b/src/Pages/Admin/question/Model/Malty/Form.tsx
index eadad46..6f92ef3 100644
--- a/src/Pages/Admin/question/Model/Malty/Form.tsx
+++ b/src/Pages/Admin/question/Model/Malty/Form.tsx
@@ -10,6 +10,7 @@ import { CombinationKeyEnum } from "../../../../../enums/CombinationKeyEnum";
import { toast } from "react-toastify";
import MainInputs from "./components/MainInputs";
import Questions from "./components/Questions";
+import useUnsavedChangesWarning from "../../../../../Hooks/useUnsavedChangesWarning";
const Form = () => {
const formik = useFormikContext
+
+ {
+ handleSubmit(values);
+ }}
+>
+ {({ values , dirty,isValid,handleSubmit }) => (
+
+ )}
+
+
+
+