Merge branch 'feature/Amin_columns_rebuild' into 'develop'

add score manufacture capacity columns in tables and restyle all table

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

public/locales/fa/app.json

@@ -4,6 +4,7 @@
   "dashboard": "داشبورد",
   "powered_by_witel": "توسعه یافته توسط وایتل",
   "first_page": "خوش آمدید",
+  "million_rial": "میلیون ریال",
   "login": "ورود",
   "login_expert": "ورود کارشناس",
   "update_table": "بروزرسانی",
@@ -164,6 +165,10 @@
   },
   "PassengerOffice": {
     "name": "نام",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
     "id": "کد یکتا",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
@@ -191,6 +196,13 @@
   "NavganProvinceManager": {
     "name": "نام",
     "id": "کد یکتا",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
+    "sakht_period": "دوره ساخت",
+    "tanafos_period": "دوره تنفس",
+    "province_name": "استان",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
     "proposed_amount": "مبلغ پیشنهادی",
@@ -208,6 +220,16 @@
   "PassengerBoss": {
     "name": "نام",
     "id": "کد یکتا",
+    "score": "رتبه",
+    "navgan_capacity": "ظرفیت",
+    "manufacture_date": "سال ساخت",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
+    "province_name": "استان",
+    "sakht_period": "دوره ساخت",
+    "tanafos_period": "دوره تنفس",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
     "proposed_amount": "مبلغ پیشنهادی",
@@ -255,9 +277,20 @@
   "NavganLoanManagement": {
     "name": "نام",
     "id": "کد یکتا",
+    "score": "رتبه",
+    "navgan_capacity": "ظرفیت",
+    "manufacture_date": "سال ساخت",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
+    "sakht_period": "دوره ساخت",
+    "tanafos_period": "دوره تنفس",
     "province_name": "استان",
+    "proposed_amount": "مبلغ پیشنهادی",
+    "approved_amount": "مبلغ تصویب شده",
     "created_at": "تاریخ درخواست",
     "updated_at": "تاریخ بروزرسانی",
     "navgan_id": "کد ناوگان",
@@ -289,6 +322,13 @@
   "TransportationAssistance": {
     "name": "نام",
     "id": "کد یکتا",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
+    "sakht_period": "دوره ساخت",
+    "tanafos_period": "دوره تنفس",
+    "province_name": "استان",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
     "proposed_amount": "مبلغ پیشنهادی",
@@ -318,10 +358,18 @@
   "MachinaryOffice": {
     "name": "نام",
     "id": "کد یکتا",
+    "score": "رتبه",
+    "navgan_capacity": "ظرفیت",
+    "manufacture_date": "سال ساخت",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
     "national_id": "کد ملی",
     "phone_number": "موبایل",
     "created_at": "تاریخ درخواست",
     "updated_at": "تاریخ بروزرسانی",
+    "province_name": "استان",
     "navgan_id": "کد ناوگان",
     "vehicle_type": "نوع ماشین",
     "state_name": "وضعیت درخواست",
@@ -562,6 +610,13 @@
   "LoanHistory": {
     "id": "کد یکتا",
     "name": "نام",
+    "score": "رتبه",
+    "navgan_capacity": "ظرفیت",
+    "manufacture_date": "سال ساخت",
+    "shenase_meli": "شناسه ملی",
+    "is_legal_person": "نوع شخص",
+    "haghighi": "حقیقی",
+    "hoghoghi": "حقوقی",
     "tanafos_period": "دوره تنفس",
     "sakht_period": "دوره ساخت",
     "national_id": "کد ملی",

src/components/dashboard/loan-history/index.jsx

@@ -30,6 +30,38 @@ function DashboardLoanHistoryComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("LoanHistory.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("LoanHistory.hoghoghi")}` : `${t("LoanHistory.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("LoanHistory.navgan_id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -62,9 +94,9 @@ function DashboardLoanHistoryComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("LoanHistory.phone_number"),
+                header: t("LoanHistory.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -81,39 +113,13 @@ function DashboardLoanHistoryComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.proposed_amount,
+                accessorFn: (row) => row.province_name,
-                id: "proposed_amount",
+                id: "province_name",
-                header: t("LoanHistory.proposed_amount"),
+                header: t("LoanHistory.province_name"),
                 enableColumnFilter: true,
-                datatype: "numeric",
+                datatype: "text",
-                filterFn: "equals",
+                filterFn: "contains",
-                columnFilterModeOptions: [
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.approved_amount,
-                id: "approved_amount",
-                header: t("LoanHistory.approved_amount"),
-                enableColumnFilter: true,
-                datatype: "numeric",
-                filterFn: "equals",
-                columnFilterModeOptions: [
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
@@ -138,9 +144,9 @@ function DashboardLoanHistoryComponent() {
                 },
             },
             {
-                accessorFn: (row) => row.navgan_id,
+                accessorFn: (row) => row.phone_number,
-                id: "navgan_id",
+                id: "phone_number",
-                header: t("LoanHistory.navgan_id"),
+                header: t("LoanHistory.phone_number"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -156,6 +162,113 @@ function DashboardLoanHistoryComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.score,
+                id: "score",
+                header: t("LoanHistory.score"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_capacity,
+                id: "navgan_capacity",
+                header: t("LoanHistory.navgan_capacity"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.manufacture_date,
+                id: "manufacture_date",
+                header: t("LoanHistory.manufacture_date"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.vehicle_type,
+                id: "vehicle_type",
+                header: t("LoanHistory.vehicle_type"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.proposed_amount,
+                id: "proposed_amount",
+                header: t("LoanHistory.proposed_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.approved_amount,
+                id: "approved_amount",
+                header: t("LoanHistory.approved_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.sakht_period,
                 id: "sakht_period",
@@ -184,30 +297,6 @@ function DashboardLoanHistoryComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
-            {
-                accessorFn: (row) => row.province_name,
-                id: "province_name",
-                header: t("LoanHistory.province_name"),
-                enableColumnFilter: true,
-                datatype: "text",
-                filterFn: "contains",
-                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.vehicle_type,
-                id: "vehicle_type",
-                header: t("LoanHistory.vehicle_type"),
-                enableColumnFilter: true,
-                datatype: "text",
-                filterFn: "contains",
-                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
             {
                 accessorFn: (row) => row.state_name,
                 id: "state_id",

src/components/dashboard/machinary-office/index.jsx

@@ -15,7 +15,39 @@ function DashboardMachinaryOfficeComponent() {
             {
                 accessorFn: (row) => row.id,
                 id: "id",
-                header: t("PassengerOffice.id"),
+                header: t("MachinaryOffice.id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("MachinaryOffice.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("MachinaryOffice.hoghoghi")}` : `${t("MachinaryOffice.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("MachinaryOffice.navgan_id"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -63,9 +95,9 @@ function DashboardMachinaryOfficeComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("MachinaryOffice.phone_number"),
+                header: t("MachinaryOffice.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -81,6 +113,18 @@ function DashboardMachinaryOfficeComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.province_name,
+                id: "province_name",
+                header: t("MachinaryOffice.province_name"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) =>
                     moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
@@ -101,20 +145,66 @@ function DashboardMachinaryOfficeComponent() {
                 },
             },
             {
-                accessorFn: (row) =>
+                accessorFn: (row) => row.phone_number,
-                    moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                id: "phone_number",
-                id: "updated_at",
+                header: t("MachinaryOffice.phone_number"),
-                header: t("MachinaryOffice.updated_at"),
+                enableColumnFilter: true,
-                enableColumnFilter: false,
                 datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
             {
-                accessorFn: (row) => row.navgan_id,
+                accessorFn: (row) => row.score,
-                id: "navgan_id",
+                id: "score",
-                header: t("MachinaryOffice.navgan_id"),
+                header: t("MachinaryOffice.score"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_capacity,
+                id: "navgan_capacity",
+                header: t("MachinaryOffice.navgan_capacity"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.manufacture_date,
+                id: "manufacture_date",
+                header: t("MachinaryOffice.manufacture_date"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",

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

@@ -31,6 +31,38 @@ function DashboardNavganLoanManagementComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("NavganLoanManagement.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("NavganLoanManagement.hoghoghi")}` : `${t("NavganLoanManagement.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("NavganLoanManagement.navgan_id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -63,9 +95,9 @@ function DashboardNavganLoanManagementComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("NavganLoanManagement.phone_number"),
+                header: t("NavganLoanManagement.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -85,7 +117,10 @@ function DashboardNavganLoanManagementComponent() {
                 accessorFn: (row) => row.province_name,
                 id: "province_name",
                 header: t("NavganLoanManagement.province_name"),
-                enableColumnFilter: false,
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
@@ -110,12 +145,155 @@ function DashboardNavganLoanManagementComponent() {
                 },
             },
             {
-                accessorFn: (row) =>
+                accessorFn: (row) => row.phone_number,
-                    moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                id: "phone_number",
-                id: "updated_at",
+                header: t("NavganLoanManagement.phone_number"),
-                header: t("NavganLoanManagement.updated_at"),
+                enableColumnFilter: true,
-                enableColumnFilter: false,
                 datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.score,
+                id: "score",
+                header: t("NavganLoanManagement.score"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_capacity,
+                id: "navgan_capacity",
+                header: t("NavganLoanManagement.navgan_capacity"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.manufacture_date,
+                id: "manufacture_date",
+                header: t("NavganLoanManagement.manufacture_date"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.vehicle_type,
+                id: "vehicle_type",
+                header: t("NavganLoanManagement.vehicle_type"),
+                enableColumnFilter: true,
+                datatype: "text",
+                filterFn: "contains",
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.proposed_amount,
+                id: "proposed_amount",
+                header: t("NavganLoanManagement.proposed_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.approved_amount,
+                id: "approved_amount",
+                header: t("NavganLoanManagement.approved_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.sakht_period,
+                id: "sakht_period",
+                header: t("NavganLoanManagement.sakht_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.tanafos_period,
+                id: "tanafos_period",
+                header: t("NavganLoanManagement.tanafos_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),

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

@@ -32,6 +32,38 @@ function DashboardNavganProvinceManagerComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("NavganProvinceManager.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("NavganProvinceManager.hoghoghi")}` : `${t("NavganProvinceManager.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("NavganProvinceManager.navgan_id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -64,9 +96,9 @@ function DashboardNavganProvinceManagerComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("NavganProvinceManager.phone_number"),
+                header: t("NavganProvinceManager.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -83,39 +115,13 @@ function DashboardNavganProvinceManagerComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.proposed_amount,
+                accessorFn: (row) => row.province_name,
-                id: "proposed_amount",
+                id: "province_name",
-                header: t("NavganProvinceManager.proposed_amount"),
+                header: t("NavganProvinceManager.province_name"),
                 enableColumnFilter: true,
-                datatype: "numeric",
+                datatype: "text",
-                filterFn: "equals",
+                filterFn: "contains",
-                columnFilterModeOptions: [
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.approved_amount,
-                id: "approved_amount",
-                header: t("NavganProvinceManager.approved_amount"),
-                enableColumnFilter: true,
-                datatype: "numeric",
-                filterFn: "equals",
-                columnFilterModeOptions: [
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
@@ -140,20 +146,9 @@ function DashboardNavganProvinceManagerComponent() {
                 },
             },
             {
-                accessorFn: (row) =>
+                accessorFn: (row) => row.phone_number,
-                    moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                id: "phone_number",
-                id: "updated_at",
+                header: t("NavganProvinceManager.phone_number"),
-                header: t("NavganProvinceManager.updated_at"),
-                enableColumnFilter: false,
-                datatype: "numeric",
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.navgan_id,
-                id: "navgan_id",
-                header: t("NavganProvinceManager.navgan_id"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -181,6 +176,72 @@ function DashboardNavganProvinceManagerComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.proposed_amount,
+                id: "proposed_amount",
+                header: t("NavganProvinceManager.proposed_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.approved_amount,
+                id: "approved_amount",
+                header: t("NavganProvinceManager.approved_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.sakht_period,
+                id: "sakht_period",
+                header: t("NavganProvinceManager.sakht_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.tanafos_period,
+                id: "tanafos_period",
+                header: t("NavganProvinceManager.tanafos_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.state_name,
                 id: "state_id",

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

@@ -32,6 +32,38 @@ function DashboardPassengerOfficeComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("PassengerBoss.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("PassengerBoss.hoghoghi")}` : `${t("PassengerBoss.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("PassengerBoss.navgan_id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -64,9 +96,9 @@ function DashboardPassengerOfficeComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("PassengerBoss.phone_number"),
+                header: t("PassengerBoss.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -83,20 +115,13 @@ function DashboardPassengerOfficeComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.proposed_amount,
+                accessorFn: (row) => row.province_name,
-                id: "proposed_amount",
+                id: "province_name",
-                header: t("PassengerBoss.proposed_amount"),
+                header: t("PassengerBoss.province_name"),
                 enableColumnFilter: true,
-                datatype: "numeric",
+                datatype: "text",
-                filterFn: "equals",
+                filterFn: "contains",
-                columnFilterModeOptions: [
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
@@ -121,20 +146,66 @@ function DashboardPassengerOfficeComponent() {
                 },
             },
             {
-                accessorFn: (row) =>
+                accessorFn: (row) => row.phone_number,
-                    moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                id: "phone_number",
-                id: "updated_at",
+                header: t("PassengerBoss.phone_number"),
-                header: t("PassengerBoss.updated_at"),
+                enableColumnFilter: true,
-                enableColumnFilter: false,
                 datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
             {
-                accessorFn: (row) => row.navgan_id,
+                accessorFn: (row) => row.score,
-                id: "navgan_id",
+                id: "score",
-                header: t("PassengerBoss.navgan_id"),
+                header: t("PassengerBoss.score"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_capacity,
+                id: "navgan_capacity",
+                header: t("PassengerBoss.navgan_capacity"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.manufacture_date,
+                id: "manufacture_date",
+                header: t("PassengerBoss.manufacture_date"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -162,6 +233,53 @@ function DashboardPassengerOfficeComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.proposed_amount,
+                id: "proposed_amount",
+                header: t("PassengerBoss.proposed_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.sakht_period,
+                id: "sakht_period",
+                header: t("PassengerBoss.sakht_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.tanafos_period,
+                id: "tanafos_period",
+                header: t("PassengerBoss.tanafos_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.state_name,
                 id: "state_id",

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

@@ -31,6 +31,38 @@ function DashboardTransportationAssistanceComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.is_legal_person,
+                id: "is_legal_person",
+                header: t("TransportationAssistance.is_legal_person"),
+                enableColumnFilter: false,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: ["equals"],
+                Cell: ({renderedCellValue}) => (
+                    <Typography
+                        variant="body2">{renderedCellValue === 1 ? `${t("TransportationAssistance.hoghoghi")}` : `${t("TransportationAssistance.haghighi")}`}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.navgan_id,
+                id: "navgan_id",
+                header: t("TransportationAssistance.navgan_id"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.name,
                 id: "name",
@@ -64,9 +96,9 @@ function DashboardTransportationAssistanceComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.phone_number,
+                accessorFn: (row) => row.shenase_meli,
-                id: "phone_number",
+                id: "shenase_meli",
-                header: t("TransportationAssistance.phone_number"),
+                header: t("TransportationAssistance.shenase_meli"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -83,39 +115,13 @@ function DashboardTransportationAssistanceComponent() {
                 ),
             },
             {
-                accessorFn: (row) => row.proposed_amount,
+                accessorFn: (row) => row.province_name,
-                id: "proposed_amount",
+                id: "province_name",
-                header: `${t("TransportationAssistance.proposed_amount")}`,
+                header: t("TransportationAssistance.province_name"),
                 enableColumnFilter: true,
-                datatype: "numeric",
+                datatype: "text",
-                filterFn: "equals",
+                filterFn: "contains",
-                columnFilterModeOptions: [
+                columnFilterModeOptions: ["contains", "equals", "notEquals"],
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.approved_amount,
-                id: "approved_amount",
-                header: t("TransportationAssistance.approved_amount"),
-                enableColumnFilter: true,
-                datatype: "numeric",
-                filterFn: "equals",
-                columnFilterModeOptions: [
-                    "equals",
-                    "notEquals",
-                    "contains",
-                    "lessThan",
-                    "greaterThan",
-                    "between",
-                ],
                 Cell: ({renderedCellValue}) => (
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
@@ -140,20 +146,9 @@ function DashboardTransportationAssistanceComponent() {
                 },
             },
             {
-                accessorFn: (row) =>
+                accessorFn: (row) => row.phone_number,
-                    moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"),
+                id: "phone_number",
-                id: "updated_at",
+                header: t("TransportationAssistance.phone_number"),
-                header: t("TransportationAssistance.updated_at"),
-                enableColumnFilter: false,
-                datatype: "numeric",
-                Cell: ({renderedCellValue}) => (
-                    <Typography variant="body2">{renderedCellValue}</Typography>
-                ),
-            },
-            {
-                accessorFn: (row) => row.navgan_id,
-                id: "navgan_id",
-                header: t("TransportationAssistance.navgan_id"),
                 enableColumnFilter: true,
                 datatype: "numeric",
                 filterFn: "equals",
@@ -181,6 +176,72 @@ function DashboardTransportationAssistanceComponent() {
                     <Typography variant="body2">{renderedCellValue}</Typography>
                 ),
             },
+            {
+                accessorFn: (row) => row.proposed_amount,
+                id: "proposed_amount",
+                header: t("TransportationAssistance.proposed_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.approved_amount,
+                id: "approved_amount",
+                header: t("TransportationAssistance.approved_amount"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals",
+                    "notEquals",
+                    "contains",
+                    "lessThan",
+                    "greaterThan",
+                    "between",
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue / 1000000}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.sakht_period,
+                id: "sakht_period",
+                header: t("TransportationAssistance.sakht_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
+            {
+                accessorFn: (row) => row.tanafos_period,
+                id: "tanafos_period",
+                header: t("TransportationAssistance.tanafos_period"),
+                enableColumnFilter: true,
+                datatype: "numeric",
+                filterFn: "equals",
+                columnFilterModeOptions: [
+                    "equals"
+                ],
+                Cell: ({renderedCellValue}) => (
+                    <Typography variant="body2">{renderedCellValue}</Typography>
+                ),
+            },
             {
                 accessorFn: (row) => row.state_name,
                 id: "state_id",