Karimaldeen/nerd_project_dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Karimaldeen:6213253337fcf8184549cc140c112f70ff008d41
Branches Tags
Karimaldeen:main
Karimaldeen:dev
..
compare: Karimaldeen:687640f7a4f639025fbb9c1cfee7b5343afa1571
Branches Tags
Karimaldeen:dev
Karimaldeen:main

No commits in common. "6213253337fcf8184549cc140c112f70ff008d41" and "687640f7a4f639025fbb9c1cfee7b5343afa1571" have entirely different histories.
6213253337 ... 687640f7a4

36 changed files with 153 additions and 211 deletions
Show Stats Expand all files Collapse all files

51
src/Components/Drage/DragAndDropList.tsx
View File

@ -1,51 +0,0 @@
import React, { useState } from 'react';
const DragAndDropList: React.FC = () => {
const [items, setItems] = useState<string[]>(['Item 1', 'Item 2', 'Item 3', 'Item 4']);
const [draggedItemIndex, setDraggedItemIndex] = useState<number | null>(null);
const handleDragStart = (index: number) => {
setDraggedItemIndex(index);
};
const handleDragOver = (index: number) => {
if (index !== draggedItemIndex && draggedItemIndex !== null) {
const newItems = [...items];
const draggedItem = newItems[draggedItemIndex];
newItems.splice(draggedItemIndex, 1);
newItems.splice(index, 0, draggedItem);
setItems(newItems);
setDraggedItemIndex(index);
}
};
const handleDrop = () => {
setDraggedItemIndex(null);
};
return (
<div>
{items.map((item, index) => (
<div
key={index}
draggable
onDragStart={() => handleDragStart(index)}
onDragOver={() => handleDragOver(index)}
onDrop={handleDrop}
style={{
padding: '8px',
margin: '4px',
border: '1px solid #ccc',
backgroundColor: '#f9f9f9',
cursor: 'move',
userSelect: 'none'
}}
>
{item}
</div>
))}
</div>
);
};
export default DragAndDropList;

4
src/Pages/Unit/Table.tsx
View File

@ -10,11 +10,11 @@ const App: React.FC = () => {
const { subject_id } = useParams<ParamsEnum>(); const { subject_id } = useParams<ParamsEnum>();
const response = useGetAllUnit({ subject_id: subject_id, pagination: true }); const response = useGetAllUnit({ subject_id: subject_id, pagination: true });
const { setOldObjectToEdit } = useObjectToEdit(); const { setOldObjectToEdit } = useObjectToEdit();
// console.log(response?.data?.data, "response?.data"); console.log(response?.data?.data, "response?.data");
const data = response?.data?.data; const data = response?.data?.data;
const lastElement = const lastElement =
response?.data?.data && response?.data?.data[data?.length - 1]; response?.data?.data && response?.data?.data[data?.length - 1];
// console.log(lastElement); console.log(lastElement);
useEffect(() => { useEffect(() => {
if (lastElement) { if (lastElement) {

4
src/Pages/lesson/Table.tsx
View File

@ -11,11 +11,11 @@ const App: React.FC = () => {
const response = useGetAllLesson({ unit_id: unit_id, pagination: true }); const response = useGetAllLesson({ unit_id: unit_id, pagination: true });
const { setOldObjectToEdit } = useObjectToEdit(); const { setOldObjectToEdit } = useObjectToEdit();
// console.log(response?.data?.data, "response?.data"); console.log(response?.data?.data, "response?.data");
const data = response?.data?.data; const data = response?.data?.data;
const lastElement = const lastElement =
response?.data?.data && response?.data?.data[data?.length - 1]; response?.data?.data && response?.data?.data[data?.length - 1];
// console.log(lastElement); console.log(lastElement);
useEffect(() => { useEffect(() => {
if (lastElement) { if (lastElement) {

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

@ -103,7 +103,8 @@ const AddPage: React.FC = () => {
) => { ) => {
const DataToSend = structuredClone(values); const DataToSend = structuredClone(values);
console.log(DataToSend); console.log(DataToSend);
return ;
setTagsSearch(null); setTagsSearch(null);
const canAnswersBeShuffled = DataToSend?.canAnswersBeShuffled ? 1 : 0; const canAnswersBeShuffled = DataToSend?.canAnswersBeShuffled ? 1 : 0;
if (isBseQuestion || DataToSend?.isBase === 1) { if (isBseQuestion || DataToSend?.isBase === 1) {
@ -125,42 +126,25 @@ const AddPage: React.FC = () => {
Questions?.map((item: Question) => { Questions?.map((item: Question) => {
const tags = processTags(item); const tags = processTags(item);
console.log(item); console.log(item);
const answers = item?.answers?.map((item:any,index:number)=>{
return {
order:index,
...item
}
})
console.log(answers);
mutate({ mutate({
...item, ...item,
parent_id: newBseQuestionId, parent_id: newBseQuestionId,
subject_id: subject_id, subject_id: subject_id,
tags, tags,
lessons_ids: [lesson_id], lessons_ids: [lesson_id],
answers
}); });
}); });
console.log(newBseQuestionId, "newBseQuestionId"); console.log(newBseQuestionId, "newBseQuestionId");
}); });
} else { } else {
const tags = processTags(DataToSend); const tags = processTags(DataToSend);
console.log(values,"values");
const answers = values?.answers?.map((item:any,index:number)=>{
return {
order:index,
...item
}
})
mutate({ mutate({
...values, ...values,
subject_id: subject_id, subject_id: subject_id,
tags, tags,
lessons_ids: [lesson_id], lessons_ids: [lesson_id],
canAnswersBeShuffled, canAnswersBeShuffled,
answers
}); });
} }
}; };
@ -184,8 +168,8 @@ const AddPage: React.FC = () => {
} }
}, [isSuccess, isSuccessAsync]); }, [isSuccess, isSuccessAsync]);
let cleanedAnswers = cleanObject(SavedQuestionData); let cleanedQuestionOptions = cleanObject(SavedQuestionData);
let noChange = hasItems(cleanedAnswers); let noChange = hasItems(cleanedQuestionOptions);
useSaveOnDisconnect(noChange, QUESTION_OBJECT_KEY, SavedQuestionData); useSaveOnDisconnect(noChange, QUESTION_OBJECT_KEY, SavedQuestionData);

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

@ -152,25 +152,25 @@ const EditPage: React.FC = () => {
console.log(updatedObject, "updatedObject"); console.log(updatedObject, "updatedObject");
const tags = processTags(updatedObject); const tags = processTags(updatedObject);
const oldanswers = [] as any; const oldQuestionOptions = [] as any;
const newanswers = [] as any; const newQuestionOptions = [] as any;
updatedObject?.answers?.forEach((item: any) => { updatedObject?.QuestionOptions?.forEach((item: any) => {
if (item?.id) { if (item?.id) {
oldanswers.push(item); oldQuestionOptions.push(item);
} else { } else {
newanswers.push(item); newQuestionOptions.push(item);
} }
}); });
const answers = { const QuestionOptions = {
old: oldanswers, old: oldQuestionOptions,
new: newanswers, new: newQuestionOptions,
}; };
console.log(answers); console.log(QuestionOptions);
mutate({ mutate({
...updatedObject, ...updatedObject,
answers, QuestionOptions,
tags, tags,
}); });
} else { } else {
@ -197,26 +197,26 @@ const EditPage: React.FC = () => {
} }
console.log(updatedObject); console.log(updatedObject);
const oldanswers = [] as any; const oldQuestionOptions = [] as any;
const newanswers = [] as any; const newQuestionOptions = [] as any;
updatedObject?.answers?.forEach((item: any) => { updatedObject?.QuestionOptions?.forEach((item: any) => {
if (item?.id) { if (item?.id) {
console.log(item); console.log(item);
oldanswers.push(item); oldQuestionOptions.push(item);
} else { } else {
newanswers.push(item); newQuestionOptions.push(item);
} }
}); });
const answers = { const QuestionOptions = {
old: oldanswers, old: oldQuestionOptions,
new: newanswers, new: newQuestionOptions,
}; };
console.log(answers, "answers"); console.log(QuestionOptions, "QuestionOptions");
mutate({ ...updatedObject, answers, tags }); mutate({ ...updatedObject, QuestionOptions, tags });
} }
}; };

10
src/Pages/question/Model/Field/CheckboxField.tsx
View File

@ -15,18 +15,18 @@ const CheckboxField = ({
const formik = useFormikContext<any>(); const formik = useFormikContext<any>();
const [t] = useTranslation(); const [t] = useTranslation();
const CheckboxhandleChange = (value: any, index: number) => { const CheckboxhandleChange = (value: any, index: number) => {
const allAreZero = formik?.values?.answers?.some( const allAreZero = formik?.values?.QuestionOptions?.some(
(item: any) => item.isCorrect === 1, (item: any) => item.isCorrect === 1,
); );
if (allAreZero) { if (allAreZero) {
formik?.values.answers.forEach((item: any, index: number) => { formik?.values.QuestionOptions.forEach((item: any, index: number) => {
formik.setFieldValue(`answers[${index}].isCorrect`, 0); formik.setFieldValue(`QuestionOptions[${index}].isCorrect`, 0);
}); });
} }
formik.setFieldValue( formik.setFieldValue(
`answers[${name}].isCorrect`, `QuestionOptions[${name}].isCorrect`,
value?.target?.checked ? 1 : 0, value?.target?.checked ? 1 : 0,
); );
}; };
@ -35,7 +35,7 @@ const CheckboxField = ({
<Checkbox <Checkbox
onChange={onChange || CheckboxhandleChange} onChange={onChange || CheckboxhandleChange}
disabled={isDisabled} disabled={isDisabled}
checked={formik.values?.answers?.[name]?.isCorrect === 1} checked={formik.values?.QuestionOptions?.[name]?.isCorrect === 1}
className={className} className={className}
> >
{t(`input.${label ? label : name}`)} {t(`input.${label ? label : name}`)}

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

@ -18,13 +18,13 @@ const ChoiceFields = ({ index, data }: { index: number; data: Choice }) => {
const handleDeleteChoice = () => { const handleDeleteChoice = () => {
console.log(index); console.log(index);
console.log(formik.values.answers[index]); console.log(formik.values.QuestionOptions[index]);
const updatedAnswers = formik.values.answers.filter( const updatedQuestionOptions = formik.values.QuestionOptions.filter(
(_: any, i: any) => i !== index, (_: any, i: any) => i !== index,
); );
formik.setFieldValue("answers", updatedAnswers); formik.setFieldValue("QuestionOptions", updatedQuestionOptions);
}; };
return ( return (

8
src/Pages/question/Model/Field/Choices.tsx
View File

@ -11,8 +11,8 @@ const Choices = () => {
// Check if the item was dropped outside the list // Check if the item was dropped outside the list
if (!result.destination) return; if (!result.destination) return;
// Create a new array from the current answers // Create a new array from the current QuestionOptions
const items = Array.from(formik?.values?.answers); const items = Array.from(formik?.values?.QuestionOptions);
// Remove the item from the original position // Remove the item from the original position
const [reorderedItem] = items.splice(result.source.index, 1); const [reorderedItem] = items.splice(result.source.index, 1);
@ -29,7 +29,7 @@ const Choices = () => {
// Update the formik state with the new order // Update the formik state with the new order
console.log(updatedItems, "updatedItems"); console.log(updatedItems, "updatedItems");
formik.setFieldValue("answers", updatedItems); formik.setFieldValue("QuestionOptions", updatedItems);
}; };
return ( return (
@ -37,7 +37,7 @@ const Choices = () => {
<Droppable droppableId="choices"> <Droppable droppableId="choices">
{(provided) => ( {(provided) => (
<div {...provided.droppableProps} ref={provided.innerRef}> <div {...provided.droppableProps} ref={provided.innerRef}>
{formik?.values?.answers?.map( {formik?.values?.QuestionOptions?.map(
(item: Choice, index: number) => { (item: Choice, index: number) => {
// Use a unique identifier for draggableId // Use a unique identifier for draggableId
const draggableId = item.name const draggableId = item.name

6
src/Pages/question/Model/Field/File.tsx
View File

@ -12,10 +12,10 @@ const File = ({
className, className,
props, props,
}: any) => { }: any) => {
const newName = `answers[${name}].answer_image`; const newName = `QuestionOptions[${name}].answer_image`;
const { formik, t, isError, errorMsg } = useFormField(newName, props); const { formik, t, isError, errorMsg } = useFormField(newName, props);
let imageUrl = formik?.values?.answers[name]?.answer_image ?? null; let imageUrl = formik?.values?.QuestionOptions[name]?.answer_image ?? null;
// console.log(imageUrl); // console.log(imageUrl);
const fileList: UploadFile[] = useMemo(() => { const fileList: UploadFile[] = useMemo(() => {
@ -46,7 +46,7 @@ const File = ({
formik.setFieldValue(newName, null); formik.setFieldValue(newName, null);
} else { } else {
formik.setFieldValue( formik.setFieldValue(
`answers[${name}].answer_image`, `QuestionOptions[${name}].answer_image`,
value?.file?.originFileObj, value?.file?.originFileObj,
); );
} }

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

@ -18,7 +18,7 @@ const HintField = ({
id, id,
className, className,
}: any) => { }: any) => {
const newName = `answers[${name}].hint`; const newName = `QuestionOptions[${name}].hint`;
const { formik, isError, errorMsg, t } = useFormField(newName, props); const { formik, isError, errorMsg, t } = useFormField(newName, props);
const TextFilehandleChange = ( const TextFilehandleChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>, e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,

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

@ -18,7 +18,7 @@ const TextField = ({
id, id,
className, className,
}: any) => { }: any) => {
const newName = `answers[${name}].content`; const newName = `QuestionOptions[${name}].answer`;
const { formik, isError, errorMsg, t } = useFormField(newName, props); const { formik, isError, errorMsg, t } = useFormField(newName, props);
const TextFilehandleChange = ( const TextFilehandleChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>, e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,

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

@ -33,9 +33,9 @@ const Form = () => {
const handleAddChoice = (parent_index: number) => { const handleAddChoice = (parent_index: number) => {
console.log(parent_index); console.log(parent_index);
formik.setFieldValue(`Questions.[${parent_index}].answers`, [ formik.setFieldValue(`Questions.[${parent_index}].QuestionOptions`, [
...((formik?.values as any)?.Questions?.[parent_index] ...((formik?.values as any)?.Questions?.[parent_index]
.answers as Choice[]), .QuestionOptions as Choice[]),
{ {
answer: null, answer: null,
@ -54,9 +54,9 @@ const Form = () => {
image: "", image: "",
parent: "", parent: "",
isBase: 0, isBase: 0,
// max_mark: 1, max_mark: 1,
// min_mark_to_pass: 1, min_mark_to_pass: 1,
answers: [{ answer: null, answer_image: null, isCorrect: 0 }], QuestionOptions: [{ answer: null, answer_image: null, isCorrect: 0 }],
tags: [], tags: [],
}, },
]); ]);
@ -106,7 +106,7 @@ const Form = () => {
<Choices parent_index={parent_index} /> <Choices parent_index={parent_index} />
{formik?.values?.Questions?.[parent_index]?.answers {formik?.values?.Questions?.[parent_index]?.QuestionOptions
?.length < 5 && ( ?.length < 5 && (
<p className="add_new_button"> <p className="add_new_button">
<FaCirclePlus <FaCirclePlus

10
src/Pages/question/Model/Malty/ChoiceField/CheckboxField.tsx
View File

@ -19,12 +19,12 @@ const CheckboxField = ({
const allAreZero = formik?.values?.Questions?.[ const allAreZero = formik?.values?.Questions?.[
parent_index parent_index
]?.answers?.some((item: any) => item.isCorrect === 1); ]?.QuestionOptions?.some((item: any) => item.isCorrect === 1);
if (allAreZero) { if (allAreZero) {
formik?.values?.Questions?.[parent_index]?.answers.forEach( formik?.values?.Questions?.[parent_index]?.QuestionOptions.forEach(
(item: any, index: number) => { (item: any, index: number) => {
formik.setFieldValue( formik.setFieldValue(
`Questions[${parent_index}].answers[${index}].isCorrect`, `Questions[${parent_index}].QuestionOptions[${index}].isCorrect`,
0, 0,
); );
}, },
@ -32,7 +32,7 @@ const CheckboxField = ({
} }
formik.setFieldValue( formik.setFieldValue(
`Questions[${parent_index}].answers[${name}].isCorrect`, `Questions[${parent_index}].QuestionOptions[${name}].isCorrect`,
value?.target?.checked ? 1 : 0, value?.target?.checked ? 1 : 0,
); );
}; };
@ -42,7 +42,7 @@ const CheckboxField = ({
onChange={onChange || CheckboxhandleChange} onChange={onChange || CheckboxhandleChange}
disabled={isDisabled} disabled={isDisabled}
checked={ checked={
formik.values?.Questions?.[parent_index]?.answers?.[name] formik.values?.Questions?.[parent_index]?.QuestionOptions?.[name]
?.isCorrect === 1 ?.isCorrect === 1
} }
className={className} className={className}

10
src/Pages/question/Model/Malty/ChoiceField/ChoiceFields.tsx
View File

@ -26,7 +26,7 @@ const ChoiceFields = ({
const handleDeleteChoice = () => { const handleDeleteChoice = () => {
const arrayLength = const arrayLength =
formik.values.Questions?.[parent_index].answers?.length; formik.values.Questions?.[parent_index].QuestionOptions?.length;
console.log(arrayLength); console.log(arrayLength);
@ -37,12 +37,12 @@ const ChoiceFields = ({
return; return;
} }
const updatedAnswers = formik.values.Questions?.[ const updatedQuestionOptions = formik.values.Questions?.[
parent_index parent_index
].answers.filter((_: any, i: any) => i !== index); ].QuestionOptions.filter((_: any, i: any) => i !== index);
formik.setFieldValue( formik.setFieldValue(
`Questions[${parent_index}].answers`, `Questions[${parent_index}].QuestionOptions`,
updatedAnswers, updatedQuestionOptions,
); );
}; };
return ( return (

10
src/Pages/question/Model/Malty/ChoiceField/Choices.tsx
View File

@ -14,10 +14,10 @@ const Choices = ({ parent_index }: { parent_index: number }) => {
if (!result.destination) return; if (!result.destination) return;
console.log(formik?.values?.Questions?.[parent_index]?.answers); console.log(formik?.values?.Questions?.[parent_index]?.QuestionOptions);
// Create a new array from the current answers // Create a new array from the current QuestionOptions
const items = Array.from(formik?.values?.Questions?.[parent_index]?.answers); const items = Array.from(formik?.values?.Questions?.[parent_index]?.QuestionOptions);
console.log(items); console.log(items);
// Remove the item from the original position // Remove the item from the original position
const [reorderedItem] = items.splice(result.source.index, 1); const [reorderedItem] = items.splice(result.source.index, 1);
@ -36,7 +36,7 @@ const Choices = ({ parent_index }: { parent_index: number }) => {
// Update the formik state with the new order // Update the formik state with the new order
console.log(updatedItems, "updatedItems"); console.log(updatedItems, "updatedItems");
formik.setFieldValue(`Questions.${parent_index}.answers`, updatedItems); formik.setFieldValue(`Questions.${parent_index}.QuestionOptions`, updatedItems);
}; };
return ( return (
@ -47,7 +47,7 @@ const Choices = ({ parent_index }: { parent_index: number }) => {
<div {...provided.droppableProps} ref={provided.innerRef}> <div {...provided.droppableProps} ref={provided.innerRef}>
{( {(
(formik?.values as any)?.Questions?.[parent_index] (formik?.values as any)?.Questions?.[parent_index]
?.answers || [] ?.QuestionOptions || []
).map((item: Choice, index: number) => { ).map((item: Choice, index: number) => {
const draggableId = item.name const draggableId = item.name
? item.name.toString() ? item.name.toString()

6
src/Pages/question/Model/Malty/ChoiceField/File.tsx
View File

@ -13,11 +13,11 @@ const File = ({
parent_index, parent_index,
props, props,
}: any) => { }: any) => {
const newName = `Questions[${parent_index}].answers[${name}].answer_image`; const newName = `Questions[${parent_index}].QuestionOptions[${name}].answer_image`;
const { formik, t, isError, errorMsg } = useFormField(newName, props); const { formik, t, isError, errorMsg } = useFormField(newName, props);
let imageUrl = let imageUrl =
formik?.values?.Questions?.[parent_index]?.answers[name] formik?.values?.Questions?.[parent_index]?.QuestionOptions[name]
?.answer_image ?? null; ?.answer_image ?? null;
// console.log(imageUrl); // console.log(imageUrl);
@ -49,7 +49,7 @@ const File = ({
formik.setFieldValue(newName, null); formik.setFieldValue(newName, null);
} else { } else {
formik.setFieldValue( formik.setFieldValue(
`Questions[${parent_index}].answers[${name}].answer_image`, `Questions[${parent_index}].QuestionOptions[${name}].answer_image`,
value?.file?.originFileObj, value?.file?.originFileObj,
); );
} }

2
src/Pages/question/Model/Malty/ChoiceField/HintField.tsx
View File

@ -16,7 +16,7 @@ const HintField = ({
id, id,
className, className,
}: any) => { }: any) => {
const newName = `Questions[${parent_index}].answers[${name}].hint`; const newName = `Questions[${parent_index}].QuestionOptions[${name}].hint`;
const { formik, isError, errorMsg, t } = useFormField(newName, props); const { formik, isError, errorMsg, t } = useFormField(newName, props);
const TextFilehandleChange = ( const TextFilehandleChange = (

2
src/Pages/question/Model/Malty/ChoiceField/TextField.tsx
View File

@ -18,7 +18,7 @@ const TextField = ({
parent_index, parent_index,
className, className,
}: any) => { }: any) => {
const newName = `Questions[${parent_index}].answers[${name}].content`; const newName = `Questions[${parent_index}].QuestionOptions[${name}].answer`;
const { formik, isError, errorMsg, t } = useFormField(newName, props); const { formik, isError, errorMsg, t } = useFormField(newName, props);
const TextFilehandleChange = ( const TextFilehandleChange = (
e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>, e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,

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

@ -30,9 +30,9 @@ const Form = () => {
const handleAddChoice = (parent_index: number) => { const handleAddChoice = (parent_index: number) => {
console.log(parent_index); console.log(parent_index);
console.log(formik?.values?.Questions); console.log(formik?.values?.Questions);
formik.setFieldValue(`Questions.[${parent_index}].answers`, [ formik.setFieldValue(`Questions.[${parent_index}].QuestionOptions`, [
...((formik?.values as any)?.Questions?.[parent_index] ...((formik?.values as any)?.Questions?.[parent_index]
.answers as Choice[]), .QuestionOptions as Choice[]),
{ {
answer: null, answer: null,
@ -53,7 +53,7 @@ const Form = () => {
isBase: 0, isBase: 0,
max_mark: 1, max_mark: 1,
min_mark_to_pass: 1, min_mark_to_pass: 1,
answers: [{ answer: null, answer_image: null, isCorrect: 0 }], QuestionOptions: [{ answer: null, answer_image: null, isCorrect: 0 }],
tags: [], tags: [],
}, },
]); ]);
@ -103,7 +103,7 @@ const Form = () => {
{( {(
(formik?.values as any)?.Questions?.[parent_index] (formik?.values as any)?.Questions?.[parent_index]
?.answers || [] ?.QuestionOptions || []
).map((item: Choice, index: number) => { ).map((item: Choice, index: number) => {
return ( return (
<ChoiceFields <ChoiceFields
@ -114,7 +114,7 @@ const Form = () => {
/> />
); );
})} })}
{formik?.values?.Questions?.[parent_index]?.answers {formik?.values?.Questions?.[parent_index]?.QuestionOptions
?.length < 5 && ( ?.length < 5 && (
<p className="add_new_button"> <p className="add_new_button">
<FaCirclePlus <FaCirclePlus

2
src/Pages/question/Model/Malty/QuestionFIeld/HintField.tsx
View File

@ -23,7 +23,7 @@ const HintField = ({
// console.log('Change:', e.target.value); // console.log('Change:', e.target.value);
formik.setFieldValue(newName, e.target.value); formik.setFieldValue(newName, e.target.value);
}; };
return ( return (
<div className={`ValidationField w-100 ${className ?? ""} `}> <div className={`ValidationField w-100 ${className ?? ""} `}>
<label htmlFor={name} className="text"> <label htmlFor={name} className="text">

4
src/Pages/question/Model/Malty/QuestionFIeld/QuestionFIeld.tsx
View File

@ -26,10 +26,10 @@ const QuestionFIeld = ({ index, data }: { index: number; data: Choice }) => {
if (DeleteQuestionId?.id) { if (DeleteQuestionId?.id) {
setDeletedQuestions([...DeletedQuestions, DeleteQuestionId]); setDeletedQuestions([...DeletedQuestions, DeleteQuestionId]);
} }
const updatedAnswers = formik.values.Questions.filter( const updatedQuestionOptions = formik.values.Questions.filter(
(_: any, i: any) => i !== index, (_: any, i: any) => i !== index,
); );
formik.setFieldValue(`Questions`, updatedAnswers); formik.setFieldValue(`Questions`, updatedQuestionOptions);
}; };
return ( return (

33
src/Pages/question/Model/MathInput.tsx Normal file
View File

@ -0,0 +1,33 @@
import React, { useState } from "react";
import MathJax from "react-mathjax";
const MathInput: React.FC = () => {
const [input, setInput] = useState<string>(
"a^2+b^2=c^2 (x+a)^n=x=(-b±√(b^2-4ac))/2a ∑_(k=0)^n▒〖(n¦k) x^k a^(n-k) 〗",
);
const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
const formattedInput = event.target.value.replace("_", " _ ");
console.log(event.target.value);
setInput(formattedInput);
};
return (
<MathJax.Provider>
<div>
<input
type="text"
id="mathInput"
value={input}
onChange={handleChange}
/>
<div>
<MathJax.Node formula={input} />
</div>
</div>
</MathJax.Provider>
);
};
export default MathInput;

8
src/Pages/question/Model/ModelForm.tsx
View File

@ -28,10 +28,10 @@ const Form = () => {
}, [formik?.values]); }, [formik?.values]);
const handleAddChoice = () => { const handleAddChoice = () => {
formik.setFieldValue("answers", [ formik.setFieldValue("QuestionOptions", [
...((formik?.values as any)?.answers as Choice[]), ...((formik?.values as any)?.QuestionOptions as Choice[]),
{ {
content: null, answer: null,
answer_image: null, answer_image: null,
isCorrect: 0, isCorrect: 0,
}, },
@ -69,7 +69,7 @@ const Form = () => {
/> />
</div> </div>
<Choices /> <Choices />
{formik?.values?.answers?.length < 5 && ( {formik?.values?.QuestionOptions?.length < 5 && (
<p className="add_new_button"> <p className="add_new_button">
<FaCirclePlus onClick={handleAddChoice} size={23} />{" "} <FaCirclePlus onClick={handleAddChoice} size={23} />{" "}
{t("header.add_new_choice")} {t("header.add_new_choice")}

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

@ -7,18 +7,16 @@ export const getInitialValues = (objectToEdit: Question): any => {
const tags = objectToEdit?.tags?.map((item: any, index: number) => { const tags = objectToEdit?.tags?.map((item: any, index: number) => {
return { ...item, key: index }; return { ...item, key: index };
}); });
console.log(objectToEdit);
return { return {
id: objectToEdit?.id ?? null, id: objectToEdit?.id ?? null,
content: objectToEdit?.content ?? "", content: objectToEdit?.content ?? "",
image: objectToEdit?.image ?? "", image: objectToEdit?.image ?? "",
subject_id: objectToEdit?.subject_id ?? "", subject_id: objectToEdit?.subject_id ?? "",
canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0, canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ?? 0,
hint: objectToEdit?.hint ?? "",
isBase: 0, isBase: 0,
parent_id: objectToEdit?.parent_id ?? "", parent_id: objectToEdit?.parent_id ?? "",
answers: objectToEdit?.answers ?? [], QuestionOptions: objectToEdit?.QuestionOptions ?? [],
tags: tags ?? [], tags: tags ?? [],
}; };
}; };
@ -28,10 +26,10 @@ export const getValidationSchema = () => {
return Yup.object().shape({ return Yup.object().shape({
image: Yup.string().nullable(), image: Yup.string().nullable(),
content: Yup.string().required("validation.required"), content: Yup.string().required("validation.required"),
answers: Yup.array() QuestionOptions: Yup.array()
.of( .of(
Yup.object().shape({ Yup.object().shape({
content: Yup.string().required("validation.required"), answer: Yup.string().required("validation.required"),
answer_image: Yup.string().nullable(), answer_image: Yup.string().nullable(),
isCorrect: Yup.boolean(), isCorrect: Yup.boolean(),
}), }),
@ -47,11 +45,10 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
name: tag?.name, name: tag?.name,
key: `${tag?.id}_key_${tag?.name}`, key: `${tag?.id}_key_${tag?.name}`,
})); }));
return { return {
...item, ...item,
canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0, canAnswersBeShuffled: item?.canAnswersBeShuffled ?? 0,
hint: item?.hint ?? "",
tags, tags,
}; };
}); });
@ -65,8 +62,8 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
subject_id: objectToEdit?.subject_id ?? "", subject_id: objectToEdit?.subject_id ?? "",
isBase: 1, isBase: 1,
parent_id: objectToEdit?.parent_id ?? "", parent_id: objectToEdit?.parent_id ?? "",
canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0, canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ?? 0,
hint: objectToEdit?.hint ?? "",
Questions: questions, Questions: questions,
}; };
}; };
@ -80,10 +77,10 @@ export const getValidationSchemaBase = () => {
Yup.object().shape({ Yup.object().shape({
image: Yup.string().nullable(), image: Yup.string().nullable(),
content: Yup.string().required("validation.required"), content: Yup.string().required("validation.required"),
answers: Yup.array() QuestionOptions: Yup.array()
.of( .of(
Yup.object().shape({ Yup.object().shape({
content: Yup.string().required("validation.required"), answer: Yup.string().required("validation.required"),
answer_image: Yup.string().nullable(), answer_image: Yup.string().nullable(),
isCorrect: Yup.boolean(), isCorrect: Yup.boolean(),
}), }),

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

@ -60,14 +60,12 @@ export const useColumns = () => {
record?.isBase ? t("practical.yes") : t("practical.no"), record?.isBase ? t("practical.yes") : t("practical.no"),
}, },
{ {
title: t("columns.canAnswersBeShuffled"), title: `${t("columns.question_options_count")}`,
dataIndex: "canAnswersBeShuffled", dataIndex: "name",
key: "canAnswersBeShuffled", key: "name",
align: "center", align: "center",
render: (text, record) => render: (text, record) => record?.question_options_count,
record?.canAnswersBeShuffled ? t("practical.yes") : t("practical.no"),
}, },
{ {
title: canAddQuestion ? ( title: canAddQuestion ? (
<button onClick={() => handelAdd()} className="add_button"> <button onClick={() => handelAdd()} className="add_button">

1
src/Routes.tsx
View File

@ -33,7 +33,6 @@ export const menuItems: TMenuItem[] = [
abilities: ABILITIES_ENUM?.PASS, abilities: ABILITIES_ENUM?.PASS,
abilities_value: ABILITIES_VALUES_ENUM.INDEX, abilities_value: ABILITIES_VALUES_ENUM.INDEX,
prevPath: 0, prevPath: 0,
}, },
{ {
header: "page_header.grade", header: "page_header.grade",

4
src/api/config.ts
View File

@ -1,9 +1,9 @@
export const BaseURL = "http://127.0.0.1:8000/api/"; export const BaseURL = "http://192.168.1.111:8000/api/";
// export const BaseURL = "http://127.0.0.1:8000/api/"; // export const BaseURL = "http://127.0.0.1:8000/api/";
// export const BaseURL = "http://192.168.1.120:8000/api/"; // export const BaseURL = "http://192.168.1.120:8000/api/";
// export const ImageBaseURL = "http://192.168.1.9:8000/"; // export const ImageBaseURL = "http://192.168.1.9:8000/";
export const ImageBaseURL = "http://127.0.0.1:8000/api/"; export const ImageBaseURL = "http://192.168.1.111:8000/api/";
export const HEADER_KEY = "X-Custom-Query-Key"; export const HEADER_KEY = "X-Custom-Query-Key";

5
src/enums/UserType.ts
View File

@ -1,5 +0,0 @@
export enum UserTypeEnum {
ADMIN = "ADMIN",
RE_SELLER = "RE_SELLER",
}

2
src/lib/ReactQueryProvider.tsx
View File

@ -6,7 +6,7 @@ function QueryProvider({ children }: any) {
defaultOptions: { defaultOptions: {
queries: { queries: {
refetchOnWindowFocus: false, refetchOnWindowFocus: false,
staleTime:60 // staleTime:Infinity
}, },
}, },
}); });

1
src/translate/ar.json
View File

@ -155,7 +155,6 @@
"min_mark_to_pass": "علامة النجاح", "min_mark_to_pass": "علامة النجاح",
"isBase": "سؤال رئيسي", "isBase": "سؤال رئيسي",
"question_options_count": "عدد الخيارات", "question_options_count": "عدد الخيارات",
"canAnswersBeShuffled":"يمكن خلط الإجابات",
"price":"السعر", "price":"السعر",
"grade_id":"رقم تعريف الدرجة" "grade_id":"رقم تعريف الدرجة"
}, },

3
src/types/App.ts
View File

@ -1,7 +1,6 @@
import { ReactElement, LazyExoticComponent, ReactNode } from "react"; import { ReactElement, LazyExoticComponent, ReactNode } from "react";
import { Mark_State, Payment_type, term_type } from "./Item"; import { Mark_State, Payment_type, term_type } from "./Item";
import { ABILITIES_ENUM, ABILITIES_VALUES_ENUM } from "../enums/abilities"; import { ABILITIES_ENUM, ABILITIES_VALUES_ENUM } from "../enums/abilities";
import { UserTypeEnum } from "../enums/UserType";
export type ChildrenType = { export type ChildrenType = {
children: ReactNode; children: ReactNode;
@ -15,7 +14,6 @@ type TMenuItemBase = {
withOutLayout?: boolean; withOutLayout?: boolean;
abilities: ABILITIES_ENUM; abilities: ABILITIES_ENUM;
abilities_value: ABILITIES_VALUES_ENUM; abilities_value: ABILITIES_VALUES_ENUM;
type?:UserTypeEnum
prevPath: number; prevPath: number;
}; };
@ -39,7 +37,6 @@ export type TCrudRoute = {
element: ReactElement | LazyExoticComponent<any>; element: ReactElement | LazyExoticComponent<any>;
abilities: ABILITIES_ENUM; abilities: ABILITIES_ENUM;
abilities_value: ABILITIES_VALUES_ENUM; abilities_value: ABILITIES_VALUES_ENUM;
type?:ABILITIES_ENUM
prevPath: number; prevPath: number;
}; };

3
src/types/Item.ts
View File

@ -312,8 +312,7 @@ export interface Question {
image: string | null; image: string | null;
Questions?: any[]; Questions?: any[];
question_options_count?: any; question_options_count?: any;
answers: QuestionOption[]; QuestionOptions: QuestionOption[];
hint?:string;
tags: tags[]; // Assuming tags are strings, adjust as per actual data type tags: tags[]; // Assuming tags are strings, adjust as per actual data type
} }

5
src/types/UserType.ts
View File

@ -1,5 +0,0 @@
import { Nullable } from "./App";
// Define the Teacher interface
export type UserType = "admin" | "reSeller"

5
src/utils/hasAbility.ts
View File

@ -28,14 +28,11 @@ class AbilityManager {
} }
return new Set(JSON.parse(abilitiesString)); return new Set(JSON.parse(abilitiesString));
} }
public hasAbility( public hasAbility(
category: ABILITIES_ENUM, category: ABILITIES_ENUM,
value: ABILITIES_VALUES_ENUM, value: ABILITIES_VALUES_ENUM,
): boolean { ): boolean {
// Allow all abilities if the category is PASS // Allow all abilities if the category is PASS
return true; return true;
if (category === ABILITIES_ENUM.PASS) { if (category === ABILITIES_ENUM.PASS) {
return true; return true;
@ -47,7 +44,7 @@ class AbilityManager {
} }
// Construct the ability string // Construct the ability string
const abilityString = `${category}`; const abilityString = `${category}::${value}`;
// Check if the constructed ability string exists in the abilities set // Check if the constructed ability string exists in the abilities set
return this.abilities.has(abilityString); return this.abilities.has(abilityString);

8
src/utils/setLocalStorageBaseQuestions.ts
View File

@ -15,8 +15,8 @@ export const setLocalStorageBaseQuestions = async (key: string, data: any) => {
} }
} }
} }
if (Array.isArray(data.Questions.answers)) { if (Array.isArray(data.Questions.QuestionOptions)) {
for (const option of data.Questions.answers) { for (const option of data.Questions.QuestionOptions) {
if (option.answer_image instanceof File) { if (option.answer_image instanceof File) {
option.answer_image = await convertFileToBase64(option.answer_image); option.answer_image = await convertFileToBase64(option.answer_image);
} }
@ -50,8 +50,8 @@ export const getLocalStorageBaseQuestions = (key: string): any | null => {
} }
} }
} }
if (Array.isArray(data.Questions.answers)) { if (Array.isArray(data.Questions.QuestionOptions)) {
for (const option of data.Questions.answers) { for (const option of data.Questions.QuestionOptions) {
if (typeof option.answer_image === "string") { if (typeof option.answer_image === "string") {
option.answer_image = base64StringToFile(option.answer_image); option.answer_image = base64StringToFile(option.answer_image);
} }

24
src/utils/setLocalStorageQuestions.ts
View File

@ -8,9 +8,9 @@ export const setLocalStorageQuestions = async (key: string, data: any) => {
data.image = await convertFileToBase64(data.image); data.image = await convertFileToBase64(data.image);
} }
// Check for answers array and convert answer_image if it's a File // Check for QuestionOptions array and convert answer_image if it's a File
if (Array.isArray(data.answers)) { if (Array.isArray(data.QuestionOptions)) {
for (const option of data.answers) { for (const option of data.QuestionOptions) {
if (option.answer_image instanceof File) { if (option.answer_image instanceof File) {
option.answer_image = await convertFileToBase64(option.answer_image); option.answer_image = await convertFileToBase64(option.answer_image);
} }
@ -23,9 +23,9 @@ export const setLocalStorageQuestions = async (key: string, data: any) => {
if (question.image instanceof File) { if (question.image instanceof File) {
question.image = await convertFileToBase64(question.image); question.image = await convertFileToBase64(question.image);
} }
// Check for nested answers and convert answer_image if it's a File // Check for nested QuestionOptions and convert answer_image if it's a File
if (Array.isArray(question.answers)) { if (Array.isArray(question.QuestionOptions)) {
for (const option of question.answers) { for (const option of question.QuestionOptions) {
if (option.answer_image instanceof File) { if (option.answer_image instanceof File) {
option.answer_image = await convertFileToBase64( option.answer_image = await convertFileToBase64(
option.answer_image, option.answer_image,
@ -55,9 +55,9 @@ export const getLocalStorageQuestions = (key: string): any | null => {
data.image = base64StringToFile(data.image); data.image = base64StringToFile(data.image);
} }
// Check for answers array and convert answer_image if it's a base64 string // Check for QuestionOptions array and convert answer_image if it's a base64 string
if (Array.isArray(data.answers)) { if (Array.isArray(data.QuestionOptions)) {
for (const option of data.answers) { for (const option of data.QuestionOptions) {
if ( if (
typeof option.answer_image === "string" && typeof option.answer_image === "string" &&
option.answer_image.length > 0 option.answer_image.length > 0
@ -73,9 +73,9 @@ export const getLocalStorageQuestions = (key: string): any | null => {
if (typeof question.image === "string" && question.image.length > 0) { if (typeof question.image === "string" && question.image.length > 0) {
question.image = base64StringToFile(question.image); question.image = base64StringToFile(question.image);
} }
// Check for nested answers and convert answer_image if it's a base64 string // Check for nested QuestionOptions and convert answer_image if it's a base64 string
if (Array.isArray(question.answers)) { if (Array.isArray(question.QuestionOptions)) {
for (const option of question.answers) { for (const option of question.QuestionOptions) {
if ( if (
typeof option.answer_image === "string" && typeof option.answer_image === "string" &&
option.answer_image.length > 0 option.answer_image.length > 0