From 2df73211a1ec5067399473bd6dfe1fe9f39269e2 Mon Sep 17 00:00:00 2001
From: karimalden <mhmadkarimaldeen@gmail.com>
Date: Wed, 26 Jun 2024 17:08:57 +0300
Subject: [PATCH] end_question

---
 src/Pages/question/AddPage.tsx                | 6 ++++--
 src/Pages/question/EditPage.tsx               | 1 +
 src/Pages/question/Model/Add.tsx              | 4 ++--
 src/Pages/question/Model/Tags/DynamicTags.tsx | 2 +-
 src/Pages/question/Model/formUtil.ts          | 6 ------
 src/Styles/Pages/exercise.scss                | 1 +
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Pages/question/AddPage.tsx b/src/Pages/question/AddPage.tsx
index 4a13877..1d454da 100644
--- a/src/Pages/question/AddPage.tsx
+++ b/src/Pages/question/AddPage.tsx
@@ -19,7 +19,7 @@ const AddPage: React.FC = () => {
 
 
   const { mutate, isSuccess, isLoading ,mutateAsync} = useAddQuestion();
-  const {object_to_edit,set_Tags_search} = useObjectToEdit()
+  const {object_to_edit,set_Tags_search,set_object_to_edit} = useObjectToEdit()
 
   const {subject_id} = useParams<ParamsEnum>()
   const {isBseQuestion,set_isBseQuestion} = useObjectToEdit()
@@ -68,7 +68,9 @@ const AddPage: React.FC = () => {
   useEffect(() => {
       if(isSuccess){
         toast.success(t("validation.the_possess_done_successful"))
-        navigate(-1)
+        // navigate(-1)
+        set_object_to_edit(null)
+        
 
       }
   }, [isSuccess])
diff --git a/src/Pages/question/EditPage.tsx b/src/Pages/question/EditPage.tsx
index e875791..d9b37d7 100644
--- a/src/Pages/question/EditPage.tsx
+++ b/src/Pages/question/EditPage.tsx
@@ -55,6 +55,7 @@ const EditPage: React.FC = () => {
         if( typeof UpdateBseQuestion?.image === "string"){
           delete UpdateBseQuestion["image"]
         }
+        console.log(UpdateBseQuestion);
         
         mutate(UpdateBseQuestion)
 
diff --git a/src/Pages/question/Model/Add.tsx b/src/Pages/question/Model/Add.tsx
index 68290e8..f489864 100644
--- a/src/Pages/question/Model/Add.tsx
+++ b/src/Pages/question/Model/Add.tsx
@@ -43,14 +43,14 @@ const Form = () => {
 
 
 
-  useKeyPress('q', 'ctrlKey', handleAddChoice);
+  // useKeyPress('q', 'ctrlKey', handleAddChoice);
 
 
   const handleFocusChoice = (index:number) => {
     const selectedInput = document.getElementById(`choice_${index}`);
     if (selectedInput) {
       selectedInput.focus();
-    }
+    } 
   };
 
   // useKeyPress('1', 'ctrlKey', handleFocusChoice(1));
diff --git a/src/Pages/question/Model/Tags/DynamicTags.tsx b/src/Pages/question/Model/Tags/DynamicTags.tsx
index 5d5087f..35de55d 100644
--- a/src/Pages/question/Model/Tags/DynamicTags.tsx
+++ b/src/Pages/question/Model/Tags/DynamicTags.tsx
@@ -21,7 +21,7 @@ const DynamicTags = () => {
   const handleAddChoice = () => {
     const length = formik?.values?.tags.length;
     const lastElement = formik?.values?.tags[length - 1]?.name;
-    set_Tags_search(null)
+    set_Tags_search
     if(lastElement !== ""){
       formik.setFieldValue('tags', [...(formik?.values  as any)?.tags as any[],
     
diff --git a/src/Pages/question/Model/formUtil.ts b/src/Pages/question/Model/formUtil.ts
index d5783ae..66796f6 100644
--- a/src/Pages/question/Model/formUtil.ts
+++ b/src/Pages/question/Model/formUtil.ts
@@ -64,8 +64,6 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
     image: objectToEdit?.image ?? "",
     subject_id: objectToEdit?.subject_id ?? '',
     isBase:  objectToEdit?.isBase,
-    max_mark: questions.length ?? 1,
-    min_mark_to_pass: 1,
     parent_id: objectToEdit?.parent_id ?? '',
     Questions: questions,
   };
@@ -76,14 +74,10 @@ export const getValidationSchemaBase = () => {
   return Yup.object().shape({
     image: Yup.string().nullable(),
     content: Yup.string().required("validation.required"),
-    max_mark: Yup.number().required("validation.required").min(Yup.ref("min_mark_to_pass"),"validation.max_mark_must_be_greater_than_min_mark_to_pass"),
-    min_mark_to_pass: Yup.number().required("validation.required"),
     Questions: Yup.array().of(
       Yup.object().shape({
         image: Yup.string().nullable(),
         content: Yup.string().required("validation.required"),
-        max_mark: Yup.number().required("validation.required").min(Yup.ref("min_mark_to_pass"),"validation.max_mark_must_be_greater_than_min_mark_to_pass"),
-        min_mark_to_pass: Yup.number().required("validation.required"),
         QuestionOptions: Yup.array().of(
           Yup.object().shape({
             answer: Yup.string().required("validation.required"),
diff --git a/src/Styles/Pages/exercise.scss b/src/Styles/Pages/exercise.scss
index 1c3b1d0..1c1384a 100644
--- a/src/Styles/Pages/exercise.scss
+++ b/src/Styles/Pages/exercise.scss
@@ -92,6 +92,7 @@
     display: flex;
     gap: 20px;
     margin-bottom: 29px;
+    flex-wrap: wrap;
 
     .suggested{
         all: unset;