diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index f323db4..c1639e6 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -4,8 +4,10 @@ "dashboard": "داشبورد", "powered_by_witel": "توسعه یافته توسط وایتل", "first_page": "خوش آمدید", + "million_rial": "میلیون ریال", "login": "ورود", "login_expert": "ورود کارشناس", + "update_table": "بروزرسانی", "expert": "کارشناس", "last_updated_at": "آخرین بروزرسانی", "filter_mode": "حالت فیلتر", @@ -163,6 +165,10 @@ }, "PassengerOffice": { "name": "نام", + "shenase_meli": "شناسه ملی", + "is_legal_person": "نوع شخص", + "haghighi": "حقیقی", + "hoghoghi": "حقوقی", "id": "کد یکتا", "national_id": "کد ملی", "phone_number": "موبایل", @@ -190,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": "مبلغ پیشنهادی", @@ -207,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": "مبلغ پیشنهادی", @@ -254,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": "کد ناوگان", @@ -288,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": "مبلغ پیشنهادی", @@ -317,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": "وضعیت درخواست", @@ -561,6 +610,13 @@ "LoanHistory": { "id": "کد یکتا", "name": "نام", + "score": "رتبه", + "navgan_capacity": "ظرفیت", + "manufacture_date": "سال ساخت", + "shenase_meli": "شناسه ملی", + "is_legal_person": "نوع شخص", + "haghighi": "حقیقی", + "hoghoghi": "حقوقی", "tanafos_period": "دوره تنفس", "sakht_period": "دوره ساخت", "national_id": "کد ملی", diff --git a/src/components/dashboard/loan-history/index.jsx b/src/components/dashboard/loan-history/index.jsx index 222c6ae..1567341 100644 --- a/src/components/dashboard/loan-history/index.jsx +++ b/src/components/dashboard/loan-history/index.jsx @@ -30,6 +30,38 @@ function DashboardLoanHistoryComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("LoanHistory.hoghoghi")}` : `${t("LoanHistory.haghighi")}`} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.name, id: "name", @@ -62,9 +94,9 @@ function DashboardLoanHistoryComponent() { ), }, { - accessorFn: (row) => row.phone_number, - id: "phone_number", - header: t("LoanHistory.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + header: t("LoanHistory.shenase_meli"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -81,39 +113,13 @@ function DashboardLoanHistoryComponent() { ), }, { - accessorFn: (row) => row.proposed_amount, - id: "proposed_amount", - header: t("LoanHistory.proposed_amount"), + accessorFn: (row) => row.province_name, + id: "province_name", + header: t("LoanHistory.province_name"), enableColumnFilter: true, - datatype: "numeric", - filterFn: "equals", - columnFilterModeOptions: [ - "equals", - "notEquals", - "contains", - "lessThan", - "greaterThan", - "between", - ], - Cell: ({renderedCellValue}) => ( - {renderedCellValue} - ), - }, - { - 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", - ], + datatype: "text", + filterFn: "contains", + columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), @@ -138,9 +144,9 @@ function DashboardLoanHistoryComponent() { }, }, { - accessorFn: (row) => row.navgan_id, - id: "navgan_id", - header: t("LoanHistory.navgan_id"), + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("LoanHistory.phone_number"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -156,6 +162,113 @@ function DashboardLoanHistoryComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, { accessorFn: (row) => row.sakht_period, id: "sakht_period", @@ -184,30 +297,6 @@ function DashboardLoanHistoryComponent() { {renderedCellValue} ), }, - { - 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}) => ( - {renderedCellValue} - ), - }, - { - 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}) => ( - {renderedCellValue} - ), - }, { accessorFn: (row) => row.state_name, id: "state_id", diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx index 853c065..3b2c0b7 100644 --- a/src/components/dashboard/machinary-office/index.jsx +++ b/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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("MachinaryOffice.hoghoghi")}` : `${t("MachinaryOffice.haghighi")}`} + ), + }, + { + 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, - id: "phone_number", - header: t("MachinaryOffice.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + header: t("MachinaryOffice.shenase_meli"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -81,6 +113,18 @@ function DashboardMachinaryOfficeComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => moment(row.created_at).locale("fa").format("HH:mm | yyyy/MM/DD"), @@ -101,20 +145,66 @@ function DashboardMachinaryOfficeComponent() { }, }, { - accessorFn: (row) => - moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), - id: "updated_at", - header: t("MachinaryOffice.updated_at"), - enableColumnFilter: false, + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("MachinaryOffice.phone_number"), + enableColumnFilter: true, datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), }, { - accessorFn: (row) => row.navgan_id, - id: "navgan_id", - header: t("MachinaryOffice.navgan_id"), + accessorFn: (row) => row.score, + id: "score", + header: t("MachinaryOffice.score"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.manufacture_date, + id: "manufacture_date", + header: t("MachinaryOffice.manufacture_date"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", diff --git a/src/components/dashboard/navgan-loan-management/index.jsx b/src/components/dashboard/navgan-loan-management/index.jsx index 83aeffb..b6447a0 100644 --- a/src/components/dashboard/navgan-loan-management/index.jsx +++ b/src/components/dashboard/navgan-loan-management/index.jsx @@ -31,6 +31,38 @@ function DashboardNavganLoanManagementComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("NavganLoanManagement.hoghoghi")}` : `${t("NavganLoanManagement.haghighi")}`} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.name, id: "name", @@ -63,9 +95,9 @@ function DashboardNavganLoanManagementComponent() { ), }, { - accessorFn: (row) => row.phone_number, - id: "phone_number", - header: t("NavganLoanManagement.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + 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}) => ( {renderedCellValue} ), @@ -110,12 +145,155 @@ function DashboardNavganLoanManagementComponent() { }, }, { - accessorFn: (row) => - moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), - id: "updated_at", - header: t("NavganLoanManagement.updated_at"), - enableColumnFilter: false, + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("NavganLoanManagement.phone_number"), + enableColumnFilter: true, datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + accessorFn: (row) => row.sakht_period, + id: "sakht_period", + header: t("NavganLoanManagement.sakht_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.tanafos_period, + id: "tanafos_period", + header: t("NavganLoanManagement.tanafos_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), diff --git a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx index 02c5348..d63cd63 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -169,12 +169,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {loading ? : <> diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx index 4e2a9ed..3d47dc0 100644 --- a/src/components/dashboard/navgan-province-manager/index.jsx +++ b/src/components/dashboard/navgan-province-manager/index.jsx @@ -32,6 +32,38 @@ function DashboardNavganProvinceManagerComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("NavganProvinceManager.hoghoghi")}` : `${t("NavganProvinceManager.haghighi")}`} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.name, id: "name", @@ -64,9 +96,9 @@ function DashboardNavganProvinceManagerComponent() { ), }, { - accessorFn: (row) => row.phone_number, - id: "phone_number", - header: t("NavganProvinceManager.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + header: t("NavganProvinceManager.shenase_meli"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -83,39 +115,13 @@ function DashboardNavganProvinceManagerComponent() { ), }, { - accessorFn: (row) => row.proposed_amount, - id: "proposed_amount", - header: t("NavganProvinceManager.proposed_amount"), + accessorFn: (row) => row.province_name, + id: "province_name", + header: t("NavganProvinceManager.province_name"), enableColumnFilter: true, - datatype: "numeric", - filterFn: "equals", - columnFilterModeOptions: [ - "equals", - "notEquals", - "contains", - "lessThan", - "greaterThan", - "between", - ], - Cell: ({renderedCellValue}) => ( - {renderedCellValue} - ), - }, - { - 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", - ], + datatype: "text", + filterFn: "contains", + columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), @@ -140,20 +146,9 @@ function DashboardNavganProvinceManagerComponent() { }, }, { - accessorFn: (row) => - moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), - id: "updated_at", - header: t("NavganProvinceManager.updated_at"), - enableColumnFilter: false, - datatype: "numeric", - Cell: ({renderedCellValue}) => ( - {renderedCellValue} - ), - }, - { - accessorFn: (row) => row.navgan_id, - id: "navgan_id", - header: t("NavganProvinceManager.navgan_id"), + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("NavganProvinceManager.phone_number"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -181,6 +176,72 @@ function DashboardNavganProvinceManagerComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + accessorFn: (row) => row.sakht_period, + id: "sakht_period", + header: t("NavganProvinceManager.sakht_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.tanafos_period, + id: "tanafos_period", + header: t("NavganProvinceManager.tanafos_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.state_name, id: "state_id", diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 8cc3c4a..96b000d 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -133,8 +133,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand if (values.description != "") formData.append("expert_description", values.description); const attachments = [ - { title: 'فرم الف', file: values.first_img }, - { title: 'فرم ب', file: values.second_img } + {title: 'فرم الف', file: values.first_img}, + {title: 'فرم ب', file: values.second_img} ]; attachments.forEach((attachment, index) => { @@ -142,7 +142,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand formData.append(`attachment[${index}][file]`, attachment.file); }); - requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post',{ + requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { notification: true, data: formData, }).then((response) => { @@ -220,7 +220,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand {loading ? : <> diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 13674dc..271626f 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -32,6 +32,38 @@ function DashboardPassengerOfficeComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("PassengerBoss.hoghoghi")}` : `${t("PassengerBoss.haghighi")}`} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.name, id: "name", @@ -64,9 +96,9 @@ function DashboardPassengerOfficeComponent() { ), }, { - accessorFn: (row) => row.phone_number, - id: "phone_number", - header: t("PassengerBoss.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + header: t("PassengerBoss.shenase_meli"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -83,20 +115,13 @@ function DashboardPassengerOfficeComponent() { ), }, { - accessorFn: (row) => row.proposed_amount, - id: "proposed_amount", - header: t("PassengerBoss.proposed_amount"), + accessorFn: (row) => row.province_name, + id: "province_name", + header: t("PassengerBoss.province_name"), enableColumnFilter: true, - datatype: "numeric", - filterFn: "equals", - columnFilterModeOptions: [ - "equals", - "notEquals", - "contains", - "lessThan", - "greaterThan", - "between", - ], + datatype: "text", + filterFn: "contains", + columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), @@ -121,20 +146,66 @@ function DashboardPassengerOfficeComponent() { }, }, { - accessorFn: (row) => - moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), - id: "updated_at", - header: t("PassengerBoss.updated_at"), - enableColumnFilter: false, + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("PassengerBoss.phone_number"), + enableColumnFilter: true, datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), }, { - accessorFn: (row) => row.navgan_id, - id: "navgan_id", - header: t("PassengerBoss.navgan_id"), + accessorFn: (row) => row.score, + id: "score", + header: t("PassengerBoss.score"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals", + "notEquals", + "contains", + "lessThan", + "greaterThan", + "between", + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, + { + 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() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + accessorFn: (row) => row.sakht_period, + id: "sakht_period", + header: t("PassengerBoss.sakht_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.tanafos_period, + id: "tanafos_period", + header: t("PassengerBoss.tanafos_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.state_name, id: "state_id", diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index ae1ceea..825bacc 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -2,10 +2,11 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import { - Box, - Button, Checkbox, + Button, + Checkbox, DialogActions, - DialogContent, FormControlLabel, + DialogContent, + FormControlLabel, FormHelperText, Grid, LinearProgress, @@ -179,12 +180,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {loading ? : <> diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index 2ff3796..0e4976b 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -31,6 +31,38 @@ function DashboardTransportationAssistanceComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue === 1 ? `${t("TransportationAssistance.hoghoghi")}` : `${t("TransportationAssistance.haghighi")}`} + ), + }, + { + 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}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.name, id: "name", @@ -64,9 +96,9 @@ function DashboardTransportationAssistanceComponent() { ), }, { - accessorFn: (row) => row.phone_number, - id: "phone_number", - header: t("TransportationAssistance.phone_number"), + accessorFn: (row) => row.shenase_meli, + id: "shenase_meli", + header: t("TransportationAssistance.shenase_meli"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -83,39 +115,13 @@ function DashboardTransportationAssistanceComponent() { ), }, { - accessorFn: (row) => row.proposed_amount, - id: "proposed_amount", - header: `${t("TransportationAssistance.proposed_amount")}`, + accessorFn: (row) => row.province_name, + id: "province_name", + header: t("TransportationAssistance.province_name"), enableColumnFilter: true, - datatype: "numeric", - filterFn: "equals", - columnFilterModeOptions: [ - "equals", - "notEquals", - "contains", - "lessThan", - "greaterThan", - "between", - ], - Cell: ({renderedCellValue}) => ( - {renderedCellValue} - ), - }, - { - 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", - ], + datatype: "text", + filterFn: "contains", + columnFilterModeOptions: ["contains", "equals", "notEquals"], Cell: ({renderedCellValue}) => ( {renderedCellValue} ), @@ -140,20 +146,9 @@ function DashboardTransportationAssistanceComponent() { }, }, { - accessorFn: (row) => - moment(row.updated_at).locale("fa").format("HH:mm | yyyy/MM/DD"), - id: "updated_at", - header: t("TransportationAssistance.updated_at"), - enableColumnFilter: false, - datatype: "numeric", - Cell: ({renderedCellValue}) => ( - {renderedCellValue} - ), - }, - { - accessorFn: (row) => row.navgan_id, - id: "navgan_id", - header: t("TransportationAssistance.navgan_id"), + accessorFn: (row) => row.phone_number, + id: "phone_number", + header: t("TransportationAssistance.phone_number"), enableColumnFilter: true, datatype: "numeric", filterFn: "equals", @@ -181,6 +176,72 @@ function DashboardTransportationAssistanceComponent() { {renderedCellValue} ), }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + 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}) => ( + {renderedCellValue / 1000000} + ), + }, + { + accessorFn: (row) => row.sakht_period, + id: "sakht_period", + header: t("TransportationAssistance.sakht_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.tanafos_period, + id: "tanafos_period", + header: t("TransportationAssistance.tanafos_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.state_name, id: "state_id", diff --git a/src/core/components/DataTable.jsx b/src/core/components/DataTable.jsx index 8274f96..e56d147 100644 --- a/src/core/components/DataTable.jsx +++ b/src/core/components/DataTable.jsx @@ -3,9 +3,10 @@ import useLanguage from "@/lib/app/hooks/useLanguage"; import {useEffect, useMemo, useState} from "react"; import moment from "moment-jalaali"; import useSWR from "swr"; -import {Typography} from "@mui/material"; +import {IconButton, Tooltip, Typography} from "@mui/material"; import MaterialReactTable from "material-react-table"; import useRequest from "@/lib/app/hooks/useRequest"; +import RefreshIcon from '@mui/icons-material/Refresh'; function DataTable(props) { const requestServer = useRequest({auth: true}) @@ -116,6 +117,11 @@ function DataTable(props) { /* send component */ : } + + mutate()}> + + + )} renderBottomToolbarCustomActions={({table}) => (<> {props.enableLastUpdate /* send condition */ ? ( { height: "4px", }, }, - + " input[type='number']::-webkit-inner-spin-button,input[type='number']::-webkit-outer-spin-button " :{ + "-webkit-appearance":"none", + margin: 0 + }, + " input[type='number']" :{ + "-moz-appearance":"textfield", + }, body: { width: "100vw", height: "100vh",