Merge branch 'feature/change_name_column' into 'develop'

change name columns

See merge request witel-front-end/loan-facilities/expert-v2!23

public/locales/fa/app.json

@@ -300,6 +300,8 @@
     "birthday": "تاریخ تولد",
     "approved_amount": "مبلغ مصوب",
     "branch_name": "نام شعبه",
+    "first_name": "نام",
+    "last_name": "نام خانوادگی",
     "bank_state": "وضعیت پیگیری بانک",
     "button-reserve-confirm": "رزرو",
     "reserve-loan-title": "رزرو وام",
@@ -429,6 +431,8 @@
   },
   "NavganLoanManagement": {
     "name": "نام",
+    "first_name": "نام",
+    "last_name": "نام خانوادگی",
     "id": "کد یکتا",
     "excel_report": "گزارش اکسل",
     "city_name": "شهرستان",
@@ -543,6 +547,8 @@
     "hoghoghi": "حقوقی",
     "haghighi": "حقیقی",
     "city_name": "شهرستان",
+    "first_name": "نام",
+    "last_name": "نام خانوادگی",
     "plate_number": "پلاک",
     "id": "کد یکتا",
     "existing_employment": "اشتغال موجود",
@@ -597,6 +603,8 @@
   "BankManagement": {
     "name": "نام",
     "id": "کد یکتا",
+    "first_name": "نام",
+    "last_name": "نام خانوادگی",
     "national_serial_number": "سریال پشت کارت ملی",
     "birthday": "تاریخ تولد",
     "approved_amount": "مبلغ مصوب",

src/components/dashboard/navgan/bank-management/index.jsx

@@ -32,9 +32,19 @@ function DashboardBankManagementComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("BankManagement.name"),
+                header: t("BankManagement.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("BankManagement.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/loan-followup/index.jsx

@@ -33,9 +33,19 @@ function DashboardLoanFollowUpComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("LoanFollowUp.name"),
+                header: t("LoanFollowUp.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("LoanFollowUp.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/navgan-loan-management/index.jsx

@@ -50,9 +50,19 @@ function DashboardNavganLoanManagementComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("NavganLoanManagement.name"),
+                header: t("NavganLoanManagement.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("NavganLoanManagement.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/navgan-province-manager/index.jsx

@@ -50,9 +50,19 @@ function DashboardNavganProvinceManagerComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("NavganProvinceManager.name"),
+                header: t("NavganProvinceManager.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("NavganProvinceManager.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/passenger-boss/index.jsx

@@ -48,9 +48,19 @@ function DashboardPassengerOfficeComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("PassengerBoss.name"),
+                header: t("PassengerBoss.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("PassengerBoss.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/reserve-loan/index.jsx

@@ -47,9 +47,19 @@ function DashboardReserveLoan() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("ReserveLoan.name"),
+                header: t("ReserveLoan.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("ReserveLoan.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",

src/components/dashboard/navgan/transportation-assistance/index.jsx

@@ -49,16 +49,25 @@ function DashboardTransportationAssistanceComponent() {
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
             {
-                accessorFn: (row) => row.name,
+                accessorFn: (row) => row.first_name,
-                id: "name",
+                id: "first_name",
-                header: t("TransportationAssistance.name"),
+                header: t("TransportationAssistance.first_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
+            },
+            {
+                accessorFn: (row) => row.last_name,
+                id: "last_name",
+                header: t("TransportationAssistance.last_name"),
                 enableColumnFilter: true,
                 datatype: "text",
                 filterFn: "contains",
                 columnFilterModeOptions: ["contains", "equals", "notEquals"],
                 Cell: ({ renderedCellValue }) => <Typography variant="body2">{renderedCellValue}</Typography>,
             },
-
             {
                 accessorFn: (row) => row.national_id,
                 id: "national_id",

src/core/data/sidebarMenu.jsx

@@ -168,7 +168,7 @@ const sidebarMenu = [
             route: "/dashboard/refahi/refahi-province-manager",
             icon: <DesktopWindowsIcon sx={{ width: "inherit", height: "inherit" }} />,
             selected: false,
-            permissions: ["manage_province_affairs_navgan"],
+            permissions: ["manage_province_affairs_refahi"],
         },
         // {
         //     key: "sidebar.build-province-manager",

src/pages/dashboard/refahi/refahi-province-manager/index.jsx

@@ -13,7 +13,7 @@ export async function getServerSideProps({ req, locale }) {
             title: "Dashboard.province_manager_page",
             isBot,
             locale,
-            layout: { name: "DashboardLayout", props: { permissions: ["manage_province_affairs_navgan"] } }, //پرمیشن باید عوض بشه
+            layout: { name: "DashboardLayout", props: { permissions: ["manage_province_affairs_refahi"] } },
         },
     };
 }