Compare commits

..

No commits in common. "45a960bce3f55108e95d2662e76db46808e131c6" and "ce1a1843a08df32e84b94d85ba6b31a5fabfe1a4" have entirely different histories.

12 changed files with 21 additions and 59 deletions

View File

@ -9,7 +9,7 @@ const LatexPreview = ({ latex }: { latex: string }) => {
// const sanitizedLatex = latex.replace(/\\_/g, '_');
return (
<div >
<div>
<BlockMath>

View File

@ -17,13 +17,12 @@ const EditLazyModal = React.lazy(() => import("./EditLaTexModal"));
const LaTeXInputMemo: React.FC<any> = React.memo(({ field ,form, label, ...props }) => {
const { name ,value} = field;
const { setFieldValue ,touched ,errors ,getFieldProps,values} = form;
const { setFieldValue ,touched ,errors } = form;
const { ShowLatexOption, Success } = useObjectToEdit();
const [showPreview, setShowPreview] = useState(false);
const Preview = parseTextAndLatex(value ?? "");
const onPreviewChange: CheckboxProps['onChange'] = (e) => {
setShowPreview(e.target.checked);
};
@ -69,31 +68,6 @@ const LaTeXInputMemo: React.FC<any> = React.memo(({ field ,form, label, ...prop
const isError = !!touched?.[name] && !!errors?.[name];
const errorMessage = isError ? errors?.[name] as string ?? "" : "" ;
console.log(values);
let metaName = name.substring(0, name.lastIndexOf('.'));
if (metaName.includes('.')) { metaName += ".meta";} else {metaName += "meta"}
console.log(metaName);
const meta = getFieldProps(metaName).value ;
console.log(meta);
const direction = meta?.direction === "ltr" ? "ltr" : "rtl"
const [Dir, setDir] = useState<"ltr" | "rtl">(direction)
const handleChangeDirection = ()=>{
if(Dir === "ltr"){
setDir("rtl")
setFieldValue(metaName,{...(meta ?? {}), direction:"rtl"})
}else{
setDir("ltr")
setFieldValue(metaName,{...(meta ?? {}), direction:"ltr"})
}
}
return (
<div className='LaTeXInput'>
<label htmlFor={name} className="text">
@ -110,24 +84,17 @@ const LaTeXInputMemo: React.FC<any> = React.memo(({ field ,form, label, ...prop
onChange={handleChangeInput}
value={curCentValue}
onBlur={onBlur}
dir={Dir}
{...props}
/>
<div className='LaTeXInputOptions'>
<Checkbox onChange={handleChangeDirection} checked={direction === "ltr"} >{t("header.change_direction")}</Checkbox>
{ShowLatexOption && (
<>
<Checkbox onChange={onPreviewChange}>{t("header.show_preview")}</Checkbox>
<div className='LaTeXInputOptions'>
<Checkbox onChange={onPreviewChange}>{t("header.show_preview")}</Checkbox>
<button type='button' className='addMML' onClick={showModal}>
<FaPlus/> {t("MML")}
</button>
</>
)}
</div>
</div>
)}
{showPreview && (
<div className='showPreviewInput'>

View File

@ -15,6 +15,9 @@ export const areFieldPropsEqual = (
const nextValue = nextProps.field.value;
return (
false
prevValue === nextValue
&&
prevError === nextError &&
prevTouched === nextTouched
);
};

View File

@ -32,8 +32,6 @@ const AddPage: React.FC = () => {
lessons_ids: [lesson_id],
canAnswersBeShuffled,
hint: DataToSend?.hint,
meta : DataToSend?.meta
};
mutateAsync(newBseQuestion).then((data: any) => {
@ -58,8 +56,6 @@ const AddPage: React.FC = () => {
tags,
lessons_ids: [lesson_id],
answers,
meta : item?.meta
});
});
console.log(newBseQuestionId, "newBseQuestionId");

View File

@ -15,6 +15,8 @@ import { useObjectToEdit } from "../../../zustand/ObjectToEditState";
import { removeStringKeys } from "../../../utils/removeStringKeys";
import SpinContainer from "../../../Components/Layout/SpinContainer";
import { Question } from "../../../types/Item";
import { toast } from "react-toastify";
import { deletePathSegments } from "../../../utils/deletePathSegments";
import BaseFormContainer from "./Model/EditForm/BaseFormContainer";
import FormContainer from "./Model/EditForm/FormContainer";
import { handleValidateBaseQuestion, handleValidateSingleQuestion } from "./Model/ValidationFn";
@ -59,7 +61,6 @@ const EditPage: React.FC = () => {
id: DataToSend?.id,
content: DataToSend?.content,
content_image: DataToSend?.content_image ?? "",
meta : DataToSend?.meta
};
if (
typeof UpdateBseQuestion?.content_image === "string" &&

View File

@ -36,7 +36,7 @@ const Form = () => {
////////////// hooks
useKeyCombination(
{ ctrlKey: true, shiftKey: true, code: CombinationKeyEnum.CHOICE },

View File

@ -59,6 +59,7 @@ const TableHeader = () => {
setObjectToEdit(null)
}
}, [])
console.log(objectToEdit);
return (
<div className="TableWithHeader">

View File

@ -5,10 +5,8 @@ export const getInitialValues = (objectToEdit: Question): any => {
const tags = objectToEdit?.tags?.map((item: any, index: number) => {
return { ...item };
});
return {
id: objectToEdit?.id ?? null,
content: objectToEdit?.content ?? "",
content_image: objectToEdit?.content_image ?? "",
@ -19,7 +17,6 @@ export const getInitialValues = (objectToEdit: Question): any => {
parent_id: objectToEdit?.parent_id ?? "",
answers: objectToEdit?.answers ?? null,
tags: tags ?? [],
meta : objectToEdit?.meta ?? { direction : "rtl" }
};
};
@ -86,8 +83,6 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
hint: objectToEdit?.hint ?? "",
isBase: 0,
tags,
meta : objectToEdit?.meta ?? { direction : "rtl" }
};
});
@ -103,8 +98,6 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
canAnswersBeShuffled: objectToEdit?.canAnswersBeShuffled ? 1 : 0,
hint: objectToEdit?.hint ?? null,
Questions: questions,
meta : objectToEdit?.meta ?? { direction : "rtl" }
};
};

View File

@ -1,9 +1,13 @@
import { HaveDuplicatedArrayValue } from "../../utils/hasDuplicateArrayValue";
const Dummy = () => {
const isDuplicated = HaveDuplicatedArrayValue([{name:"name"},{name:"name3"},{name:"nam"}],"name")
console.log(isDuplicated,"isDuplicated");
return (
<div className="DummyHomePage">
<div>mohammed karim -_- </div>
<div>asd</div>
<div> asd </div>
</div>
);
};

View File

@ -73,7 +73,6 @@
.LaTeXInputOptions{
display: flex;
padding: 10px;
}
.text{
margin-bottom: 7px !important;

View File

@ -153,8 +153,7 @@
"add_MML":"إضافة MML",
"show_preview":"عرض المعاينة",
"show_MMl":" MML عرض",
"financial_collection":"التحصيلات",
"change_direction":"تغيير الاتجاه"
"financial_collection":"التحصيلات"
},
"columns": {
"id": "الرقم التعريفي",

View File

@ -317,7 +317,6 @@ export interface Question {
hint?: string;
tags: tags[];
lessons:any
meta?:{}
}
export type report = {