diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 8a924af..8b46a4d 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -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": "کد پستی",
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 a7ce958..9e14fcc 100644
--- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
@@ -169,13 +169,23 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? :
<>
+
+
+
{renderCustomAccordions()}
>
}
diff --git a/src/components/dashboard/navgan-province-manager/index.jsx b/src/components/dashboard/navgan-province-manager/index.jsx
index ea4a568..6449e1d 100644
--- a/src/components/dashboard/navgan-province-manager/index.jsx
+++ b/src/components/dashboard/navgan-province-manager/index.jsx
@@ -232,25 +232,6 @@ function DashboardNavganProvinceManagerComponent() {
),
},
- {
- 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",
@@ -270,6 +251,101 @@ function DashboardNavganProvinceManagerComponent() {
{renderedCellValue / 1000000}
),
},
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
{
accessorFn: (row) => row.sakht_period,
id: "sakht_period",
@@ -298,6 +374,44 @@ function DashboardNavganProvinceManagerComponent() {
{renderedCellValue}
),
},
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
+ {
+ 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}) => (
+ {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 427d3a3..ab21d3f 100644
--- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
@@ -180,13 +180,23 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
{loading ? :
<>
+
+
+
{renderCustomAccordions()}
>
}
diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx
index 2890c68..17c119d 100644
--- a/src/components/dashboard/transportation-assistance/index.jsx
+++ b/src/components/dashboard/transportation-assistance/index.jsx
@@ -232,25 +232,6 @@ function DashboardTransportationAssistanceComponent() {
),
},
- {
- 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",
@@ -270,6 +251,101 @@ function DashboardTransportationAssistanceComponent() {
{renderedCellValue / 1000000}
),
},
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue / 1000000}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
{
accessorFn: (row) => row.sakht_period,
id: "sakht_period",
@@ -298,6 +374,44 @@ function DashboardTransportationAssistanceComponent() {
{renderedCellValue}
),
},
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
+ {
+ 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}) => (
+ {renderedCellValue}
+ ),
+ },
{
accessorFn: (row) => row.state_name,
id: "state_id",
diff --git a/src/core/components/NumberShowBox.jsx b/src/core/components/NumberShowBox.jsx
index b8e45b1..264a7f4 100644
--- a/src/core/components/NumberShowBox.jsx
+++ b/src/core/components/NumberShowBox.jsx
@@ -8,7 +8,7 @@ const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => {
sx={{color: "primary.main", fontWeight: 500}}>{headerTitle}
{isNaN(showNumber) || showNumber === null
- ? ""
+ ? "0"
: (showNumber).toLocaleString()}{" "}
{unitTitle}