LFFE-25 merging

2023-11-14 16:00:14 +03:30
parent e09e174558 da3ff46e14
commit ccc751ec33
8 changed files with 35 additions and 20 deletions
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -210,7 +210,8 @@
    "upload_file_required": "وارد کردن صورت جلسه کارگروه استانی الزامیست",
    "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد",
    "upload_file_format": "فرمت قابل قبول : png,jpg,pdf",
-    "print_final_credit_amount": "چاپ صورت جلسه تعیین مبلغ نهایی"
+    "print_final_credit_amount": "چاپ صورت جلسه تعیین مبلغ نهایی",
+    "max_amount": "حداکثر مبلغ تصویب شده  {value} میلیون ریال می باشد"
  },
  "RefahiProvinceManager": {
    "name": "نام",
@@ -309,7 +310,8 @@
    "upload_file_required": "وارد کردن گزارش کارشناسی الزامیست",
    "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد",
    "upload_file_format": "فرمت قابل قبول : png,jpg,pdf",
-    "print_report": "چاپ گزارش کارشناسی ماشین آلات"
+    "print_report": "چاپ گزارش کارشناسی ماشین آلات",
+    "max_amount": "حداکثر مبلغ پیشنهادی  {value} میلیون ریال می باشد"
  },
  "UserManagement": {
    "name": "نام",
@@ -337,14 +339,14 @@
    "button-confirm": "ارجاع",
    "description_error": "وارد کردن توضیحات الزامی است!",
    "optional": " (اختیاری)",
-    "unit": " (ریال)",
+    "unit": " (میلیون ریال)",
    "description": "توضیحات خود را وارد نمائید",
    "choose_file": "انتخاب فایل",
    "approved_amount": "مبلغ تصویب شده",
    "approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست",
    "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد",
    "approved_amount_number": "مبلغ تصویب شده باید عدد باشد",
-    "toman": "تومان",
+    "toman": "میلیون تومان",
    "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست",
    "proposed_amount": "مقدار پیشنهادی",
    "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد",
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx
@@ -9,7 +9,11 @@ import {useState} from "react";
 import PriceField from "@/core/components/PriceField";
 import * as Yup from "yup";

-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
+const vehicle_amount = {
+    "اتوبوس": 7000,
+    "مینی بوس": 2000,
+}
+const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type}) => {
    const t = useTranslations();
    const [selectedImage, setSelectedImage] = useState("");
    const [fileType, setfileType] = useState(null);
@@ -17,23 +21,22 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
    const [showAddIcon, setShowAddIcon] = useState(true);
    const requestServer = useRequest({auth: true})
    const {update_notification} = useNotification()
-
    const validationSchema = Yup.object().shape({
        proposed_amount: Yup.mixed().test(
            "is-number",
            `${t("ConfirmDialog.proposed_amount_number")}`,
            (value) => !isNaN(value)
-        ).test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
+        ).test("max-amount", `${t("MachinaryOffice.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`,
+            (value) => value <= vehicle_amount[vehicle_type])
+            .test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0)
            .required(t("ConfirmDialog.proposed_amount_error")),
        confirm_img: Yup.mixed()
            .required(t("MachinaryOffice.upload_file_required"))
            .test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => {
-                // if (!value) return true; // Skip if no file is provided
-                return value.size <= 2 * 1024 * 1024; // 100KB limit (adjust as needed)
+                return value.size <= 2 * 1024 * 1024;
            })
            .test('fileType', `${t("MachinaryOffice.upload_file_format")}`, (value) => {
-                // if (!value) return true; // Skip if no file is provided
-                const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types
+                const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf'];
                return allowedTypes.includes(value.type);
            })
    });
@@ -49,7 +52,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
            formData.append("proposed_amount", values.proposed_amount);
            if (values.description != "") formData.append("expert_description", values.description);
            if (values.confirm_img != null) formData.append("attachment", values.confirm_img);
-
            requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', {
                data: formData,
            }).then((response) => {
--- a/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx
+++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx
@@ -3,7 +3,8 @@ import {useTranslations} from "next-intl";
 import {useState} from "react";
 import ConfirmContent from "./ConfirmContent";
 import CallMadeIcon from '@mui/icons-material/CallMade';
-const Confirm = ({rowId, mutate}) => {
+
+const Confirm = ({rowId, mutate, vehicle_type}) => {
    const t = useTranslations();
    const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
    return (
@@ -21,7 +22,8 @@ const Confirm = ({rowId, mutate}) => {
            <Dialog fullWidth open={openConfirmDialog}
                    PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>
                <DialogTitle>{t("MachinaryOffice.confirm")}</DialogTitle>
-                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}/>
+                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}
+                                vehicle_type={vehicle_type}/>
            </Dialog>
        </>
    )
--- a/src/components/dashboard/machinary-office/TableRowActions.jsx
+++ b/src/components/dashboard/machinary-office/TableRowActions.jsx
@@ -3,11 +3,11 @@ import Confirm from "./Form/ConfirmForm";
 import Reject from "./Form/RejectForm";

 const TableRow = ({row, mutate}) => {
-
    return (
        <Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
            <Confirm
                rowId={row.getValue("id")}
+                vehicle_type={row.original.vehicle_type}
                mutate={mutate}
            />
            <Reject
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx
@@ -9,7 +9,11 @@ import {useState} from "react";
 import PriceField from "@/core/components/PriceField";
 import * as Yup from "yup";

-const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
+const vehicle_amount = {
+    "اتوبوس": 7000,
+    "مینی بوس": 2000,
+}
+const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type}) => {
    const t = useTranslations();
    const [selectedImage, setSelectedImage] = useState("");
    const [fileType, setfileType] = useState(null);
@@ -23,7 +27,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => {
            "is-number",
            `${t("ConfirmDialog.approved_amount_number")}`,
            (value) => !isNaN(value)
-        ).test("positive", `${t("ConfirmDialog.approved_amount_positive")}`, (value) => value >= 0)
+        ).test("max-amount", `${t("PassengerBoss.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`,
+            (value) => value <= vehicle_amount[vehicle_type])
+            .test("positive", `${t("ConfirmDialog.approved_amount_positive")}`, (value) => value >= 0)
            .required(t("ConfirmDialog.approved_amount_error")),
        confirm_img: Yup.mixed()
            .required(t("PassengerBoss.upload_file_required"))
--- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/index.jsx
+++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/index.jsx
@@ -3,7 +3,8 @@ import {useTranslations} from "next-intl";
 import {useState} from "react";
 import ConfirmContent from "./ConfirmContent";
 import CallMadeIcon from '@mui/icons-material/CallMade';
-const Confirm = ({rowId, mutate}) => {
+
+const Confirm = ({rowId, mutate, vehicle_type}) => {
    const t = useTranslations();
    const [openConfirmDialog, setOpenConfirmDialog] = useState(false);
    return (
@@ -21,7 +22,8 @@ const Confirm = ({rowId, mutate}) => {
            <Dialog fullWidth open={openConfirmDialog}
                    PaperProps={{sx: {boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px'}}}>
                <DialogTitle>{t("PassengerBoss.confirm")}</DialogTitle>
-                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}/>
+                <ConfirmContent mutate={mutate} rowId={rowId} setOpenConfirmDialog={setOpenConfirmDialog}
+                                vehicle_type={vehicle_type}/>
            </Dialog>
        </>
    )
--- a/src/components/dashboard/passenger-boss/TableRowActions.jsx
+++ b/src/components/dashboard/passenger-boss/TableRowActions.jsx
@@ -8,6 +8,7 @@ const TableRow = ({row, mutate}) => {
        <Box sx={{display: "flex", flexWrap: "nowrap", gap: "8px"}}>
            <Confirm
                rowId={row.getValue("id")}
+                vehicle_type={row.original.vehicle_type}
                mutate={mutate}
            />
            <Reject
--- a/src/components/layouts/Dashboard/Sidebar/SidebarList.jsx
+++ b/src/components/layouts/Dashboard/Sidebar/SidebarList.jsx
@@ -87,7 +87,7 @@ export default function SidebarList({handleDrawerToggle}) {
    }, [selectedKey]);

    return (
-        <List sx={{overflow: "scroll"}}>
+        <List dense={true} sx={{overflow: "scroll"}}>
            {itemMenu.map((itemArr, index) => (
                <Fragment key={index}>
                    {itemArr.map((item) =>