This commit is contained in:
karimaldeen 2024-09-14 13:01:18 +03:00
parent a8967b62f2
commit dbdaa04fde
10 changed files with 24 additions and 14 deletions

View File

@ -10,6 +10,7 @@
"Groupbutton",
"handelnavigate",
"Karim",
"Popconfirm",
"queryqlent",
"registraion",
"SENDNOTIFICATION",

View File

@ -65,7 +65,7 @@ const ImageBoxField = ({ name }: any) => {
</div>
<div className="ImageBox">
{imagePreview ? (
<img src={imagePreview} alt="Preview" className="imagePreview" />
<img src={imagePreview} onClick={handleButtonClick} alt="Preview" className="imagePreview" />
) : (
<ImageIcon onClick={handleButtonClick} className="ImageBoxIcon" />
)}

View File

@ -14,10 +14,10 @@ const TextField = ({
placeholder,
isDisabled,
onChange,
props,
no_label,
label_icon,
className,
...props
}: any) => {
const { formik, isError, errorMsg, t } = useFormField(name, props);
const TextFilehandleChange = (
@ -48,6 +48,7 @@ const TextField = ({
onChange={onChange || TextFilehandleChange}
style={{ height: 120 }}
id={name}
{...props}
/>
</ValidationFieldContainer>
</div>

View File

@ -174,7 +174,7 @@ const AddPage: React.FC = () => {
<div className="exercise_add">
<Formik
onSubmit={handleSubmit}
initialValues={getInitialValuesBase(objectToEdit)}
initialValues={getInitialValuesBase({} as any)}
validationSchema={getValidationSchemaBase}
enableReinitialize
>
@ -214,7 +214,7 @@ const AddPage: React.FC = () => {
<div className="exercise_add">
<Formik
enableReinitialize={true}
initialValues={getInitialValues(objectToEdit)}
initialValues={getInitialValues({} as any)}
validationSchema={getValidationSchema}
onSubmit={(values) => {
handleSubmit(values);

View File

@ -67,8 +67,9 @@ const ChoiceFields = ({ index, data }: { index: number; data: Choice }) => {
placeholder="_"
name={`answers.${index}.hint`}
label="hint"
type="text"
style={{ width: "100%" }}
type="TextArea"
style={{ width: "100%" , height: 60,resize:"none" }}
showCount={false}
/>
</div>
</>

View File

@ -89,8 +89,9 @@ const ChoiceFields = ({
placeholder="_"
name={`Questions.${parent_index}.answers.${index}.hint`}
label="hint"
type="text"
style={{ width: "100%" }}
type="TextArea"
style={{ width: "100%" , height: 60,resize:"none" }}
showCount={false}
/>
</div>
</>

View File

@ -134,8 +134,9 @@ const Form = () => {
placeholder="_"
name={`Questions.${parent_index}.hint`}
label="hint_question"
type="text"
style={{ width: "100%" }}
type="TextArea"
style={{ width: "100%" , height: 60,resize:"none" }}
showCount={false}
/>
<MaltySelectTag parent_index={parent_index} />
</div>

View File

@ -74,8 +74,10 @@ const Form = () => {
placeholder="_"
name="hint"
label="hint_question"
type="text"
style={{ width: "100%" }}
type="TextArea"
style={{ width: "100%" , height: 60,resize:"none" }}
showCount={false}
/>
<SelectTag />
</div>

View File

@ -32,7 +32,7 @@ export const getValidationSchema = () => {
content_image: Yup.string().nullable(),
isCorrect: Yup.boolean(),
}),
).min(2).nullable().test(
).min(2).test(
"at-least-one-correct",
"At least one answer must be correct",
(answers: any) => {
@ -111,6 +111,10 @@ export const getValidationSchemaBase = () => {
"At least one answer must be correct",
(answers: any) => {
if(answers === null){
return true
}
return answers.some(
(answer: any) =>
answer.isCorrect === true || answer.isCorrect === 1,

View File

@ -11,7 +11,6 @@ import DeleteModels from "../../../Layout/Dashboard/DeleteModels";
import { ModalEnum } from "../../../enums/Model";
import { useGetAllSubject } from "../../../api/subject";
import { useGetAllGrade } from "../../../api/grade";
import { useGetAllCurriculum } from "../../../api/curriculum";
import PageHeader from "../../../Layout/Dashboard/PageHeader";
import { ABILITIES_ENUM } from "../../../enums/abilities";
import { canAddQuestion } from "../../../utils/hasAbilityFn";