diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index 5088829..cc4ab3f 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -42,10 +42,10 @@
"dashboard": "داشبورد",
"reports": "گزارشات",
"passenger-office-chief": "اداره مسافر",
- "machinery-expert": "ماشین آلات",
- "passenger-boss": "رئیس مسافر ",
- "transportation-assistant": "معاونت حمل و نقل",
- "navgan-province-manager": "مدیر کل استانی",
+ "machinery-expert": "کارتابل قیمت گذاری",
+ "passenger-boss": "کارتابل کارگروه",
+ "transportation-assistant": "بررسی وام های تبصره 18",
+ "navgan-province-manager": "بررسی وام های تبصره 18",
"refahi-province-manager": "مدیر کل استانی",
"refahi-loan-management": "مدیریت وام",
"navgan-loan-management": "مدیریت وام",
@@ -62,7 +62,7 @@
},
"secondary": {
"passenger-office": "توزیع درخواست",
- "passenger-boss": "کارگروه استانی",
+ "passenger-boss": "کارگروه",
"refahi-province-manager": "رفاهی",
"refahi-loan-management": "رفاهی",
"navgan-loan-management": "ناوگان",
@@ -102,14 +102,14 @@
"Dashboard": {
"dashboard_page": "داشبورد",
"reports": "گزارشات",
- "passenger_boss_page": "رئیس مسافر",
- "transportation_assistance": "معاونت حمل و نقل",
+ "passenger_boss_page": "کارتابل کارگروه",
+ "transportation_assistance": "بررسی وام های تبصره 18",
"change_password": "تغییر رمز عبور",
- "province_manager_page": "مدیر کل استانی",
+ "province_manager_page": "بررسی وام های تبصره 18",
"province_head_expert": "کارشناس ستادی",
"passenger_office_page": "اداره مسافر",
"loan_management_page": "مدیریت وام",
- "machinary_office_page": "ماشین آلات",
+ "machinary_office_page": "کارتابل قیمت گذاری",
"development_assistant_page": "معاون توسعه",
"inspector_expert_page": "بازدید کارشناس",
"commercial_chief_page": "رئیس اداره بازرگانی",
@@ -212,8 +212,8 @@
"vehicle_type": "نوع ماشین",
"state_name": "وضعیت درخواست",
"confirm": "ارجاع به معاون حمل و نقل",
- "upload_file": "صورت جلسه کارگروه استانی را بارگذاری کنید",
- "upload_file_required": "وارد کردن صورت جلسه کارگروه استانی الزامیست",
+ "upload_file": "صورت جلسه کارگروه را بارگذاری کنید",
+ "upload_file_required": "وارد کردن صورت جلسه کارگروه الزامیست",
"upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد",
"upload_file_format": "فرمت قابل قبول : png,jpg,pdf",
"print_final_credit_amount": "چاپ صورت جلسه تعیین مبلغ نهایی",
@@ -287,7 +287,7 @@
"navgan_id": "کد ناوگان",
"vehicle_type": "نوع ماشین",
"state_name": "وضعیت درخواست",
- "confirm": "ارجاع به مدیر کل استانی",
+ "confirm": "ارجاع به مدیر کل",
"upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد",
"upload_file_format": "فرمت قابل قبول : png,jpg,pdf",
"excel_report": "گزارش اکسل"
@@ -313,12 +313,12 @@
"navgan_id": "کد ناوگان",
"vehicle_type": "نوع ماشین",
"state_name": "وضعیت درخواست",
- "confirm": "ارجاع به کارگروه استانی",
+ "confirm": "ارجاع به کارگروه",
"upload_file": "گزارش کارشناسی را بارگذاری کنید",
"upload_file_required": "وارد کردن گزارش کارشناسی الزامیست",
"upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد",
"upload_file_format": "فرمت قابل قبول : png,jpg,pdf",
- "print_report": "چاپ گزارش کارشناسی ماشین آلات",
+ "print_report": "چاپ گزارش کارشناسی",
"max_amount": "حداکثر مبلغ پیشنهادی {value} میلیون ریال می باشد",
"excel_report": "گزارش اکسل"
},
@@ -357,7 +357,7 @@
"approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
"toman": "میلیون تومان",
"proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست",
- "proposed_amount": "مقدار پیشنهادی",
+ "proposed_amount": "مبلغ پیشنهادی",
"proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد",
"proposed_amount_number": "مقدار پیشنهادی باید عدد باشد"
},
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 aa2107f..4078032 100644
--- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx
@@ -15,10 +15,7 @@ import {
} from "@mui/material"
import {useFormik} from "formik";
import {useTranslations} from "next-intl";
-import {
- CONFIRM_NAVGAN_PROVINCE_MANAGER,
- CONFIRM_PROVINCE_MANAGER_DETAILS
-} from "@/core/data/apiRoutes";
+import {CONFIRM_NAVGAN_PROVINCE_MANAGER, CONFIRM_PROVINCE_MANAGER_DETAILS} from "@/core/data/apiRoutes";
import {useEffect, useState} from "react";
import * as Yup from "yup";
import CustomAccordion from "@/core/components/CustomAccordion";
@@ -30,7 +27,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
const [fileType, setfileType] = useState(null);
const [fileName, setfileName] = useState(null);
const [showAddIcon, setShowAddIcon] = useState(true);
- const requestServer = useRequest({auth: true , notification: false})
+ const requestServer = useRequest({auth: true, notification: false})
const {update_notification} = useNotification()
const [accordionStates, setAccordionStates] = useState([]);
const [hasImageShown, setHasImageShown] = useState(false);
@@ -55,7 +52,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
useEffect(() => {
requestServer(`${CONFIRM_PROVINCE_MANAGER_DETAILS}/${rowId}`, 'get')
.then((response) => {
- const booleanData = Array.from({ length: response.data.data.attachment_files.length }, () => false);
+ const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false);
setAccordionStates(booleanData);
setDetailsData(response.data)
})
@@ -69,13 +66,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false);
setAccordionStates(newAccordionStates);
- if (!newAccordionStates[index])
- {
+ if (!newAccordionStates[index]) {
handleSizeChangeClick('sm');
setHasImageShown(false);
setIsSkeleton(false)
- }
- else {
+ } else {
handleSizeChangeClick('xl');
setHasImageShown(true);
setImageLink(detailsList.data.attachment_files[index])
@@ -143,28 +138,32 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
};
const numberShowBox = () => {
- return (
- <>
-
- {t("ConfirmDialog.approved_amount")} {t("sidebar.machinery-expert")}
-
- {isNaN((detailsList?.data?.proposed_amount) / 10)
- ? ""
- : ((detailsList?.data?.proposed_amount) / 10).toLocaleString()}{" "}
- {t("ConfirmDialog.unit")}
-
-
-
- {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")}
-
- {isNaN((detailsList?.data?.approved_amount) / 10)
- ? ""
- : ((detailsList?.data?.approved_amount) / 10).toLocaleString()}{" "}
- {t("ConfirmDialog.unit")}
-
-
-
- );
+ return (
+ <>
+
+ {t("ConfirmDialog.proposed_amount")}
+
+ {isNaN((detailsList?.data?.proposed_amount) / 10)
+ ? ""
+ : ((detailsList?.data?.proposed_amount) / 10).toLocaleString()}{" "}
+ {t("ConfirmDialog.unit")}
+
+
+
+ {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")}
+
+ {isNaN((detailsList?.data?.approved_amount) / 10)
+ ? ""
+ : ((detailsList?.data?.approved_amount) / 10).toLocaleString()}{" "}
+ {t("ConfirmDialog.unit")}
+
+
+
+ );
};
return (
@@ -172,10 +171,10 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
- {loading ? :
+ {loading ? :
<>
- {numberShowBox()}
- {renderCustomAccordions()}
+ {numberShowBox()}
+ {renderCustomAccordions()}
}
@@ -222,8 +221,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl
-
-
+
+
diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
index 8f3de83..e212043 100644
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
@@ -15,10 +15,7 @@ import {
} from "@mui/material"
import {useFormik} from "formik";
import {useTranslations} from "next-intl";
-import {
- CONFIRM_PASSENGER_BOSS,
- EXPORT_PASSENGER_BOSS_DETAILS,
-} from "@/core/data/apiRoutes";
+import {CONFIRM_PASSENGER_BOSS, EXPORT_PASSENGER_BOSS_DETAILS,} from "@/core/data/apiRoutes";
import {useEffect, useState} from "react";
import PriceField from "@/core/components/PriceField";
import * as Yup from "yup";
@@ -29,13 +26,13 @@ const vehicle_amount = {
"اتوبوس": 7000,
"مینی بوس": 2000,
}
-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , handleSizeChangeClick}) => {
+const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, handleSizeChangeClick}) => {
const t = useTranslations();
const [selectedImage, setSelectedImage] = useState("");
const [fileType, setfileType] = useState(null);
const [fileName, setfileName] = useState(null);
const [showAddIcon, setShowAddIcon] = useState(true);
- const requestServer = useRequest({auth: true ,notification: false})
+ const requestServer = useRequest({auth: true, notification: false})
const {update_notification} = useNotification();
const [accordionStates, setAccordionStates] = useState([]);
const [hasImageShown, setHasImageShown] = useState(false);
@@ -47,7 +44,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , han
useEffect(() => {
requestServer(`${EXPORT_PASSENGER_BOSS_DETAILS}/${rowId}`, 'get')
.then((response) => {
- const booleanData = Array.from({ length: response.data.data.attachment_files.length }, () => false);
+ const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false);
setAccordionStates(booleanData);
setDetailsData(response.data)
})
@@ -61,13 +58,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , han
const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false);
setAccordionStates(newAccordionStates);
- if (!newAccordionStates[index])
- {
+ if (!newAccordionStates[index]) {
handleSizeChangeClick('sm');
setHasImageShown(false);
setIsSkeleton(false)
- }
- else {
+ } else {
handleSizeChangeClick('xl');
setHasImageShown(true);
setImageLink(detailsList.data.attachment_files[index])
@@ -166,8 +161,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , han
const numberShowBox = () => {
return (
<>
-
- {t("ConfirmDialog.approved_amount")} {t("sidebar.machinery-expert")}
+
+ {t("ConfirmDialog.proposed_amount")}
{isNaN((detailsList?.data?.proposed_amount) / 10)
? ""
@@ -184,7 +180,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , han
- {loading ? :
+ {loading ? :
<>
{numberShowBox()}
{renderCustomAccordions()}
@@ -260,8 +256,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type , han
-
-
+
+
diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
index 076af16..9480f7a 100644
--- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx
@@ -6,7 +6,9 @@ import {
Button,
DialogActions,
DialogContent,
- FormHelperText, Grid, LinearProgress,
+ FormHelperText,
+ Grid,
+ LinearProgress,
Stack,
TextField,
Typography
@@ -18,13 +20,14 @@ import {useEffect, useState} from "react";
import * as Yup from "yup";
import CustomAccordion from "@/core/components/CustomAccordion";
import ImageContent from "@/core/components/ImageContent";
-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeClick}) => {
+
+const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeClick}) => {
const t = useTranslations();
const [selectedImage, setSelectedImage] = useState("");
const [fileType, setfileType] = useState(null);
const [fileName, setfileName] = useState(null);
const [showAddIcon, setShowAddIcon] = useState(true);
- const requestServer = useRequest({auth: true , notification: false})
+ const requestServer = useRequest({auth: true, notification: false})
const [accordionStates, setAccordionStates] = useState([]);
const [hasAccordionOpened, setHasAccordionOpened] = useState([]);
const {update_notification} = useNotification();
@@ -37,14 +40,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
useEffect(() => {
requestServer(`${GET_TRANSPORTATION_ASSISTANCE_DETAILS}/${rowId}`, 'get')
.then((response) => {
- const booleanData = Array.from({ length: response.data.data.attachment_files.length }, () => false);
- setAccordionStates(booleanData);
- setHasAccordionOpened(booleanData);
- setDetailsData(response.data)
+ const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false);
+ setAccordionStates(booleanData);
+ setHasAccordionOpened(booleanData);
+ setDetailsData(response.data)
})
.catch(() => {
}).finally(() => {
- setLoading(false);
+ setLoading(false);
});
}, []);
@@ -52,13 +55,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false);
setAccordionStates(newAccordionStates);
- if (!newAccordionStates[index])
- {
+ if (!newAccordionStates[index]) {
handleSizeChangeClick('sm');
setHasImageShown(false);
setIsSkeleton(false)
- }
- else {
+ } else {
handleSizeChangeClick('xl');
setHasImageShown(true);
setImageLink(detailsList.data.attachment_files[index])
@@ -144,8 +145,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
const numberShowBox = () => {
return (
<>
-
- {t("ConfirmDialog.approved_amount")} {t("sidebar.machinery-expert")}
+
+ {t("ConfirmDialog.proposed_amount")}
{isNaN((detailsList?.data?.proposed_amount) / 10)
? ""
@@ -153,8 +155,11 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
{t("ConfirmDialog.unit")}
-
- {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")}
+
+ {t("ConfirmDialog.approved_amount")} {t("secondary.passenger-boss")}
{isNaN((detailsList?.data?.approved_amount) / 10)
? ""
@@ -170,7 +175,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
- {loading ? :
+ {loading ? :
<>
{numberShowBox()}
{renderCustomAccordions()}
@@ -220,9 +225,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
-
-
-
+
+
+
@@ -233,7 +243,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog ,handleSizeChangeCl
diff --git a/src/core/data/sidebarMenu.jsx b/src/core/data/sidebarMenu.jsx
index 2fd6792..21511e3 100644
--- a/src/core/data/sidebarMenu.jsx
+++ b/src/core/data/sidebarMenu.jsx
@@ -37,7 +37,7 @@ const sidebarMenu = [
},
{
key: "sidebar.passenger-office-chief",
- secondary: "secondary.passenger-office",
+ secondary: "secondary.navgan-province-manager",
name: "passenger_office_chief",
type: "page",
route: "/dashboard/passenger-office-chief",
@@ -47,6 +47,7 @@ const sidebarMenu = [
},
{
key: "sidebar.machinery-expert",
+ secondary: "secondary.navgan-province-manager",
name: "machinery_expert",
type: "page",
route: "/dashboard/machinery-expert",
@@ -56,7 +57,7 @@ const sidebarMenu = [
},
{
key: "sidebar.passenger-boss",
- secondary: "secondary.passenger-boss",
+ secondary: "secondary.navgan-province-manager",
name: "province_working_group",
type: "page",
route: "/dashboard/passenger-boss",
@@ -67,6 +68,7 @@ const sidebarMenu = [
{
key: "sidebar.transportation-assistant",
+ secondary: "secondary.navgan-province-manager",
name: "transportation_assistant",
type: "page",
route: "/dashboard/transportation-assistant",