Karimaldeen/school-dashboard-exercise
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

end_Questions

Browse Source
This commit is contained in:
karimalden 2024-06-26 16:00:54 +03:00
parent 8d9a38e1a9
commit 9ff014dff9
58 changed files with 385 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Hooks/useKeyPress.tsx Normal file
View File

@ -0,0 +1,22 @@
import { useEffect } from 'react';
type ModifierKey = 'ctrlKey' | 'shiftKey' | 'altKey' | 'metaKey';
const useKeyPress = (targetKey: string, modifierKey: ModifierKey, callback: () => void) => {
useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => {
if (event[modifierKey] && event.key === targetKey) {
event.preventDefault();
callback();
}
};
document.addEventListener('keydown', handleKeyDown);
return () => {
document.removeEventListener('keydown', handleKeyDown);
};
}, [targetKey, modifierKey, callback]);
};
export default useKeyPress;

5
src/Layout/Ui/NavBar.tsx
View File

@ -24,7 +24,8 @@ const NavBar = () => {
const translateArray = translateOptions(search_array, t);
const { course_id } = useParams<ParamsEnum>();
console.log(location);
const navigate = useNavigate();
const handelNavigate = () => {
@ -36,7 +37,7 @@ const NavBar = () => {
if (location.pathname === "/") {
return;
}
navigate(-1);
navigate(-1);
};
const { handel_open_model } = useModalHandler();

23
src/Pages/question/AddPage.tsx
View File

@ -2,7 +2,7 @@ import React, { useEffect } from "react";
import { Modal, Spin } from "antd";
import FormikForm from "../../Layout/Dashboard/FormikFormModel";
import ModelBody from "./Model/Add";
import { getInitialValues, getValidationSchema ,getInitialValuesBase, getValidationSchemaBase} from "./Model/formUtil";
import { getInitialValues, getValidationSchema ,getInitialValuesBase, getValidationSchemaBase, processTags} from "./Model/formUtil";
import { useAddQuestion } from "../../api/Question";
import { useTranslation } from "react-i18next";
import { useNavigate, useParams } from "react-router-dom";
@ -13,36 +13,43 @@ import Header from "../../Components/exercise/Header";
import { Question } from "../../types/Item";
import BaseForm from './Model/Malty/Add'
import Form from './Model/Add'
import { toast } from "react-toastify";
const AddPage: React.FC = () => {
const { mutate, isSuccess, isLoading ,mutateAsync} = useAddQuestion();
const {object_to_edit} = useObjectToEdit()
const {object_to_edit,set_Tags_search} = useObjectToEdit()
const {subject_id} = useParams<ParamsEnum>()
const {isBseQuestion,set_isBseQuestion} = useObjectToEdit()
const handleSubmit = (values: Question) => {
const DataToSend = structuredClone(values);
console.log(DataToSend,"DataToSend");
set_Tags_search(null)
if(isBseQuestion){
const newBseQuestion = {
"subject_id" : subject_id,
"content" : DataToSend?.content,
"image": DataToSend?.image ?? "",
"max_mark" : DataToSend?.max_mark,
"min_mark_to_pass" : DataToSend?.min_mark_to_pass,
"isBase" : 1,
}
mutateAsync(newBseQuestion).then((data)=>{
const newBseQuestionId = (data as any )?.data?.id ;
const Questions = DataToSend?.Questions;
Questions?.map((item:Question)=>{
const tags = processTags(item)
mutate({
...item,
parent_id:newBseQuestionId,
"subject_id" : subject_id,
tags
})
})
@ -51,12 +58,16 @@ const AddPage: React.FC = () => {
})
}else{
mutate({ ...values, subject_id:subject_id });
const tags = processTags(DataToSend)
console.log(tags);
mutate({ ...values, subject_id:subject_id , tags });
}
};
const navigate = useNavigate()
useEffect(() => {
if(isSuccess){
toast.success(t("validation.the_possess_done_successful"))
navigate(-1)
}
@ -132,3 +143,5 @@ const AddPage: React.FC = () => {
};
export default AddPage;

40
src/Pages/question/EditPage.tsx
View File

@ -1,7 +1,7 @@
import React, { useEffect } from "react";
import { Modal, Spin } from "antd";
import FormikForm from "../../Layout/Dashboard/FormikFormModel";
import { getInitialValues, getValidationSchema ,getInitialValuesBase, getValidationSchemaBase} from "./Model/formUtil";
import { getInitialValues, getValidationSchema ,getInitialValuesBase, getValidationSchemaBase, processTags} from "./Model/formUtil";
import { useAddQuestion, useGetAllQuestion, useUpdateQuestion } from "../../api/Question";
import { useQueryClient } from "react-query";
import { useTranslation } from "react-i18next";
@ -14,18 +14,19 @@ import Header from "../../Components/exercise/Header";
import Form from './Model/Edit'
import BaseForm from './Model/Malty/Edit'
import { Question } from "../../types/Item";
import { toast } from "react-toastify";
const EditPage: React.FC = () => {
const {question_id,subject_id} = useParams<ParamsEnum>()
const {isBseQuestion,set_isBseQuestion} = useObjectToEdit()
const {isBseQuestion,set_isBseQuestion,set_Tags_search} = useObjectToEdit()
const { mutate, isSuccess, isLoading } = useUpdateQuestion();
const { mutate:AddQuestion} = useAddQuestion();
const {data,isLoading:dataLoading}= useGetAllQuestion({show:question_id})
const {data:Questions,isLoading:QuestionsDataLoading}= useGetAllQuestion({parent_id:question_id})
const {data:Questions,isLoading:QuestionsDataLoading}= useGetAllQuestion({questionParentId:question_id})
const object_to_edit = {...data?.data,Questions:Questions?.data } ;
@ -40,41 +41,52 @@ const EditPage: React.FC = () => {
const handleSubmit = (values: any) => {
const DataToSend = structuredClone(values);
console.log(isBseQuestion);
if(isBseQuestion){
set_Tags_search(null)
console.log(DataToSend);
if(isBseQuestion){
console.log(1);
const UpdateBseQuestion = {
"id":DataToSend?.id,
"content" : DataToSend?.content,
"image": DataToSend?.image ?? "",
"max_mark" : DataToSend?.max_mark,
"min_mark_to_pass" : DataToSend?.min_mark_to_pass,
}
if( typeof UpdateBseQuestion?.image === "string"){
delete UpdateBseQuestion["image"]
}
mutate(UpdateBseQuestion)
const Questions = DataToSend?.Questions;
Questions?.map((item:Question)=>{
console.log(item);
const itemToSend = structuredClone(item);
const keysToRemove = ['image', 'answer_image'];
const updatedObject = removeStringKeys(itemToSend, keysToRemove);
console.log(updatedObject,"updatedObject");
if(updatedObject?.id){
const tags = processTags(updatedObject)
console.log(tags);
mutate({
...updatedObject,
tags
})
}else{
const tags = processTags(updatedObject)
console.log(tags);
AddQuestion({
...updatedObject,
parent_id:UpdateBseQuestion?.id,
subject_id:subject_id
subject_id:subject_id,
tags
})
}
@ -86,7 +98,10 @@ const EditPage: React.FC = () => {
const keysToRemove = ['image', 'answer_image'];
const updatedObject = removeStringKeys(DataToSend, keysToRemove);
mutate({ ...updatedObject });
delete updatedObject["parent_id"];
const tags = processTags(updatedObject)
console.log(tags);
mutate({ ...updatedObject,tags });
}
};
@ -99,6 +114,7 @@ const EditPage: React.FC = () => {
useEffect(() => {
if(isSuccess){
toast.success(t("validation.the_possess_done_successful"))
navigate(-1)
}
}, [isSuccess])

14
src/Pages/question/Model/Add.tsx
View File

@ -10,6 +10,7 @@ import { Choice } from "../../../types/Item";
import { useTranslation } from "react-i18next";
import DynamicTags from "./Tags/DynamicTags";
import { useGetAllQuestion } from "../../../api/Question";
import useKeyPress from "../../../Hooks/useKeyPress";
const Form = () => {
const formik = useFormikContext();
@ -32,11 +33,18 @@ const Form = () => {
{
answer:null,
answer_image:null,
isCorrect:0
isCorrect:0,
}])
}
const [t] = useTranslation()
useKeyPress('q', 'ctrlKey', handleAddChoice);
const selectedInput = document.getElementById("choice_1")
console.log(selectedInput,"selectedInput");
return (
<Row className="w-100">
<div className="exercise_form">
@ -55,12 +63,12 @@ const Form = () => {
{
(((formik?.values as any)?.QuestionOptions as Choice[])||[]) .map((item:Choice,index:number)=>{
return <ChoiceFields key={index} index={index} data={item}/>
return <ChoiceFields key={index} index={index} data={item}/>
}
)
}
<p className="add_new_button" >
<FaCirclePlus onClick={handleAddChoice} size={23} /> {t("header.add_new_choice")}
<FaCirclePlus onClick={handleAddChoice} size={23} /> {t("header.add_new_choice")}
</p>
<DynamicTags/>

94
src/Pages/question/Model/Delete.tsx Normal file
View File

@ -0,0 +1,94 @@
import React, { useEffect, useState } from "react";
import { Input, Modal, Spin } from "antd";
import { useModalState } from "../../../zustand/Modal";
import { ModalEnum } from "../../../enums/Model";
import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
import { useDeleteQuestion } from "../../../api/Question";
import { useTranslation } from "react-i18next";
const ModalForm: React.FC = () => {
const { isOpen, setIsOpen } = useModalState((state) => state);
const [inputValue, setInputValue] = useState("");
const { mutate, isLoading, isSuccess } = useDeleteQuestion();
const { object_to_edit, set_object_to_edit } = useObjectToEdit();
useEffect(() => {
if (isSuccess) {
setIsOpen("");
setInputValue("");
}
}, [isSuccess, setIsOpen]);
const handleSubmit = () => {
mutate({
id: Number(object_to_edit?.id),
});
};
const handleCancel = () => {
setInputValue("");
setIsOpen("");
set_object_to_edit({});
};
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
// Step 2: Handle changes to the input field
setInputValue(e.target.value);
};
const [t] = useTranslation();
return (
<>
<Modal
className="ModalForm"
centered
width={"40vw"}
footer={null}
open={isOpen === ModalEnum?.QUESTION_DELETE}
onCancel={handleCancel}
>
<header>
{t("practical.delete")} ({object_to_edit?.max_mark}){" "}
</header>
<main className="main_modal">
<div className="ValidationField w-100 mb-5">
<label className="text ">
{t("practical.to_confirm_deletion_please_re_enter")}{" "}
{t("input.max_mark")} {t("models.Question")}
</label>
<Input
size="large"
type="text"
placeholder={`${t("practical.enter")} ${t("input.max_mark")} ${t("models.Question")} `}
value={inputValue}
onChange={handleChange}
/>
</div>
<div className="buttons">
<div onClick={handleCancel}>{t("practical.cancel")}</div>
<button
className={
object_to_edit?.max_mark !== inputValue ? "disabled_button" : ""
}
disabled={object_to_edit?.max_mark !== inputValue || isLoading}
onClick={handleSubmit}
>
{t("practical.delete")}
{isLoading && (
<span className="Spinier_Div">
<Spin />
</span>
)}
</button>
</div>
</main>
</Modal>
</>
);
};
export default ModalForm;

4
src/Pages/question/Model/Edit.tsx
View File

@ -12,7 +12,7 @@ import DynamicTags from "./Tags/DynamicTags";
import { useGetAllQuestion } from "../../../api/Question";
const Form = () => {
const formik = useFormikContext();
const formik = useFormikContext<any>();
const { isOpen } = useModalState((state) => state);
// const {data} = useGetAllQuestion();
@ -27,6 +27,8 @@ const Form = () => {
const handleAddChoice = () => {
formik.setFieldValue('QuestionOptions', [...(formik?.values as any)?.QuestionOptions as Choice[],
{

2
src/Pages/question/Model/Field/ChoiceFields.tsx
View File

@ -16,7 +16,7 @@ const ChoiceFields = ({index,data}:{index:number , data :Choice }) => {
<div className='ChoiceFields'>
<TextField className="textarea_exercise" placeholder={"choice"} label2={t(`input.choice`) + ` ` + `(${(getCharFromNumber(index))})` } name={index} type="TextArea" />
<TextField className="textarea_exercise" placeholder={"choice"} label2={t(`input.choice`) + ` ` + `(${(getCharFromNumber(index))})` } name={index} id={`choice_${index}`} type="TextArea" />
<File className="file_exercise" label={"attachment"} name={index} type="File" />
<CheckboxField className="" label="The_correct_answer" name={index} type="Checkbox" />

3
src/Pages/question/Model/Field/TextField.tsx
View File

@ -15,6 +15,7 @@ const TextField = ({
props,
no_label,
label_icon,
id,
className
}: any) => {
const newName = `QuestionOptions[${name}].answer`
@ -60,7 +61,7 @@ const TextField = ({
maxLength={1000}
onChange={onChange || TextFilehandleChange}
style={{height:120}}
id={id}
/>
</Form.Item>

94
src/Pages/question/Model/Malty/Add.tsx
View File

@ -25,7 +25,8 @@ const Form = () => {
}, [isOpen]);
// console.log(formik?.errors);
console.log(formik?.values?.Questions,"formik?.values?.Questions");
const handleAddChoice = (parent_index:number) => {
console.log(parent_index);
@ -64,57 +65,58 @@ const Form = () => {
return (
<Row className="w-100">
<div className="exercise_form">
<div className="exercise_form">
<ValidationField className="textarea_exercise" name="content" label="main_question" type="TextArea" />
<ValidationField className="file_exercise" name="image" label="attachment" type="File" />
<div className="">
<ValidationField name="max_mark" label="max_mark" type="Number" className="inputSmall" disabled />
<ValidationField name="min_mark_to_pass" label="min_mark_to_pass" className="inputSmall" type="Number" />
<ValidationField className="textarea_exercise" name="content" label="main_question" type="TextArea" />
<ValidationField className="file_exercise" name="image" label="attachment" type="File" />
{/* <div className="">
<ValidationField name="max_mark" label="max_mark" type="Number" className="inputSmall" disabled />
<ValidationField name="min_mark_to_pass" label="min_mark_to_pass" className="inputSmall" type="Number" />
</div>
<div>
</div> */}
<div>
</div>
</div>
<div className=" flex ">
</div>
{
(((formik?.values as any)?.Questions)||[])?.map((item:Choice,parent_index:number)=>{
return (
<div key={parent_index}>
<div className="exercise_form">
</div>
<div className=" flex ">
</div>
{
(((formik?.values as any)?.Questions as Choice[])||[]) .map((item:Choice,parent_index:number)=>{
return (
<div key={parent_index}>
<div className="exercise_form">
</div>
{
(((formik?.values as any)?.Questions?.[parent_index]?.QuestionOptions as Choice[])||[]) .map((item:Choice,index:number)=>{
return <ChoiceFields key={index} parent_index={parent_index} index={index} data={item}/>
}
)
}
<p className="add_new_button" >
<FaCirclePlus onClick={()=> handleAddChoice(parent_index)} size={23} /> {t("header.add_new_choice")}
</p>
<DynamicTags parent_index={parent_index} />
</div>
)
}
<QuestionFIeld key={parent_index} index={parent_index} data={item}/>
</div>
{
(((formik?.values as any)?.Questions?.[parent_index]?.QuestionOptions)||[]) .map((item:Choice,index:number)=>{
return <ChoiceFields key={index} parent_index={parent_index} index={index} data={item}/>
}
)
}
<p className="add_new_button" >
<FaCirclePlus onClick={()=> handleAddChoice(parent_index)} size={23} /> {t("header.add_new_choice")}
</p>
<DynamicTags parent_index={parent_index} />
</div>
)
}
<p className="add_new_button" >
<FaCirclePlus onClick={handleAddQuestion} size={23} /> {t("header.add_new_question")}
</p>
</Row>
}
)
}
<p className="add_new_button" >
<FaCirclePlus onClick={handleAddQuestion} size={23} /> {t("header.add_new_question")}
</p>
</Row>
);
};

61
src/Pages/question/Model/Malty/Edit.tsx
View File

@ -28,37 +28,38 @@ const Form = () => {
const [t] = useTranslation()
const handleAddChoice = (parent_index:number) => {
console.log(parent_index);
formik.setFieldValue(`Questions.[${parent_index}].QuestionOptions`, [...(formik?.values as any)?.Questions?.[parent_index].QuestionOptions,
{
answer:null,
answer_image:null,
isCorrect:0
}])
}
const handleAddQuestion = () => {
formik.setFieldValue('Questions', [...(formik?.values as any)?.Questions,
const handleAddChoice = (parent_index:number) => {
console.log(parent_index);
console.log(formik?.values?.Questions);
formik.setFieldValue(`Questions.[${parent_index}].QuestionOptions`, [...(formik?.values as any)?.Questions?.[parent_index].QuestionOptions as Choice[],
{
content: "",
image: "",
parent: '',
isBase: 0,
max_mark: 1,
min_mark_to_pass: 1,
QuestionOptions: [{ answer: null, answer_image: null, isCorrect: 0 }],
tags: []
answer:null,
answer_image:null,
isCorrect:0
}])
const max_mark = formik?.values?.max_mark + 1
formik.setFieldValue('max_mark', max_mark)
}
const handleAddQuestion = () => {
formik.setFieldValue('Questions', [...(formik?.values as any)?.Questions as Choice[],
{
content: "",
image: "",
parent: '',
isBase: 0,
max_mark: 1,
min_mark_to_pass: 1,
QuestionOptions: [{ answer: null, answer_image: null, isCorrect: 0 }],
tags: []
}])
const max_mark = formik?.values?.max_mark + 1
formik.setFieldValue('max_mark', max_mark)
}
console.log(formik?.values);
return (
@ -68,11 +69,11 @@ const Form = () => {
<ValidationField className="textarea_exercise" name="content" label="main_question" type="TextArea" />
<ValidationField className="file_exercise" name="image" label="attachment" type="File" />
<div className="">
{/* <div className="">
<ValidationField name="max_mark" label="max_mark" type="Number" className="inputSmall" disabled />
<ValidationField name="min_mark_to_pass" label="min_mark_to_pass" className="inputSmall" type="Number" />
</div>
</div> */}
<div>
</div>

8
src/Pages/question/Model/Malty/Tags/DynamicTags.tsx
View File

@ -20,7 +20,8 @@ const DynamicTags = ({parent_index}:{parent_index:number}) => {
const handleAddChoice = () => {
const length = formik?.values?.Questions?.[parent_index]?.tags.length;
const lastElement = formik?.values?.Questions?.[parent_index]?.tags[length - 1]?.name;
set_Tags_search(null)
if(lastElement !== ""){
formik.setFieldValue(`Questions.[${parent_index}].tags`, [...(formik?.values as any)?.Questions?.[parent_index]?.tags as any[],
@ -40,7 +41,7 @@ const DynamicTags = ({parent_index}:{parent_index:number}) => {
const handleChoice = (item: any) => {
const length = formik.values.tags.length;
const length = formik?.values?.Questions?.[parent_index]?.tags?.length;
console.log(currentTag);
formik.setFieldValue(`Questions.[${parent_index}].tags[${currentTag}]`, {...item,key:length});
@ -53,7 +54,7 @@ const handleChoice = (item: any) => {
return (
<div className='DynamicTags'>
{formik?.values?.tags?.length < 1 &&
{formik?.values?.Questions?.[parent_index]?.tags?.length < 1 &&
<p className="add_new_button" >
<FaCirclePlus size={23} onClick={handleAddChoice} /> {t("header.add_tag")}
@ -79,6 +80,7 @@ return (
{formik?.values?.Questions?.[parent_index]?.tags?.length > 0 &&
<p className="add_new_button" >
<FaCirclePlus onClick={handleAddChoice} size={20} />
</p>

7
src/Pages/question/Model/Malty/Tags/Tag.tsx
View File

@ -9,7 +9,8 @@ const Tag = ({ data, index,parent_index }: { data: any, index: number,parent_ind
const DEBOUNCE_DELAY = 500;
const formik = useFormikContext<any>();
const { set_Tags_search ,set_currentTag,set_current_parent_index} = useObjectToEdit();
console.log(formik?.values?.Questions);
useEffect(() => {
if (inputRef.current) {
inputRef.current.style.width = `${(formik?.values?.Questions?.[parent_index]?.tags[index]?.name?.length + 1) * 8}px`;
@ -18,7 +19,9 @@ const Tag = ({ data, index,parent_index }: { data: any, index: number,parent_ind
const handleEditInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
// console.log(e.target.value);
formik.setFieldValue(`Questions.[${parent_index}].tags[${index}].name`, e.target.value);
formik.setFieldValue(`Questions.[${parent_index}].tags[${index}]`, {key:parent_index, name :e.target.value , id:`${parent_index}_key`});
set_currentTag(index)
set_current_parent_index(parent_index)
if (timeoutRef.current) {

3
src/Pages/question/Model/Tags/DynamicTags.tsx
View File

@ -15,12 +15,13 @@ const DynamicTags = () => {
name : Tags_search
})
const suggests = data?.data
console.log(Tags_search);
const handleAddChoice = () => {
const length = formik?.values?.tags.length;
const lastElement = formik?.values?.tags[length - 1]?.name;
set_Tags_search(null)
if(lastElement !== ""){
formik.setFieldValue('tags', [...(formik?.values as any)?.tags as any[],

2
src/Pages/question/Model/Tags/Tag.tsx
View File

@ -19,6 +19,8 @@ const Tag = ({ data, index }: { data: any, index: number }) => {
// console.log(e.target.value);
formik.setFieldValue(`tags[${index}].name`, e.target.value);
// set_Tags_search(e.target.value)
formik.setFieldValue(`tags.[${index}]`, {key:index, name :e.target.value , id:`${index}_key`});
set_currentTag(index)
if (timeoutRef.current) {
clearTimeout(timeoutRef.current);

41
src/Pages/question/Model/formUtil.ts
View File

@ -13,9 +13,7 @@ export const getInitialValues = (objectToEdit: Question): any => {
image: objectToEdit?.image ?? "",
subject_id: objectToEdit?.subject_id ?? '',
isBase: objectToEdit?.isBase,
max_mark: 1,
min_mark_to_pass: 1,
parent: objectToEdit?.parent ?? '',
parent_id: objectToEdit?.parent_id ?? '',
QuestionOptions: objectToEdit?.QuestionOptions ?? [],
tags: tags ?? [],
};
@ -26,8 +24,6 @@ export const getValidationSchema = () => {
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"),
QuestionOptions: Yup.array().of(
Yup.object().shape({
answer: Yup.string().required("validation.required"),
@ -46,7 +42,20 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
});
console.log(objectToEdit);
const questions = objectToEdit?.Questions ?? [];
const newQuestions = objectToEdit?.Questions?.map((item: any) => {
const tags = item?.tags?.map((tag: any) => ({
id: tag?.id,
name: tag?.name,
key: `${tag?.id}_key_${tag?.name}`
}));
return {
...item,
tags
};
});
const questions = newQuestions ?? [];
return {
@ -57,8 +66,7 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
isBase: objectToEdit?.isBase,
max_mark: questions.length ?? 1,
min_mark_to_pass: 1,
parent: objectToEdit?.parent ?? '',
tags: tags ?? [],
parent_id: objectToEdit?.parent_id ?? '',
Questions: questions,
};
};
@ -88,3 +96,20 @@ export const getValidationSchemaBase = () => {
});
};
export function processTags(DataToSend: any) {
const oldTags = DataToSend?.tags?.map((item: any, index: number) => {
if (typeof item?.id === "number") {
return item?.id;
}
}).filter((item:any) => item !== undefined);
const newTags = DataToSend?.tags?.map((item: any, index: number) => {
if (typeof item?.id === "string") {
return { name: item?.name };
}
}).filter((item:any) => item !== undefined);
return { new:newTags, old:oldTags };
}

3
src/Pages/question/Page.tsx
View File

@ -1,7 +1,7 @@
import { useTranslation } from "react-i18next";
import { lazy, Suspense } from 'react';
import { Spin } from "antd";
import DeleteModel from './Model/Delete'
const Table = lazy(() => import('./Table'));
const TableHeader = () => {
@ -17,6 +17,7 @@ const TableHeader = () => {
</header>
<Table />
</Suspense>
<DeleteModel/>
</div>
);

2
src/Pages/question/Table.tsx
View File

@ -7,7 +7,7 @@ import { ParamsEnum } from "../../enums/params";
const App: React.FC = () => {
const {subject_id} = useParams<ParamsEnum>()
const response = useGetAllQuestion({ subject_id:subject_id, pagination: true});
const response = useGetAllQuestion({ subject_id:subject_id, pagination: true });
return <DataTable response={response} useColumns={useColumns} />;
};

20
src/Pages/question/useTableColumns.tsx
View File

@ -14,15 +14,18 @@ import { ABILITIES_ENUM, ABILITIES_VALUES_ENUM } from "../../enums/abilities";
import { formatNumber } from "../../utils/formatNumber";
import { BsEyeFill } from "react-icons/bs";
import { useNavigate } from "react-router-dom";
import { useModalState } from "../../zustand/Modal";
export const useColumns = () => {
const { handel_open_model } = useModalHandler();
const { set_object_to_edit } = useObjectToEdit((state) => state);
const navigate = useNavigate()
const { setIsOpen } = useModalState((state) => state);
const handelShow = (record: any) => {
navigate(`${ABILITIES_ENUM.QUESTION}/${record?.id}`);
const handelAdd = () => {
set_object_to_edit({})
navigate(`${ABILITIES_ENUM?.QUESTION}/add`)
};
const can_edit_Question = hasAbility(
@ -43,6 +46,8 @@ export const useColumns = () => {
);
const handelDelete = (data: any) => {
set_object_to_edit(data);
setIsOpen(ModalEnum?.QUESTION_DELETE);
};
const handleEdit = (record: any) => {
@ -67,19 +72,18 @@ export const useColumns = () => {
align: "center",
render: (text, record) => record?.content,
},
{
title: t("columns.description"),
dataIndex: "description",
key: "description",
title: t("columns.isBase"),
dataIndex: "isBase",
key: "isBase",
align: "center",
render: (text, record) => record?.max_mark,
render: (text, record) => record?.isBase === 1 ? t("practical.yes") : t ("practical.no"),
},
{
title: can_add_Question ? (
<button
onClick={() => navigate(`${ABILITIES_ENUM?.QUESTION}/add`) }
onClick={() => handelAdd() }
className="add_button"
>
{t("practical.add")} {t("models.Question")} <FaPlus />

4
src/api/Question.ts
View File

@ -14,8 +14,8 @@ const KEY = "question";
export const useGetAllQuestion = (params?: any) =>
useGetQuery(KEY, API.GET, params);
export const useAddQuestion = () => useAddMutation(KEY, API.ADD);
export const useAddQuestion = () => useAddMutation(KEY, API.ADD,false);
export const useUpdateQuestion = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET,false);
export const useDeleteQuestion = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/ability.ts
View File

@ -16,6 +16,6 @@ export const useGetAllAbility = (params?: any) =>
useGetQuery(KEY, API.GET, params);
export const useAddAbility = () => useAddMutation(KEY, API.ADD);
export const useUpdateAbility = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteAbility = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/absence.ts
View File

@ -15,4 +15,4 @@ export const useGetAllAbsence = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddAbsence = () => useAddMutation(KEY, API.ADD);
export const useUpdateAbsence = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);

2
src/api/admin.ts
View File

@ -16,7 +16,7 @@ export const useGetAllAdmin = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddAdmin = () => useAddMutation(KEY, API.ADD);
export const useUpdateAdmin = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteAdmin = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/attendence.ts
View File

@ -15,4 +15,4 @@ export const useGetAllAttendence = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddAttendence = () => useAddMutation(KEY, API.ADD);
export const useUpdateAttendence = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);

2
src/api/auth.ts
View File

@ -6,4 +6,4 @@ const API = {
LOGOUT: `logout`,
};
export const useLoginAdmin = () =>
useAddMutation(KEY, API.LOGIN, "تسجيل الدخول");
useAddMutation(KEY, API.LOGIN,false);

2
src/api/branch.ts
View File

@ -16,6 +16,6 @@ export const useGetAllBranch = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddBranch = () => useAddMutation(KEY, API.ADD);
export const useUpdateBranch = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteBranch = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

4
src/api/config.ts
View File

@ -1,5 +1,5 @@
// export const BaseURL = "http://192.168.1.108:8000/api/";
export const BaseURL = "http://127.0.0.1:8000/api/";
export const BaseURL = "http://192.168.1.108:8000/api/";
// export const BaseURL = "http://127.0.0.1:8000/api/";
// export const BaseURL = "https://school-back-dev.point-dev.net/api/";

2
src/api/course.ts
View File

@ -16,6 +16,6 @@ export const useGetAllCourse = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddCourse = () => useAddMutation(KEY, API.ADD);
export const useUpdateCourse = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteCourse = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/cycle.ts
View File

@ -16,6 +16,6 @@ export const useGetAllCycle = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddCycle = () => useAddMutation(KEY, API.ADD);
export const useUpdateCycle = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteCycle = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/eduClass.ts
View File

@ -16,6 +16,6 @@ export const useGetAllEduClass = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddEduClass = () => useAddMutation(KEY, API.ADD);
export const useUpdateEduClass = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteEduClass = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/exam.ts
View File

@ -16,6 +16,6 @@ export const useGetAllExam = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddExam = () => useAddMutation(KEY, API.ADD);
export const useUpdateExam = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteExam = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/examTypes.ts
View File

@ -16,6 +16,6 @@ export const useGetAllExamTypes = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddExamTypes = () => useAddMutation(KEY, API.ADD);
export const useUpdateExamTypes = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteExamTypes = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/example.ts
View File

@ -16,6 +16,6 @@ export const useGetAllexamle = (params?: any) =>
useGetQuery(KEY, API.GET, params);
export const useAddexamle = () => useAddMutation(KEY, API.ADD);
export const useUpdateexamle = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteexamle = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

4
src/api/helper/useAddMutation.ts
View File

@ -7,7 +7,8 @@ import { AxiosResponse } from "../../types/Axios";
function useAddMutation(
key: string,
url: string,
message?: string,
toast:boolean = true
): UseMutationResult<AxiosResponse, unknown, any, unknown> {
const axios = useAxios();
return useMutation<AxiosResponse, unknown, any, unknown>(
@ -18,6 +19,7 @@ function useAddMutation(
headers: {
"Content-Type": "multipart/form-data",
[HEADER_KEY]: key,
["X-Custom-Message"] : toast
},
});
return data;

8
src/api/helper/useAxios.ts
View File

@ -42,16 +42,22 @@ function useAxios() {
const method = response.config.method;
const key = response.config.headers[HEADER_KEY];
const isToasted = response.config.headers["X-Custom-Message"];
const ResponseMessage =
responseMsg || t("validation.the_possess_done_successful");
if (method !== AxiosQueryEnum?.GET) {
queryClient.invalidateQueries(key);
toast.success(ResponseMessage);
if(isToasted){
toast.success(ResponseMessage);
}
setValidation([{}]);
}
return response;
},
function (error) {
const status = error?.request?.status;
const errorMsg = error?.response?.data?.message;
const errorField = error?.response?.data;

4
src/api/helper/useDeleteMutation.ts
View File

@ -10,7 +10,8 @@ type DataToSend = {
function useDeleteMutation(
key: any,
url: string,
message?: string,
toast:boolean = true
): UseMutationResult<AxiosResponse, unknown, DataToSend, unknown> {
const axios = useAxios();
return useMutation<AxiosResponse, unknown, DataToSend, unknown>(
@ -18,6 +19,7 @@ function useDeleteMutation(
const { data } = await axios.delete(url + `/` + dataToSend?.id, {
headers: {
[HEADER_KEY]: key,
["X-Custom-Message"] : toast
},
});
return data;

4
src/api/helper/useUpdateMutation.ts
View File

@ -6,7 +6,8 @@ import { AxiosResponse } from "../../types/Axios";
const useUpdateMutation = (
key: string,
url: string,
message?: string,
toast:boolean = true
): UseMutationResult<AxiosResponse, any, any, any> => {
const axios = useAxios();
@ -27,6 +28,7 @@ const useUpdateMutation = (
headers: {
"Content-Type": "multipart/form-data",
[HEADER_KEY]: key,
["X-Custom-Message"] : toast
},
});
return data;

2
src/api/lateArrival.ts
View File

@ -15,4 +15,4 @@ export const useGetAllLateArrival = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddLateArrival = () => useAddMutation(KEY, API.ADD);
export const useUpdateLateArrival = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);

2
src/api/lesson.ts
View File

@ -16,6 +16,6 @@ export const useGetAllLesson = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddLesson = () => useAddMutation(KEY, API.ADD);
export const useUpdateLesson = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteLesson = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/mark.ts
View File

@ -16,6 +16,6 @@ export const useGetAllMark = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddMark = () => useAddMutation(KEY, API.ADD);
export const useUpdateMark = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteMark = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/note.ts
View File

@ -16,6 +16,6 @@ export const useGetAllNote = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddNote = () => useAddMutation(KEY, API.ADD);
export const useUpdateNote = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteNote = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/payment.ts
View File

@ -18,7 +18,7 @@ export const useGetAllPayment = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddPayment = () => useAddMutation(KEY, API.ADD);
export const useUpdatePayment = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeletePayment = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/presence.ts
View File

@ -15,4 +15,4 @@ export const useGetAllPresence = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddPresence = () => useAddMutation(KEY, API.ADD);
export const useUpdatePresence = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);

2
src/api/registrationRecord.ts
View File

@ -16,6 +16,6 @@ export const useGetAllRegistrationRecord = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddRegistrationRecord = () => useAddMutation(KEY, API.ADD);
export const useUpdateRegistrationRecord = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteRegistrationRecord = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/role.ts
View File

@ -22,7 +22,7 @@ export const useGetRole = (params?: any, options?: any) =>
export const useAddRole = () => useAddMutation(KEY, API.ADD);
export const useUpdateRole = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteRole = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/semantics.ts
View File

@ -16,6 +16,6 @@ export const useGetAllSemantics = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddSemantics = () => useAddMutation(KEY, API.ADD);
export const useUpdateSemantics = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteSemantics = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/session.ts
View File

@ -17,6 +17,6 @@ export const useGetAllSession = (params?: any, options?: any) =>
useGetQuery(GetKey, API.GET, params, options);
export const useAddSession = () => useAddMutation(KEY, API.ADD);
export const useUpdateSession = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteSession = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/sessionContent.ts
View File

@ -16,6 +16,6 @@ export const useGetAllSessionContent = (params?: any) =>
useGetQuery(KEY, API.GET, params);
export const useAddSessionContent = () => useAddMutation(KEY, API.ADD);
export const useUpdateSessionContent = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteSessionContent = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/student.ts
View File

@ -22,7 +22,7 @@ export const useGetStudent = (params?: any, options?: any) =>
export const useAddStudent = () => useAddMutation(KEY, API.ADD);
export const useUpdateStudent = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteStudent = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/subject.ts
View File

@ -16,6 +16,6 @@ export const useGetAllSubject = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddSubject = () => useAddMutation(KEY, API.ADD);
export const useUpdateSubject = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteSubject = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/summary.ts
View File

@ -16,6 +16,6 @@ export const useGetAllsummary = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddsummary = () => useAddMutation(KEY, API.ADD);
export const useUpdatesummary = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeletesummary = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/tags.ts
View File

@ -16,6 +16,6 @@ export const useGetAllTag = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddTag = () => useAddMutation(KEY, API.ADD);
export const useUpdateTag = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteTag = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/teacher.ts
View File

@ -16,6 +16,6 @@ export const useGetAllTeacher = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddTeacher = () => useAddMutation(KEY, API.ADD);
export const useUpdateTeacher = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteTeacher = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/term.ts
View File

@ -16,6 +16,6 @@ export const useGetAllTerm = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddTerm = () => useAddMutation(KEY, API.ADD);
export const useUpdateTerm = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteTerm = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

2
src/api/unit.ts
View File

@ -15,6 +15,6 @@ export const useGetAllUnit = (params?: any, options?: any) =>
useGetQuery(KEY, API.GET, params, options);
export const useAddUnit = () => useAddMutation(KEY, API.ADD);
export const useUpdateUnit = (params?: any) =>
useUpdateMutation(KEY, API.GET, params);
useUpdateMutation(KEY, API.GET);
export const useDeleteUnit = (params?: any) =>
useDeleteMutation(KEY, API.DELETE);

4
src/enums/Model.ts
View File

@ -141,4 +141,8 @@ export enum ModalEnum {
TAGS_ADD = "TAGS.add",
TAGS_DELETE = "TAGS.delete",
///// Question
QUESTION_DELETE = "Question.delete",
}

9
src/translate/ar.json
View File

@ -148,7 +148,10 @@
"username": "اسم المستخدم",
"email": "البريد الإلكتروني",
"description":"الوصف",
"lesson_count":"عدد الدروس"
"lesson_count":"عدد الدروس",
"max_mark":"العلامة الكاملة",
"min_mark_to_pass" : "علامة النجاح",
"isBase":"سؤال رئيسي"
},
"practical": {
"to_confirm_deletion_please_re_enter": "لتأكيد الحذف، يرجى إعادة الإدخال",
@ -184,7 +187,9 @@
"importStudents": "استيراد ",
"overview": "نظرة عامة",
"presence": "الحضور",
"add_new_role": "اضافة صلاحية جديدة"
"add_new_role": "اضافة صلاحية جديدة",
"yes":"نعم",
"no":"لا"
},
"Table": {
"header": "",

2
src/types/Item.ts
View File

@ -308,7 +308,7 @@ export interface QuestionOption {
export interface Question {
id: number;
subject_id: number;
parent: any;
parent_id:number;
isBase: number;
content: string;
max_mark: number;