-
+
diff --git a/src/Pages/Admin/Grade/useTableColumns.tsx b/src/Pages/Admin/Grade/useTableColumns.tsx
index bc10a12..b5d1978 100644
--- a/src/Pages/Admin/Grade/useTableColumns.tsx
+++ b/src/Pages/Admin/Grade/useTableColumns.tsx
@@ -53,6 +53,7 @@ export const useColumns = () => {
key: "name",
align: "center",
render: (_text, record) => record?.name,
+ ellipsis:true
},
{
title: t("columns.image"),
diff --git a/src/Pages/Admin/Tags/field/SelectTag.tsx b/src/Pages/Admin/Tags/field/SelectTag.tsx
deleted file mode 100644
index 3b276ed..0000000
--- a/src/Pages/Admin/Tags/field/SelectTag.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React, { useState, useMemo } from "react";
-import { Select, Spin } from "antd";
-import { useTranslation } from "react-i18next";
-import { useFormikContext } from "formik";
-import { useDebounce } from "../../../../utils/useDebounce";
-import { useGetAllTag } from "../../../../api/tags";
-
-const SelectTag: React.FC = () => {
- const [searchValue, setSearchValue] = useState("");
-
- const [fieldValue, setFieldValue] = useState("");
- const formik = useFormikContext();
- const handleChange = (value: string[]) => {
- console.log(value,"value");
-
- formik.setFieldValue("tags", value);
- setSearchValue("");
- setFieldValue("");
- };
-
- const handleSearch = useDebounce((value: string) => {
- setSearchValue(value);
- });
-
- const handleFieldChange = (value: string) => {
- setFieldValue(value);
- };
-
- const handleBlur = () => {
- setSearchValue("");
- setFieldValue("");
- };
-
- const { data, isLoading } = useGetAllTag({
- name: searchValue,
- });
-
- const [t] = useTranslation();
-
- const options = data?.data ?? [];
- const additionalData =
- options.length < 1 && searchValue.length > 1 && !isLoading
- ? [{ id: searchValue, name: searchValue }]
- : [];
-
- const value =
- formik?.values?.tags?.map((item: any) => item?.id ?? item) ?? [];
-
- const AllOptions = [...options, ...additionalData];
-
- return (
- ();
- const handleSubmit = ( values: any) => {
+ const handleFormSubmit = ( values: any) => {
const DataToSend = structuredClone(values);
setTagsSearch(null);
@@ -100,14 +99,14 @@ const AddPage: React.FC = () => {
mutate(NewQuestion);
}
};
- const handleValidateSingleQuestion = (values:any)=>{
+
+ const handleValidateSingleQuestion = (values:any,isValid:boolean,handleSubmit: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")}`);
@@ -123,22 +122,30 @@ const AddPage: React.FC = () => {
return false ;
}
if(haveImageOrContent){
- toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer_in_answer"))
+ toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
return false
}
+
+ console.log(1);
+
+ if(isValid){
+ handleSubmit(values)
+ }
}
- const handleValidateBaseQuestion = (values: any) => {
+ const handleValidateBaseQuestion = (values: any,isValid:boolean,handleSubmit: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;
}
-
- values?.Questions?.every((Question: any, QuestionsIndex: number) => {
+ console.log(1);
+
+ const isValidate = values?.Questions?.every((Question: any, QuestionsIndex: number) => {
const content = Question.content ;
@@ -180,9 +187,15 @@ const AddPage: React.FC = () => {
return false
}
- return true;
+ return true
});
+ console.log(1);
+
+ if(isValid && isValidate){
+ console.log(2);
+ handleSubmit(values)
+ }
};
@@ -213,12 +226,13 @@ const AddPage: React.FC = () => {
- {({ values,handleSubmit }) => (
+ {({ values,isValid,handleSubmit }) => (
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index af248df..cb6b529 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -28,10 +28,11 @@ import { Form, Formik } from "formik";
import { MdOutlineArrowForwardIos } from "react-icons/md";
import { SettingFilled } from "@ant-design/icons";
import { CheckboxProps } from "antd/lib";
+import { LocalStorageEnum } from "../../../enums/LocalStorageEnum";
const EditPage: React.FC = () => {
const { subject_id, lesson_id, question_id } = useParams();
- const { isBseQuestion, setIsBseQuestion, setTagsSearch, DeletedQuestions , ShowHint,setShowHint } =
+ const { isBseQuestion, setIsBseQuestion, setTagsSearch, DeletedQuestions , ShowHint,setShowHint , ShowLatexOption,setShowLatexOption } =
useObjectToEdit();
const { mutate, isSuccess, isLoading } = useUpdateQuestion();
@@ -45,6 +46,7 @@ const EditPage: React.FC = () => {
const { data: Questions, isLoading: QuestionsDataLoading } =
useGetAllQuestion({
parent_id: question_id,
+ isPaginated:false
});
const objectToEdit = { ...data?.data, Questions: Questions?.data };
@@ -189,20 +191,19 @@ const EditPage: React.FC = () => {
navigate(-1);
};
-
- const handleValidateSingleQuestion = (values:any)=>{
+ const handleValidateSingleQuestion = (values:any,isValid:boolean,handleSubmit: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 ;
@@ -215,12 +216,28 @@ const EditPage: React.FC = () => {
toast.error(t("validation.one_of_image_and_content_should_be_enter_in_answer"))
return false
}
+
+ console.log(1);
+
+ if(isValid){
+ handleSubmit(values)
+ }
}
-
-const handleValidateBaseQuestion = (values: any) => {
- const haveAnswers = values?.Questions?.every((Question: any, QuestionsIndex: number) => {
+const handleValidateBaseQuestion = (values: any,isValid:boolean,handleSubmit: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 ;
@@ -231,13 +248,15 @@ const handleValidateBaseQuestion = (values: any) => {
}
- //// answers
+ //// answers
const answers = Question?.answers;
- const haveAnswers = answers?.length > 0;
+ 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) )
+ 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"));
@@ -259,14 +278,18 @@ const handleValidateBaseQuestion = (values: any) => {
return false
}
-
- return true;
+ return true
});
- console.log(haveAnswers, "haveAnswers");
+ console.log(1);
+
+if(isValid && isValidate){
+ console.log(2);
+ handleSubmit(values)
+}
+
};
-
const handleNavigateToPage = () => {
const cleanedUrl = location.pathname.replace(/\/Question\/\d+$/, "");
navigate(cleanedUrl);
@@ -279,17 +302,29 @@ const handleNavigateToPage = () => {
}
}, [isSuccess]);
- const onChange: CheckboxProps['onChange'] = (e) => {
+ 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 = (
-
- : t("practical.not_found")}
- onSearch={(value) => {
- handleSearch(value);
- handleFieldChange(value);
- }}
- searchValue={fieldValue}
- onDropdownVisibleChange={(open) => {
- if (!open) {
- handleBlur();
- }
- }}
- value={value}
- />
-
- );
-};
-
-export default SelectTag;
diff --git a/src/Pages/Admin/Tags/useTableColumns.tsx b/src/Pages/Admin/Tags/useTableColumns.tsx
index b1c16d1..c9dbc18 100644
--- a/src/Pages/Admin/Tags/useTableColumns.tsx
+++ b/src/Pages/Admin/Tags/useTableColumns.tsx
@@ -34,6 +34,7 @@ export const useColumns = () => {
dataIndex: "name",
key: "name",
align: "center",
+ ellipsis:true
},
{
diff --git a/src/Pages/Admin/Unit/useTableColumns.tsx b/src/Pages/Admin/Unit/useTableColumns.tsx
index fff47fd..062dcd2 100644
--- a/src/Pages/Admin/Unit/useTableColumns.tsx
+++ b/src/Pages/Admin/Unit/useTableColumns.tsx
@@ -66,6 +66,7 @@ export const useColumns = () => {
key: "name",
align: "center",
render: (text) => text,
+ ellipsis:true
},
{
diff --git a/src/Pages/Admin/lesson/useTableColumns.tsx b/src/Pages/Admin/lesson/useTableColumns.tsx
index a44817d..a9a166c 100644
--- a/src/Pages/Admin/lesson/useTableColumns.tsx
+++ b/src/Pages/Admin/lesson/useTableColumns.tsx
@@ -61,6 +61,7 @@ export const useColumns = () => {
key: "name",
align: "center",
render: (text, record) => record?.name,
+ ellipsis:true
},
{
// canAddLesson ? (
diff --git a/src/Pages/Admin/question/AddPage.tsx b/src/Pages/Admin/question/AddPage.tsx
index 78a951a..6345d98 100644
--- a/src/Pages/Admin/question/AddPage.tsx
+++ b/src/Pages/Admin/question/AddPage.tsx
@@ -20,20 +20,19 @@ import ModelForm from "./Model/ModelForm";
import { toast } from "react-toastify";
import { Form, Formik } from "formik";
import { MdOutlineArrowForwardIos } from "react-icons/md";
-import { getCharFromNumber } from "../../../utils/getCharFromNumber";
const AddPage: React.FC = () => {
const location = useLocation();
const { mutateAsync,isLoading:LoadingAsync } = useAddQuestionAsync();
const { mutate, isLoading, isSuccess } = useAddQuestion();
- const { isBseQuestion, setTagsSearch, setSuccess , ShowHint,setShowHint } =
+ const { isBseQuestion, setTagsSearch, setSuccess } =
useObjectToEdit();
const [t] = useTranslation();
const { subject_id, lesson_id } = useParams
-
+
{ t("header.show_hint")}
+
+ { t("header.show_MMl")}
+
+
+
);
@@ -316,7 +351,7 @@ const handleNavigateToPage = () => {
validationSchema={getValidationSchemaBase}
enableReinitialize
>
- {({ values,handleSubmit }) => (
+ {({ values,isValid,handleSubmit }) => (