diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 865f83d..c17c938 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -201,6 +201,9 @@ "position": "سمت", "province_fa": "استان", "role_name": "نقش", + "gender": "جنسیت", + "male": "مرد", + "female": "زن", "updated_at": "آخرین بروزرسانی", "create": "افزودن کارشناس", "personal_info": "مشخصات کارشناس", diff --git a/src/components/dashboard/expert-management/DataTable/__tests__/index.test.js b/src/components/dashboard/expert-management/DataTable/__tests__/index.test.js index eaad727..0ed26eb 100644 --- a/src/components/dashboard/expert-management/DataTable/__tests__/index.test.js +++ b/src/components/dashboard/expert-management/DataTable/__tests__/index.test.js @@ -14,8 +14,8 @@ describe("ExpertManagementDatatable Component From Expert Management", () => { const national_idHeader = screen.queryByText("کد ملی"); const positionHeader = screen.queryByText("سمت"); const province_nameHeader = screen.queryByText("استان"); - const city_nameHeader = screen.queryByText("شهر"); const role_nameHeader = screen.queryByText("نقش"); + const genderHeader = screen.queryByText("جنسیت"); const updated_atHeader = screen.queryByText("آخرین بروزرسانی"); expect(idHeader).toBeInTheDocument(); expect(nameHeader).toBeInTheDocument(); @@ -25,8 +25,8 @@ describe("ExpertManagementDatatable Component From Expert Management", () => { expect(national_idHeader).toBeInTheDocument(); expect(positionHeader).toBeInTheDocument(); expect(province_nameHeader).toBeInTheDocument(); - expect(city_nameHeader).toBeInTheDocument(); expect(role_nameHeader).toBeInTheDocument(); + expect(genderHeader).toBeInTheDocument(); expect(updated_atHeader).toBeInTheDocument(); }); }); diff --git a/src/components/dashboard/expert-management/DataTable/index.jsx b/src/components/dashboard/expert-management/DataTable/index.jsx index 697fab1..9c4e763 100644 --- a/src/components/dashboard/expert-management/DataTable/index.jsx +++ b/src/components/dashboard/expert-management/DataTable/index.jsx @@ -127,6 +127,19 @@ function ExpertManagementDataTable() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.gender, + id: "gender", + header: t("ExpertMangement.gender"), + enableColumnFilter: false, + datatype: "text", + filterFn: "contains", + columnFilterModeOptions: ["contains", "equals", "notEquals"], + Cell: ({renderedCellValue}) => ( + {renderedCellValue === "male" ? t("ExpertMangement.male") : t("ExpertMangement.female")} + ), + }, { accessorFn: (row) => moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),