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

change transportation and navgan manager and add coloumns

Browse Source
This commit is contained in:
AminGhasempoor
2024-05-11 14:36:35 +03:30
parent 323cfa95c3
commit 8171e325f8
6 changed files with 325 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -215,6 +215,13 @@
"NavganProvinceManager": {
"name": "نام",
"id": "کد یکتا",
"bank_facility": "سهم بانک",
"government_facility": "سهم دولت",
"user_facility": "سهم متقاضی",
"physical_progress": "درصد پیشرفت فیزیکی",
"repayment_period": "دوره باز پرداخت",
"committed_employment": "اشتغال ایجاد شده",
"available_jobs": "اشتغال موجود",
"city_name": "شهرستان",
"plate_number": "پلاک",
"statement_count": "تعداد صورت وضعیت",
@@ -360,6 +367,13 @@
"city_name": "شهرستان",
"plate_number": "پلاک",
"id": "کد یکتا",
"bank_facility": "سهم بانک",
"government_facility": "سهم دولت",
"user_facility": "سهم متقاضی",
"physical_progress": "درصد پیشرفت فیزیکی",
"repayment_period": "دوره باز پرداخت",
"committed_employment": "اشتغال ایجاد شده",
"available_jobs": "اشتغال موجود",
"statement_count": "تعداد صورت وضعیت",
"shenase_meli": "شناسه ملی",
"is_legal_person": "نوع شخص",
@@ -530,8 +544,12 @@
"bank_facility_max_amount": "جمع مبلغ سهم دولت و سهم بانک نباید از مبلغ تصویب شده بیشتر باشد .",
"government_facility_max_amount": "جمع مبلغ سهم دولت و سهم بانک نباید از مبلغ تصویب شده بیشتر باشد .",
"tanafos_period_month": "ماه",
"repayment_period_month": "ماه",
"approved_amount_title": "مبلغ مصوب کارگروه",
"sakht_period_day": "روز",
"bank_facility_title": "سهم بانک",
"government_facility_title": "سهم دولت",
"user_facility_title": "سهم متقاضی",
"sakht_period_day": "ماه",
"proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست",
"repayment_period_error": "وارد کردن دوره باز پرداخت الزامیست",
"participation_period_error": "وارد کردن دوره مشارکت الزامیست",
@@ -780,6 +798,7 @@
"haghighi": "حقیقی",
"hoghoghi": "حقوقی",
"tanafos_period": "دوره تنفس",
"repayment_period": "دوره بازپرداخت",
"sakht_period": "دوره ساخت",
"national_id": "کد ملی",
"postal_code": "کد پستی",

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

@@ -169,13 +169,23 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
showNumber={(detailsList?.data?.bank_facility) / 1000000}
headerTitle={t("ConfirmDialog.bank_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.government_facility) / 1000000}
headerTitle={t("ConfirmDialog.government_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.user_facility) / 1000000}
headerTitle={t("ConfirmDialog.user_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
@@ -188,6 +198,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_period_month")}
/>
<NumberShowBox
showNumber={detailsList?.data?.repayment_period}
headerTitle={t("ConfirmDialog.repayment_period")}
unitTitle={t("ConfirmDialog.repayment_period_month")}
/>
{renderCustomAccordions()}
</>
}

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

@@ -232,25 +232,6 @@ function DashboardNavganProvinceManagerComponent() {
</Stack>
),
},
{
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",
@@ -270,6 +251,101 @@ function DashboardNavganProvinceManagerComponent() {
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.bank_facility,
id: "bank_facility",
header: t("NavganProvinceManager.bank_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.government_facility,
id: "government_facility",
header: t("NavganProvinceManager.government_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.user_facility,
id: "user_facility",
header: t("NavganProvinceManager.user_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.physical_progress,
id: "physical_progress",
header: t("NavganProvinceManager.physical_progress"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.repayment_period,
id: "repayment_period",
header: t("NavganProvinceManager.repayment_period"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.sakht_period,
id: "sakht_period",
@@ -298,6 +374,44 @@ function DashboardNavganProvinceManagerComponent() {
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.committed_employment,
id: "committed_employment",
header: t("NavganProvinceManager.committed_employment"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.available_jobs,
id: "available_jobs",
header: t("NavganProvinceManager.available_jobs"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.state_name,
id: "state_id",

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

@@ -180,13 +180,23 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? <LinearProgress/> :
<>
<NumberShowBox
showNumber={(detailsList?.data?.proposed_amount) / 1000000}
headerTitle={t("ConfirmDialog.proposed_amount")}
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.approved_amount) / 1000000}
headerTitle={t("ConfirmDialog.approved_amount_title")}
showNumber={(detailsList?.data?.bank_facility) / 1000000}
headerTitle={t("ConfirmDialog.bank_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.government_facility) / 1000000}
headerTitle={t("ConfirmDialog.government_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
showNumber={(detailsList?.data?.user_facility) / 1000000}
headerTitle={t("ConfirmDialog.user_facility_title")}
unitTitle={t("ConfirmDialog.unit")}
/>
<NumberShowBox
@@ -199,6 +209,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
headerTitle={t("ConfirmDialog.tanafos_period")}
unitTitle={t("ConfirmDialog.tanafos_period_month")}
/>
<NumberShowBox
showNumber={detailsList?.data?.repayment_period}
headerTitle={t("ConfirmDialog.repayment_period")}
unitTitle={t("ConfirmDialog.repayment_period_month")}
/>
{renderCustomAccordions()}
</>
}

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

@@ -232,25 +232,6 @@ function DashboardTransportationAssistanceComponent() {
</Stack>
),
},
{
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",
@@ -270,6 +251,101 @@ function DashboardTransportationAssistanceComponent() {
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.bank_facility,
id: "bank_facility",
header: t("TransportationAssistance.bank_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.government_facility,
id: "government_facility",
header: t("TransportationAssistance.government_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.user_facility,
id: "user_facility",
header: t("TransportationAssistance.user_facility"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue / 1000000}</Typography>
),
},
{
accessorFn: (row) => row.physical_progress,
id: "physical_progress",
header: t("TransportationAssistance.physical_progress"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.repayment_period,
id: "repayment_period",
header: t("TransportationAssistance.repayment_period"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.sakht_period,
id: "sakht_period",
@@ -298,6 +374,44 @@ function DashboardTransportationAssistanceComponent() {
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.committed_employment,
id: "committed_employment",
header: t("TransportationAssistance.committed_employment"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.available_jobs,
id: "available_jobs",
header: t("TransportationAssistance.available_jobs"),
enableColumnFilter: true,
datatype: "numeric",
filterFn: "equals",
columnFilterModeOptions: [
"equals",
"notEquals",
"contains",
"lessThan",
"greaterThan",
"between",
],
Cell: ({renderedCellValue}) => (
<Typography variant="body2">{renderedCellValue}</Typography>
),
},
{
accessorFn: (row) => row.state_name,
id: "state_id",

2
src/core/components/NumberShowBox.jsx
View File

@@ -8,7 +8,7 @@ const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => {
sx={{color: "primary.main", fontWeight: 500}}>{headerTitle}</Typography>
<Typography pt={1}>
{isNaN(showNumber) || showNumber === null
? ""
? "0"
: (showNumber).toLocaleString()}{" "}
{unitTitle}
</Typography>