diff --git a/src/Components/ValidationField/View/SelectField.tsx b/src/Components/ValidationField/View/SelectField.tsx index 18a7acc..5c5758f 100644 --- a/src/Components/ValidationField/View/SelectField.tsx +++ b/src/Components/ValidationField/View/SelectField.tsx @@ -28,6 +28,8 @@ const SelectField = ({ formik.setFieldValue(name, value); }; const options = translateOptions(option, t); + console.log(options); + return (
{ + console.log(options); + return options?.map((opt: any) => ({ ...opt, label: t(`${opt?.label}`), diff --git a/src/Pages/Admin/Unit/Model/ModelForm.tsx b/src/Pages/Admin/Unit/Model/ModelForm.tsx index 8502c77..bd3d007 100644 --- a/src/Pages/Admin/Unit/Model/ModelForm.tsx +++ b/src/Pages/Admin/Unit/Model/ModelForm.tsx @@ -19,6 +19,7 @@ const Form = () => { placeholder="term" label="term" option={termsArray} + /> diff --git a/src/api/utils/enumToArray.ts b/src/api/utils/enumToArray.ts index 42f8ca4..ac228b3 100644 --- a/src/api/utils/enumToArray.ts +++ b/src/api/utils/enumToArray.ts @@ -1,6 +1,6 @@ export const enumToArray = (enumObj: any) => { return Object.keys(enumObj).map((key) => ({ - value: enumObj[key], - label: `select.enums.${enumObj[key]}`, + id: enumObj[key], + name: `select.enums.${enumObj[key]}`, })); }; diff --git a/src/translate/ar.json b/src/translate/ar.json index 824db3d..a480f2e 100644 --- a/src/translate/ar.json +++ b/src/translate/ar.json @@ -413,6 +413,10 @@ "id_image":"صورة الهوية" }, "select": { + "enums": { + "first_term": "الفصل الأول", + "second_term": "الفصل الثاني" + }, "Payments": { "paid": "قبض", "to_be_paid": "مرتجع", @@ -663,10 +667,7 @@ "admin": "المسؤول", "branchAdmin": "مسؤول الفروع" }, - "enums": { - "first_term": "الفصل الأول", - "second_term": "الفصل الثاني" - }, + "array": { "Period": { "Today": "اليوم",