loan/expert-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/expert into develop

Browse Source
This commit is contained in:
AmirHossein Mahmoodi
2024-01-03 10:23:14 +03:30
parent c1a586bb34 3475273f38
commit 33d6f20e46
12 changed files with 884 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
public/locales/fa/app.json
View File

@@ -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": "کد ملی",

213
src/components/dashboard/loan-history/index.jsx
View File

@@ -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,
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}) => (
<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",
],
datatype: "text",
filterFn: "contains",
columnFilterModeOptions: ["contains", "equals", "notEquals"],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
@@ -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() {
<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",

114
src/components/dashboard/machinary-office/index.jsx
View File

@@ -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,
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() {
<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) =>
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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
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}) => (
<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",

196
src/components/dashboard/navgan-loan-management/index.jsx
View File

@@ -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,
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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
@@ -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}) => (
<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>
),

4
src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -169,12 +169,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 10}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>

159
src/components/dashboard/navgan-province-manager/index.jsx
View File

@@ -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,
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}) => (
<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",
],
datatype: "text",
filterFn: "contains",
columnFilterModeOptions: ["contains", "equals", "notEquals"],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
@@ -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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
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() {
<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",

8
src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -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 ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>

166
src/components/dashboard/passenger-boss/index.jsx
View File

@@ -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,
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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
@@ -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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
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}) => (
<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",

11
src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
View File

@@ -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 ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 10}
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 10}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>

159
src/components/dashboard/transportation-assistance/index.jsx
View File

@@ -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,
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}) => (
<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",
],
datatype: "text",
filterFn: "contains",
columnFilterModeOptions: ["contains", "equals", "notEquals"],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
@@ -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}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
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() {
<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",

8
src/core/components/DataTable.jsx
View File

@@ -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) {
<props.CustomToolbar
table={table}
mutate={mutate}/> /* send component */ : <span></span>}
<Tooltip arrow title={t("update_table")} sx={{ml: "auto"}}>
<IconButton onClick={() => mutate()}>
<RefreshIcon/>
</IconButton>
</Tooltip>
</>)}
renderBottomToolbarCustomActions={({table}) => (<>
{props.enableLastUpdate /* send condition */ ? (<Typography

8
src/layouts/MuiLayout.jsx
View File

@@ -50,7 +50,13 @@ const MuiLayout = ({children, isBot}) => {
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",