From 361127bf0c547b940aaf0af0f15d629ddc5e09b3 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 10:24:05 +0330 Subject: [PATCH 01/18] confirm machinary tanafos and sakht period --- public/locales/fa/app.json | 8 ++ .../Form/ConfirmForm/ConfirmContent.jsx | 103 ++++++++++++++---- .../Form/ConfirmForm/index.jsx | 10 +- .../dashboard/machinary-office/index.jsx | 5 + .../Form/ConfirmForm/ConfirmContent.jsx | 7 +- .../dashboard/passenger-boss/index.jsx | 5 + src/core/components/NumberShowBox.jsx | 20 ++++ 7 files changed, 135 insertions(+), 23 deletions(-) create mode 100644 src/core/components/NumberShowBox.jsx diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 4e26061..60a17b5 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -358,10 +358,18 @@ "description": "توضیحات خود را وارد نمائید", "choose_file": "انتخاب فایل", "approved_amount": "مبلغ تصویب شده", + "sakht_amount": "دوره ساخت", + "tanafos_amount": "دوره تنفس", "approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست", + "sakht_amount_error": "وارد کردن دوره ساخت الزامیست", + "tanafos_amount_error": "وارد کردن دوره تنفس الزامیست", "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد", "approved_amount_number": "مبلغ تصویب شده باید عدد باشد", + "sakht_amount_number": "دوره ساخت باید عدد باشد", + "tanafos_amount_number": "دوره تنفس باید عدد باشد", "toman": "میلیون تومان", + "tanafos_amount_month": "ماه", + "sakht_amount_day": "روز", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "proposed_amount": "مبلغ پیشنهادی", "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد", diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index ada0a12..98f5a32 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -7,6 +7,7 @@ import { DialogContent, FormHelperText, Grid, + InputAdornment, LinearProgress, Stack, TextField, @@ -14,10 +15,7 @@ import { } from "@mui/material" import {useFormik} from "formik"; import {useTranslations} from "next-intl"; -import { - CONFIRM_MACHINARY_OFFICE, - CONFIRM_MACHINARY_OFFICE_DETAILS -} from "@/core/data/apiRoutes"; +import {CONFIRM_MACHINARY_OFFICE, CONFIRM_MACHINARY_OFFICE_DETAILS} from "@/core/data/apiRoutes"; import {useEffect, useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; @@ -28,13 +26,13 @@ const vehicle_amount = { "اتوبوس": 7000, "مینی بوس": 2000, } -const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , handleSizeChangeClick}) => { +const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, 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); @@ -46,7 +44,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han useEffect(() => { requestServer(`${CONFIRM_MACHINARY_OFFICE_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) }) @@ -60,13 +58,11 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, 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]) @@ -75,14 +71,24 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han }; const validationSchema = Yup.object().shape({ - proposed_amount: Yup.mixed().test( - "is-number", - `${t("ConfirmDialog.proposed_amount_number")}`, - (value) => !isNaN(value) - ).test("max-amount", `${t("MachinaryOffice.max_amount", {value: parseInt(vehicle_amount[vehicle_type]).toLocaleString('en')})}`, - (value) => value <= vehicle_amount[vehicle_type]) + proposed_amount: Yup.mixed() + .test( + "is-number", + `${t("ConfirmDialog.proposed_amount_number")}`, + (value) => !isNaN(value) + ) + .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")), + sakht_amount: Yup.mixed() + .test("is-number", `${t("ConfirmDialog.sakht_amount_number")}`, + (value) => !isNaN(value)) + .required(t("ConfirmDialog.sakht_amount_error")), + tanafos_amount: Yup.mixed() + .test("is-number", `${t("ConfirmDialog.tanafos_amount_number")}`, + (value) => !isNaN(value)) + .required(t("ConfirmDialog.tanafos_amount_error")), confirm_img: Yup.mixed() .required(t("MachinaryOffice.upload_file_required")) .test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => { @@ -98,11 +104,15 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han initialValues: { description: "", proposed_amount: "", + sakht_amount: "", + tanafos_amount: "", confirm_img: null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("proposed_amount", values.proposed_amount); + formData.append("sakht_amount", values.sakht_amount); + formData.append("tanafos_amount", values.tanafos_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', { @@ -166,7 +176,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han - {loading ? : renderCustomAccordions()} + {loading ? : renderCustomAccordions()} + + {t("ConfirmDialog.sakht_amount_day")}, + }} + /> + + + {t("ConfirmDialog.tanafos_amount_month")}, + }} + /> + {t("MachinaryOffice.upload_file")} - - + + diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx index 445aab3..febb675 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/index.jsx @@ -33,9 +33,15 @@ const Confirm = ({rowId, mutate, vehicle_type}) => { + PaperProps={{ + sx: { + transition: 'all .3s', + boxShadow: 'rgba(60, 64, 67, 0.3) 0px 1px 16px 0px, rgba(60, 64, 67, 0.15) 0px 1px 10px 0px' + } + }} maxWidth={dialogSize}> {t("MachinaryOffice.confirm")} - diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx index 853c065..79623c4 100644 --- a/src/components/dashboard/machinary-office/index.jsx +++ b/src/components/dashboard/machinary-office/index.jsx @@ -155,9 +155,14 @@ function DashboardMachinaryOfficeComponent() { ], [] ); + const data = [{ + id: 1, + vehicle_type: "مینی بوس" + }] return ( {loading ? : <> - {numberShowBox()} + {renderCustomAccordions()} } diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 13674dc..581f099 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -175,9 +175,14 @@ function DashboardPassengerOfficeComponent() { ], [] ); + const data = [{ + id: 1, + vehicle_type: "مینی بوس" + }] return ( { + console.log({showNumber}) + return ( + <> + + {headerTitle} + + {isNaN(showNumber) + ? "" + : (showNumber).toLocaleString()}{" "} + {unitTitle} + + + + ); +}; +export default NumberShowBox \ No newline at end of file From 7ca32df7d1a3b215f54a7644b683467e3a0a080c Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 10:30:23 +0330 Subject: [PATCH 02/18] confirm passenger boss show tanafos and sakht period --- .../Form/ConfirmForm/ConfirmContent.jsx | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 3dc5d64..ed81b6b 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -2,7 +2,6 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import { - Box, Button, DialogActions, DialogContent, @@ -159,22 +158,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand } return null; }; - const numberShowBox = () => { - return ( - <> - - {t("ConfirmDialog.proposed_amount")} - - {isNaN((detailsList?.data?.proposed_amount) / 10) - ? "" - : ((detailsList?.data?.proposed_amount) / 10).toLocaleString()}{" "} - {t("ConfirmDialog.unit")} - - - - ); - }; return ( <> @@ -188,6 +171,16 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand headerTitle={t("ConfirmDialog.proposed_amount")} unitTitle={t("ConfirmDialog.unit")} /> + + {renderCustomAccordions()} } From 6bfaf6f73b693691b04effbc84cacc2c30f8cd2d Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 10:43:43 +0330 Subject: [PATCH 03/18] confirm transportation assistance show tanafos and sakht period --- public/locales/fa/app.json | 1 + .../Form/ConfirmForm/ConfirmContent.jsx | 51 ++++++++----------- .../transportation-assistance/index.jsx | 5 ++ 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 60a17b5..1da70b3 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -369,6 +369,7 @@ "tanafos_amount_number": "دوره تنفس باید عدد باشد", "toman": "میلیون تومان", "tanafos_amount_month": "ماه", + "approved_amount_title": "مبلغ تصویب شده کارگروه", "sakht_amount_day": "روز", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "proposed_amount": "مبلغ پیشنهادی", diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 9480f7a..654f0ed 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -2,7 +2,6 @@ import UploadSystem from "@/core/components/UploadSystem"; import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import { - Box, Button, DialogActions, DialogContent, @@ -20,6 +19,7 @@ import {useEffect, useState} from "react"; import * as Yup from "yup"; import CustomAccordion from "@/core/components/CustomAccordion"; import ImageContent from "@/core/components/ImageContent"; +import NumberShowBox from "@/core/components/NumberShowBox"; const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeClick}) => { const t = useTranslations(); @@ -142,34 +142,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl } return null; }; - const numberShowBox = () => { - 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 ( <> @@ -177,7 +149,26 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {loading ? : <> - {numberShowBox()} + + + + {renderCustomAccordions()} } diff --git a/src/components/dashboard/transportation-assistance/index.jsx b/src/components/dashboard/transportation-assistance/index.jsx index 2ff3796..41fb7ad 100644 --- a/src/components/dashboard/transportation-assistance/index.jsx +++ b/src/components/dashboard/transportation-assistance/index.jsx @@ -194,9 +194,14 @@ function DashboardTransportationAssistanceComponent() { ], [] ); + const data = [{ + id: 1, + vehicle_type: "مینی بوس" + }] return ( Date: Sun, 24 Dec 2023 10:48:33 +0330 Subject: [PATCH 04/18] confirmation --- .../Form/ConfirmForm/ConfirmContent.jsx | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 9480f7a..46373c4 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -3,9 +3,9 @@ import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; import { Box, - Button, + Button, Checkbox, DialogActions, - DialogContent, + DialogContent, FormControlLabel, FormHelperText, Grid, LinearProgress, @@ -36,6 +36,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl const [detailsList, setDetailsData] = useState(null); const [loading, setLoading] = useState(true); const [isSkeleton, setIsSkeleton] = useState(false); + const [checked, setChecked] = useState(false); useEffect(() => { requestServer(`${GET_TRANSPORTATION_ASSISTANCE_DETAILS}/${rowId}`, 'get') @@ -125,6 +126,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl setShowAddIcon(false); } }; + const handleCheckboxChange = (event) => { + setChecked(event.target.checked); + }; const renderCustomAccordions = () => { if (detailsList && detailsList.data && detailsList.data.attachment_files) { @@ -222,6 +226,18 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {formik.touched.confirm_img && formik.errors.confirm_img} + + + } + label="تایید" + /> + @@ -243,7 +259,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl From 7639898c3aed59a06fdc71312fccdf89d70ec6d8 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 10:52:37 +0330 Subject: [PATCH 05/18] confirm navgan province manager show tanafos and sakht period --- .../dashboard/machinary-office/index.jsx | 5 -- .../Form/ConfirmForm/ConfirmContent.jsx | 52 ++++++++----------- .../dashboard/passenger-boss/index.jsx | 5 -- .../transportation-assistance/index.jsx | 5 -- 4 files changed, 21 insertions(+), 46 deletions(-) diff --git a/src/components/dashboard/machinary-office/index.jsx b/src/components/dashboard/machinary-office/index.jsx index 79623c4..853c065 100644 --- a/src/components/dashboard/machinary-office/index.jsx +++ b/src/components/dashboard/machinary-office/index.jsx @@ -155,14 +155,9 @@ function DashboardMachinaryOfficeComponent() { ], [] ); - const data = [{ - id: 1, - vehicle_type: "مینی بوس" - }] return ( { const t = useTranslations(); @@ -137,35 +137,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl return null; }; - const numberShowBox = () => { - 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 ( <> @@ -173,7 +144,26 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl {loading ? : <> - {numberShowBox()} + + + + {renderCustomAccordions()} } diff --git a/src/components/dashboard/passenger-boss/index.jsx b/src/components/dashboard/passenger-boss/index.jsx index 581f099..13674dc 100644 --- a/src/components/dashboard/passenger-boss/index.jsx +++ b/src/components/dashboard/passenger-boss/index.jsx @@ -175,14 +175,9 @@ function DashboardPassengerOfficeComponent() { ], [] ); - const data = [{ - id: 1, - vehicle_type: "مینی بوس" - }] return ( Date: Sun, 24 Dec 2023 11:14:12 +0330 Subject: [PATCH 06/18] add upload div --- .../Form/ConfirmForm/ConfirmContent.jsx | 78 +++++++++++++------ 1 file changed, 54 insertions(+), 24 deletions(-) diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index e212043..38c3f2e 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -228,30 +228,60 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand /> - {t("PassengerBoss.upload_file")} - formik.handleBlur("confirm_img")} - error={ - formik.touched.confirm_img && - Boolean(formik.errors.confirm_img) - } - /> - - {formik.touched.confirm_img && formik.errors.confirm_img} - + + + {t("UploadSystem.upload_file")} + formik.handleBlur("confirm_img")} + error={ + formik.touched.confirm_img && + Boolean(formik.errors.confirm_img) + } + /> + + {formik.touched.confirm_img && formik.errors.confirm_img} + + + + {t("UploadSystem.upload_file")} + formik.handleBlur("confirm_img")} + error={ + formik.touched.confirm_img && + Boolean(formik.errors.confirm_img) + } + /> + + {formik.touched.confirm_img && formik.errors.confirm_img} + + + From 4c3a402920264a071a26c4179248a049e81e440b Mon Sep 17 00:00:00 2001 From: Yasiu1376 Date: Sun, 24 Dec 2023 11:19:30 +0330 Subject: [PATCH 07/18] confirmation checkbox --- public/locales/fa/app.json | 3 ++- .../Form/ConfirmForm/ConfirmContent.jsx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 4e26061..e504a11 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -296,7 +296,8 @@ "confirm": "ارجاع به مدیر کل", "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد", "upload_file_format": "فرمت قابل قبول : png,jpg,pdf", - "excel_report": "گزارش اکسل" + "excel_report": "گزارش اکسل", + "confirm_text": "فرم الف و ب به رویت و تایید رسید." }, "InspectorExpert": { "name": "نام", diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 46373c4..9a647a7 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -235,7 +235,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl color="primary" /> } - label="تایید" + label={t("TransportationAssistance.confirm_text")} /> From 3077ed1d63b284f4fecf4e2851bf5705ca285083 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Sun, 24 Dec 2023 11:30:27 +0330 Subject: [PATCH 08/18] sync name with back end --- public/locales/fa/app.json | 16 +++--- .../Form/ConfirmForm/ConfirmContent.jsx | 52 +++++++++---------- .../Form/ConfirmForm/ConfirmContent.jsx | 8 +-- .../Form/ConfirmForm/ConfirmContent.jsx | 8 +-- .../Form/ConfirmForm/ConfirmContent.jsx | 8 +-- src/core/components/NumberShowBox.jsx | 1 - 6 files changed, 46 insertions(+), 47 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 1da70b3..351fcec 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -358,19 +358,19 @@ "description": "توضیحات خود را وارد نمائید", "choose_file": "انتخاب فایل", "approved_amount": "مبلغ تصویب شده", - "sakht_amount": "دوره ساخت", - "tanafos_amount": "دوره تنفس", + "sakht_period": "دوره ساخت", + "tanafos_period": "دوره تنفس", "approved_amount_error": "وارد کردن مبلغ تصویب شده الزامیست", - "sakht_amount_error": "وارد کردن دوره ساخت الزامیست", - "tanafos_amount_error": "وارد کردن دوره تنفس الزامیست", + "sakht_period_error": "وارد کردن دوره ساخت الزامیست", + "tanafos_period_error": "وارد کردن دوره تنفس الزامیست", "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد", "approved_amount_number": "مبلغ تصویب شده باید عدد باشد", - "sakht_amount_number": "دوره ساخت باید عدد باشد", - "tanafos_amount_number": "دوره تنفس باید عدد باشد", + "sakht_period_number": "دوره ساخت باید عدد باشد", + "tanafos_period_number": "دوره تنفس باید عدد باشد", "toman": "میلیون تومان", - "tanafos_amount_month": "ماه", + "tanafos_period_month": "ماه", "approved_amount_title": "مبلغ تصویب شده کارگروه", - "sakht_amount_day": "روز", + "sakht_period_day": "روز", "proposed_amount_error": "وارد کردن مقدار پیشنهادی الزامیست", "proposed_amount": "مبلغ پیشنهادی", "proposed_amount_positive": "مقدار پیشنهادی باید مثبت باشد", diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index 98f5a32..9dc919c 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -81,14 +81,14 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand (value) => value <= vehicle_amount[vehicle_type]) .test("positive", `${t("ConfirmDialog.proposed_amount_positive")}`, (value) => value >= 0) .required(t("ConfirmDialog.proposed_amount_error")), - sakht_amount: Yup.mixed() - .test("is-number", `${t("ConfirmDialog.sakht_amount_number")}`, + sakht_period: Yup.mixed() + .test("is-number", `${t("ConfirmDialog.sakht_period_number")}`, (value) => !isNaN(value)) - .required(t("ConfirmDialog.sakht_amount_error")), - tanafos_amount: Yup.mixed() - .test("is-number", `${t("ConfirmDialog.tanafos_amount_number")}`, + .required(t("ConfirmDialog.sakht_period_error")), + tanafos_period: Yup.mixed() + .test("is-number", `${t("ConfirmDialog.tanafos_period_number")}`, (value) => !isNaN(value)) - .required(t("ConfirmDialog.tanafos_amount_error")), + .required(t("ConfirmDialog.tanafos_period_error")), confirm_img: Yup.mixed() .required(t("MachinaryOffice.upload_file_required")) .test('fileSize', `${t("MachinaryOffice.upload_file_unit")}`, (value) => { @@ -104,15 +104,15 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand initialValues: { description: "", proposed_amount: "", - sakht_amount: "", - tanafos_amount: "", + sakht_period: "", + tanafos_period: "", confirm_img: null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("proposed_amount", values.proposed_amount); - formData.append("sakht_amount", values.sakht_amount); - formData.append("tanafos_amount", values.tanafos_amount); + formData.append("sakht_period", values.sakht_period); + formData.append("tanafos_period", values.tanafos_period); 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', { @@ -220,49 +220,49 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand {t("ConfirmDialog.sakht_amount_day")}, + position="end">{t("ConfirmDialog.sakht_period_day")}, }} /> {t("ConfirmDialog.tanafos_amount_month")}, + position="end">{t("ConfirmDialog.tanafos_period_month")}, }} /> 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 61fff69..f60e371 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -156,13 +156,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl /> {renderCustomAccordions()} diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index ed81b6b..f54c020 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -173,13 +173,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand /> {renderCustomAccordions()} diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 654f0ed..4934d8e 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -161,13 +161,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl /> {renderCustomAccordions()} diff --git a/src/core/components/NumberShowBox.jsx b/src/core/components/NumberShowBox.jsx index 9f6f5ba..528cf0b 100644 --- a/src/core/components/NumberShowBox.jsx +++ b/src/core/components/NumberShowBox.jsx @@ -1,7 +1,6 @@ import {Box, Typography} from "@mui/material"; const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => { - console.log({showNumber}) return ( <> From 7a08df31500e13f955b32569ce0523adf1c6a83e Mon Sep 17 00:00:00 2001 From: Yasiu1376 Date: Sun, 24 Dec 2023 16:41:20 +0330 Subject: [PATCH 09/18] upload image --- public/locales/fa/app.json | 5 +- .../Form/ConfirmForm/ConfirmContent.jsx | 81 +++++++++++++------ src/core/components/UploadSystem.jsx | 25 +++--- 3 files changed, 75 insertions(+), 36 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 4e26061..6233abc 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -218,11 +218,14 @@ "confirm": "ارجاع به معاون حمل و نقل", "upload_file": "صورت جلسه کارگروه را بارگذاری کنید", "upload_file_required": "وارد کردن صورت جلسه کارگروه الزامیست", + "upload_file_second_required": "وارد کردن فرم ب الزامیست", "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد", "upload_file_format": "فرمت قابل قبول : png,jpg,pdf", "print_final_credit_amount": "چاپ صورت جلسه تعیین مبلغ نهایی", "max_amount": "حداکثر مبلغ تصویب شده {value} میلیون ریال می باشد", - "excel_report": "گزارش اکسل" + "excel_report": "گزارش اکسل", + "first_form": "فرم الف را بارگذاری کنید", + "second_form": "فرم ب را بارگذاری کنید" }, "RefahiProvinceManager": { "name": "نام", diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 38c3f2e..583a634 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -28,10 +28,10 @@ const vehicle_amount = { } 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 [selectedImage, setSelectedImage] = useState([null, null]); + const [fileTypes, setFileTypes] = useState([null, null]); // Array to hold file types for multiple instances + const [fileNames, setFileNames] = useState([null, null]); + const [showAddIcon, setShowAddIcon] = useState([true , true]); const requestServer = useRequest({auth: true, notification: false}) const {update_notification} = useNotification(); const [accordionStates, setAccordionStates] = useState([]); @@ -85,6 +85,15 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand .test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => { return value.size <= 2 * 1024 * 1024; }) + .test('fileType', `${t("PassengerBoss.upload_file_format")}`, (value) => { + const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types + return allowedTypes.includes(value.type); + }), + second_img: Yup.mixed() + .required(t("PassengerBoss.upload_file_second_required")) + .test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => { + return value.size <= 2 * 1024 * 1024; + }) .test('fileType', `${t("PassengerBoss.upload_file_format")}`, (value) => { const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types return allowedTypes.includes(value.type); @@ -95,13 +104,17 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand initialValues: { description: "", approved_amount: "", - confirm_img: null + confirm_img: null, + second_img: null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); + console.log(values) formData.append("approved_amount", values.approved_amount); if (values.description != "") formData.append("expert_description", values.description); + formData.append("attachment", values.confirm_img); + formData.append("second_attachment", values.second_img); requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { data: formData, @@ -120,18 +133,32 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand formik.setFieldValue("description", event.target.value) }; - const handleUploadChange = (event) => { + const handleUploadChange = (event , fieldName , index) => { const uploadedFile = event.target?.files?.[0]; if (uploadedFile) { const fileType = event.target?.files?.[0].type; const fileName = event.target?.files?.[0].name; - setSelectedImage(URL.createObjectURL(uploadedFile)); - setfileType(fileType); - setfileName(fileName); - formik.setFieldValue("confirm_img", uploadedFile).then(() => { - formik.setFieldTouched("confirm_img", true); + + const updatedImages = [...selectedImage]; + updatedImages[index] = URL.createObjectURL(uploadedFile); + setSelectedImage(updatedImages); + + const updatedFileTypes = [...fileTypes]; + updatedFileTypes[index] = fileType; + + const updatedFileNames = [...fileNames]; + updatedFileNames[index] = fileName; + + const showAddIconField = [...showAddIcon]; + showAddIconField[index] = false; + + setFileTypes(updatedFileTypes); + setFileNames(updatedFileNames); + + formik.setFieldValue(fieldName, uploadedFile).then(() => { + formik.setFieldTouched(fieldName, true); }) - setShowAddIcon(false); + setShowAddIcon(showAddIconField); } }; const handleAmountChange = (event) => { @@ -230,15 +257,16 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand - {t("UploadSystem.upload_file")} + {t("PassengerBoss.first_form")} handleUploadChange(event, "confirm_img" , 0)} // Pass the updated function directly setselectedImage={setSelectedImage} setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue fieldname="confirm_img" - fileType={fileType} - fileName={fileName} + fileType={fileTypes[0]} + fileName={fileNames[0]} imageAlt={t("app_name")} imageSize={[250, 150]} setShowAddIcon={setShowAddIcon} @@ -256,29 +284,30 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand - {t("UploadSystem.upload_file")} + {t("PassengerBoss.second_form")} handleUploadChange(event, "second_img" , 1)} // Pass the updated function directly setselectedImage={setSelectedImage} setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue - fieldname="confirm_img" - fileType={fileType} - fileName={fileName} + fieldname="second_img" + fileType={fileTypes[1]} // Use fileTypes array at index 0 for the first instance + fileName={fileNames[1]} imageAlt={t("app_name")} imageSize={[250, 150]} setShowAddIcon={setShowAddIcon} showAddIcon={showAddIcon} - onBlur={() => formik.handleBlur("confirm_img")} + onBlur={() => formik.handleBlur("second_img")} error={ - formik.touched.confirm_img && - Boolean(formik.errors.confirm_img) + formik.touched.second_img && + Boolean(formik.errors.second_img) } /> - {formik.touched.confirm_img && formik.errors.confirm_img} + {formik.touched.second_img && formik.errors.second_img} diff --git a/src/core/components/UploadSystem.jsx b/src/core/components/UploadSystem.jsx index ea573d7..fd99b01 100644 --- a/src/core/components/UploadSystem.jsx +++ b/src/core/components/UploadSystem.jsx @@ -4,7 +4,7 @@ import AddIcon from "@mui/icons-material/Add"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import {useRef} from "react"; -const UploadSystem = ({ +const UploadSystem = ({ index, selectedImage, setselectedImage, handleUploadChange, @@ -22,10 +22,17 @@ const UploadSystem = ({ fileInputRef.current.click(); }; - const handleDeleteImage = () => { - setselectedImage(null); + const handleDeleteImage = (index) => { + const updatedSelectedImages = [...selectedImage]; + updatedSelectedImages[index] = null; + setselectedImage(updatedSelectedImages); + setFieldValue(fieldname, null); - setShowAddIcon(true); + + const showAddIconSelected = [...showAddIcon]; + showAddIconSelected[index] = true; + setShowAddIcon(showAddIconSelected); + if (fileInputRef.current) { fileInputRef.current.value = ""; } @@ -44,8 +51,7 @@ const UploadSystem = ({ return ( - {showAddIcon ? ( - // Show the add icon and "Upload File" text when no image is selected + {showAddIcon[index] ? ( <> @@ -154,8 +160,9 @@ const UploadSystem = ({ color="error" endIcon={} variant="contained" - onClick={handleDeleteImage} + onClick={() => handleDeleteImage(index)} // Wrap the function call in an arrow function > + {t("UploadSystem.delete")} @@ -164,7 +171,7 @@ const UploadSystem = ({ type="file" accept="image/*, .pdf, .doc, .docx, .xls, .xlsx" style={{display: "none"}} - onChange={handleUploadChange} + onChange={(event) => handleUploadChange(event, fieldname, index)} ref={fileInputRef} /> From 65a1ed27168d3f006a21d3355afcfdbefeaa879f Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 25 Dec 2023 11:32:07 +0330 Subject: [PATCH 10/18] add sakht and tanafos columns in loan history and sync cartables with backend --- public/locales/fa/app.json | 4 +++ .../dashboard/loan-history/index.jsx | 28 +++++++++++++++++++ .../Form/ConfirmForm/ConfirmContent.jsx | 3 ++ .../Form/ConfirmForm/ConfirmContent.jsx | 5 ++-- .../Form/ConfirmForm/ConfirmContent.jsx | 6 ++-- .../Form/ConfirmForm/ConfirmContent.jsx | 5 ++-- src/core/components/NumberShowBox.jsx | 2 +- 7 files changed, 46 insertions(+), 7 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 351fcec..d7e9da5 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -365,6 +365,8 @@ "tanafos_period_error": "وارد کردن دوره تنفس الزامیست", "approved_amount_positive": "مبلغ تصویب شده باید مثبت باشد", "approved_amount_number": "مبلغ تصویب شده باید عدد باشد", + "sakht_period_positive": "دوره ساخت باید مثبت باشد", + "tanafos_period_positive": "دوره تنفس باید مثبت باشد", "sakht_period_number": "دوره ساخت باید عدد باشد", "tanafos_period_number": "دوره تنفس باید عدد باشد", "toman": "میلیون تومان", @@ -554,6 +556,8 @@ "LoanHistory": { "id": "کد یکتا", "name": "نام", + "tanafos_period": "دوره تنفس", + "sakht_period": "دوره ساخت", "national_id": "کد ملی", "phone_number": "موبایل", "proposed_amount": "مبلغ پیشنهادی", diff --git a/src/components/dashboard/loan-history/index.jsx b/src/components/dashboard/loan-history/index.jsx index 66f28de..4836b3e 100644 --- a/src/components/dashboard/loan-history/index.jsx +++ b/src/components/dashboard/loan-history/index.jsx @@ -167,6 +167,34 @@ function DashboardLoanHistoryComponent() { {renderedCellValue} ), }, + { + accessorFn: (row) => row.sakht_period, + id: "sakht_period", + header: t("LoanHistory.sakht_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, + { + accessorFn: (row) => row.tanafos_period, + id: "tanafos_period", + header: t("LoanHistory.tanafos_period"), + enableColumnFilter: true, + datatype: "numeric", + filterFn: "equals", + columnFilterModeOptions: [ + "equals" + ], + Cell: ({renderedCellValue}) => ( + {renderedCellValue} + ), + }, { accessorFn: (row) => row.vehicle_type, id: "vehicle_type", diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index 9dc919c..d338080 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -84,10 +84,12 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand sakht_period: Yup.mixed() .test("is-number", `${t("ConfirmDialog.sakht_period_number")}`, (value) => !isNaN(value)) + .test("positive", `${t("ConfirmDialog.sakht_period_positive")}`, (value) => value > 0) .required(t("ConfirmDialog.sakht_period_error")), tanafos_period: Yup.mixed() .test("is-number", `${t("ConfirmDialog.tanafos_period_number")}`, (value) => !isNaN(value)) + .test("positive", `${t("ConfirmDialog.tanafos_period_positive")}`, (value) => value > 0) .required(t("ConfirmDialog.tanafos_period_error")), confirm_img: Yup.mixed() .required(t("MachinaryOffice.upload_file_required")) @@ -117,6 +119,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand if (values.confirm_img != null) formData.append("attachment", values.confirm_img); requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, + notification: true }).then((response) => { setOpenConfirmDialog(false) mutate() 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 f60e371..ae140fc 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -90,6 +90,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl requestServer(`${CONFIRM_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, + notification: true }).then((response) => { setOpenConfirmDialog(false) mutate() @@ -155,12 +156,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl unitTitle={t("ConfirmDialog.unit")} /> diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index f54c020..e66a522 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -47,6 +47,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false); setAccordionStates(booleanData); setDetailsData(response.data) + console.log(response.data.data) }) .catch(() => { }).finally(() => { @@ -105,6 +106,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { data: formData, + notification: true }).then((response) => { setOpenConfirmDialog(false) mutate() @@ -172,12 +174,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand unitTitle={t("ConfirmDialog.unit")} /> diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 4934d8e..5a8b046 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -96,6 +96,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, + notification: true }).then((response) => { setOpenConfirmDialog(false) mutate() @@ -160,12 +161,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl unitTitle={t("ConfirmDialog.unit")} /> diff --git a/src/core/components/NumberShowBox.jsx b/src/core/components/NumberShowBox.jsx index 528cf0b..b8e45b1 100644 --- a/src/core/components/NumberShowBox.jsx +++ b/src/core/components/NumberShowBox.jsx @@ -7,7 +7,7 @@ const NumberShowBox = ({showNumber, headerTitle, unitTitle}) => { {headerTitle} - {isNaN(showNumber) + {isNaN(showNumber) || showNumber === null ? "" : (showNumber).toLocaleString()}{" "} {unitTitle} From 0735b3d59a07872ce01d3631ff863f5ac8c639cc Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Mon, 25 Dec 2023 11:55:34 +0330 Subject: [PATCH 11/18] complete upload file changes in gheimat gozari cartable --- .../Form/ConfirmForm/ConfirmContent.jsx | 37 +++++++++++-------- .../Form/RejectForm/RejectContent.jsx | 8 +++- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index ada0a12..da2e889 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -14,10 +14,7 @@ import { } from "@mui/material" import {useFormik} from "formik"; import {useTranslations} from "next-intl"; -import { - CONFIRM_MACHINARY_OFFICE, - CONFIRM_MACHINARY_OFFICE_DETAILS -} from "@/core/data/apiRoutes"; +import {CONFIRM_MACHINARY_OFFICE, CONFIRM_MACHINARY_OFFICE_DETAILS} from "@/core/data/apiRoutes"; import {useEffect, useState} from "react"; import PriceField from "@/core/components/PriceField"; import * as Yup from "yup"; @@ -28,13 +25,13 @@ const vehicle_amount = { "اتوبوس": 7000, "مینی بوس": 2000, } -const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , handleSizeChangeClick}) => { +const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, 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); @@ -46,7 +43,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han useEffect(() => { requestServer(`${CONFIRM_MACHINARY_OFFICE_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) }) @@ -60,13 +57,11 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, 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]) @@ -93,7 +88,6 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han return allowedTypes.includes(value.type); }) }); - const formik = useFormik({ initialValues: { description: "", @@ -104,7 +98,13 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han const formData = new FormData(); 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); + const attachment = [ + { + title: "فایل ضمیمه کارتابل قیمت گذاری", + file: values.confirm_img + } + ]; + if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, }).then((response) => { @@ -166,7 +166,7 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type , han - {loading ? : renderCustomAccordions()} + {loading ? : renderCustomAccordions()} - - + + diff --git a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx index 479b213..9083f1d 100644 --- a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx @@ -30,7 +30,13 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - if (values.reject_img != null) formData.append("attachment", values.reject_img); + const attachment = [ + { + title: "فایل ضمیمه کارتابل قیمت گذاری", + file: values.reject_img + } + ]; + if (values.reject_img != null) formData.append("attachment", attachment); requestServer(`${REJECT_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, From 05c15e3a9168ff784b3cb2a05472702d89493621 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Mon, 25 Dec 2023 13:40:55 +0330 Subject: [PATCH 12/18] complete upload file changes in tabsare18 cartable --- .../Form/ConfirmForm/ConfirmContent.jsx | 8 +++++++- .../Form/RejectForm/RejectContent.jsx | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index 9480f7a..6737426 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -92,7 +92,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); if (values.description != "") formData.append("expert_description", values.description); - if (values.confirm_img != null) formData.append("attachment", values.confirm_img); + const attachment = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.confirm_img + } + ]; + if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx index b692df4..597dcd8 100644 --- a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx @@ -30,7 +30,13 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - if (values.reject_img != null) formData.append("attachment", values.reject_img); + const attachment = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.reject_img + } + ]; + if (values.reject_img != null) formData.append("attachment", JSON.stringify(attachment)); requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, From 51d79f4fed57d9be0d6dbb34ab2c6c39254ac84d Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Mon, 25 Dec 2023 13:43:12 +0330 Subject: [PATCH 13/18] complete upload file changes in tabsare18 (navgan province manager) cartable --- .../Form/ConfirmForm/ConfirmContent.jsx | 8 +++++++- .../Form/RejectForm/RejectContent.jsx | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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 4078032..fbe463b 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -86,7 +86,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); if (values.description != "") formData.append("expert_description", values.description); - if (values.confirm_img != null) formData.append("attachment", values.confirm_img); + const attachment = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.confirm_img + } + ]; + if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); requestServer(`${CONFIRM_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, diff --git a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx index 0b26c8b..2516990 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx @@ -30,7 +30,13 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - if (values.reject_img != null) formData.append("attachment", values.reject_img); + const attachment = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.reject_img + } + ]; + if (values.reject_img != null) formData.append("attachment", JSON.stringify(attachment)); requestServer(`${REJECT_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, From d51d7ffb6deee6091c5e5ca7481dcd2ec5581488 Mon Sep 17 00:00:00 2001 From: AminGhasempoor Date: Mon, 25 Dec 2023 13:44:22 +0330 Subject: [PATCH 14/18] delete logs --- .../dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index e66a522..720f9b9 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -47,7 +47,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false); setAccordionStates(booleanData); setDetailsData(response.data) - console.log(response.data.data) }) .catch(() => { }).finally(() => { From 898ea094ef68a4141cc37df5b82c1e91f993d281 Mon Sep 17 00:00:00 2001 From: Yasiu1376 Date: Tue, 26 Dec 2023 14:13:44 +0330 Subject: [PATCH 15/18] update reject and confirm form --- public/locales/fa/app.json | 2 +- .../Form/ConfirmForm/ConfirmContent.jsx | 119 +++++++------- .../Form/RejectForm/RejectContent.jsx | 150 ++++++++++++++---- .../Form/ConfirmForm/ConfirmContent.jsx | 12 +- src/core/components/UploadSystem.jsx | 25 ++- 5 files changed, 203 insertions(+), 105 deletions(-) diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json index 6233abc..24f4ad5 100644 --- a/public/locales/fa/app.json +++ b/public/locales/fa/app.json @@ -217,7 +217,7 @@ "state_name": "وضعیت درخواست", "confirm": "ارجاع به معاون حمل و نقل", "upload_file": "صورت جلسه کارگروه را بارگذاری کنید", - "upload_file_required": "وارد کردن صورت جلسه کارگروه الزامیست", + "upload_file_first_required": "وارد کردن فرم الف الزامیست", "upload_file_second_required": "وارد کردن فرم ب الزامیست", "upload_file_unit": "فایل بارگذاری شده باید حداکثر 2Mb باشد", "upload_file_format": "فرمت قابل قبول : png,jpg,pdf", diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 583a634..a3a5580 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -28,10 +28,14 @@ const vehicle_amount = { } const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, handleSizeChangeClick}) => { const t = useTranslations(); - const [selectedImage, setSelectedImage] = useState([null, null]); - const [fileTypes, setFileTypes] = useState([null, null]); // Array to hold file types for multiple instances - const [fileNames, setFileNames] = useState([null, null]); - const [showAddIcon, setShowAddIcon] = useState([true , true]); + const [selectedImageAForm, setSelectedImageAForm] = useState(""); + const [selectedImageBForm, setSelectedImageBForm] = useState(""); + const [fileTypesA, setFileTypesA] = useState(null); + const [fileNamesA, setFileNamesA] = useState(null); + const [fileTypesB, setFileTypesB] = useState(null); + const [fileNamesB, setFileNamesB] = useState(null); + const [showAddIconA, setShowAddIconA] = useState(true); + const [showAddIconB, setShowAddIconB] = useState(true); const requestServer = useRequest({auth: true, notification: false}) const {update_notification} = useNotification(); const [accordionStates, setAccordionStates] = useState([]); @@ -80,8 +84,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand (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")) + first_img: Yup.mixed() + .required(t("PassengerBoss.upload_file_first_required")) .test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => { return value.size <= 2 * 1024 * 1024; }) @@ -104,19 +108,28 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand initialValues: { description: "", approved_amount: "", - confirm_img: null, + first_img: null, second_img: null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - console.log(values) + formData.append("approved_amount", values.approved_amount); + if (values.description != "") formData.append("expert_description", values.description); - formData.append("attachment", values.confirm_img); - formData.append("second_attachment", values.second_img); + const attachments = [ + { title: 'فرم الف', file: values.first_img }, + { title: 'فرم ب', file: values.second_img } + ]; - requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post', { + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + + requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post',{ + notification: true, data: formData, }).then((response) => { setOpenConfirmDialog(false) @@ -133,32 +146,32 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand formik.setFieldValue("description", event.target.value) }; - const handleUploadChange = (event , fieldName , index) => { + const handleUploadChangeAForm = (event) => { const uploadedFile = event.target?.files?.[0]; if (uploadedFile) { const fileType = event.target?.files?.[0].type; const fileName = event.target?.files?.[0].name; - - const updatedImages = [...selectedImage]; - updatedImages[index] = URL.createObjectURL(uploadedFile); - setSelectedImage(updatedImages); - - const updatedFileTypes = [...fileTypes]; - updatedFileTypes[index] = fileType; - - const updatedFileNames = [...fileNames]; - updatedFileNames[index] = fileName; - - const showAddIconField = [...showAddIcon]; - showAddIconField[index] = false; - - setFileTypes(updatedFileTypes); - setFileNames(updatedFileNames); - - formik.setFieldValue(fieldName, uploadedFile).then(() => { - formik.setFieldTouched(fieldName, true); + setSelectedImageAForm(URL.createObjectURL(uploadedFile)); + setFileTypesA(fileType); + setFileNamesA(fileName); + formik.setFieldValue("first_img", uploadedFile).then(() => { + formik.setFieldTouched("first_img", true); }) - setShowAddIcon(showAddIconField); + setShowAddIconA(false); + } + }; + const handleUploadChangeBForm = (event) => { + const uploadedFile = event.target?.files?.[0]; + if (uploadedFile) { + const fileType = event.target?.files?.[0].type; + const fileName = event.target?.files?.[0].name; + setSelectedImageBForm(URL.createObjectURL(uploadedFile)); + setFileTypesB(fileType); + setFileNamesB(fileName); + formik.setFieldValue("second_img", uploadedFile).then(() => { + formik.setFieldTouched("second_img", true); + }) + setShowAddIconB(false); } }; const handleAmountChange = (event) => { @@ -259,45 +272,43 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand {t("PassengerBoss.first_form")} handleUploadChange(event, "confirm_img" , 0)} // Pass the updated function directly - setselectedImage={setSelectedImage} + selectedImage={selectedImageAForm} + handleUploadChange={handleUploadChangeAForm} // Pass the updated function directly + setselectedImage={setSelectedImageAForm} setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue - fieldname="confirm_img" - fileType={fileTypes[0]} - fileName={fileNames[0]} + fieldname="first_img" + fileType={fileTypesA} + fileName={fileNamesA} imageAlt={t("app_name")} imageSize={[250, 150]} - setShowAddIcon={setShowAddIcon} - showAddIcon={showAddIcon} - onBlur={() => formik.handleBlur("confirm_img")} + setShowAddIcon={setShowAddIconA} + showAddIcon={showAddIconA} + onBlur={() => formik.handleBlur("first_img")} error={ - formik.touched.confirm_img && - Boolean(formik.errors.confirm_img) + formik.touched.first_img && + Boolean(formik.errors.first_img) } /> - {formik.touched.confirm_img && formik.errors.confirm_img} + {formik.touched.first_img && formik.errors.first_img} {t("PassengerBoss.second_form")} handleUploadChange(event, "second_img" , 1)} // Pass the updated function directly - setselectedImage={setSelectedImage} + selectedImage={selectedImageBForm} + handleUploadChange={handleUploadChangeBForm} // Pass the updated function directly + setselectedImage={setSelectedImageBForm} setFieldValue={formik.setFieldValue} // Remove props.setFieldValue, use formik.setFieldValue fieldname="second_img" - fileType={fileTypes[1]} // Use fileTypes array at index 0 for the first instance - fileName={fileNames[1]} + fileType={fileTypesB} // Use fileTypes array at index 0 for the first instance + fileName={fileNamesB} imageAlt={t("app_name")} imageSize={[250, 150]} - setShowAddIcon={setShowAddIcon} - showAddIcon={showAddIcon} + setShowAddIcon={setShowAddIconB} + showAddIcon={showAddIconB} onBlur={() => formik.handleBlur("second_img")} error={ formik.touched.second_img && diff --git a/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx index 93fe8c3..7ad9ade 100644 --- a/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/RejectForm/RejectContent.jsx @@ -1,7 +1,7 @@ import UploadSystem from "@/core/components/UploadSystem" import useNotification from "@/lib/app/hooks/useNotification"; import useRequest from "@/lib/app/hooks/useRequest"; -import {Button, DialogActions, DialogContent, Stack, TextField, Typography} from "@mui/material" +import {Button, DialogActions, DialogContent, FormHelperText, Grid, Stack, TextField, Typography} from "@mui/material" import {useFormik} from "formik"; import {useTranslations} from "next-intl"; import {useState} from "react"; @@ -9,28 +9,62 @@ import * as Yup from "yup"; import {REJECT_PASSENGER_BOSS} from "@/core/data/apiRoutes"; const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { - const [selectedImage, setSelectedImage] = useState(""); - const [fileType, setfileType] = useState(null); - const [fileName, setfileName] = useState(null); - const [showAddIcon, setShowAddIcon] = useState(true); + const [selectedImageAForm, setSelectedImageAForm] = useState(""); + const [selectedImageBForm, setSelectedImageBForm] = useState(""); + const [fileTypesA, setFileTypesA] = useState(null); + const [fileNamesA, setFileNamesA] = useState(null); + const [fileTypesB, setFileTypesB] = useState(null); + const [fileNamesB, setFileNamesB] = useState(null); + const [showAddIconA, setShowAddIconA] = useState(true); + const [showAddIconB, setShowAddIconB] = useState(true); const t = useTranslations(); const requestServer = useRequest({auth: true}) const {update_notification} = useNotification() const validationSchema = Yup.object().shape({ description: Yup.string().required(t("RejectDialog.description_error")), + + first_reject_img: Yup.mixed() + .required(t("PassengerBoss.upload_file_first_required")) + .test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => { + return value.size <= 2 * 1024 * 1024; + }) + .test('fileType', `${t("PassengerBoss.upload_file_format")}`, (value) => { + const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types + return allowedTypes.includes(value.type); + }), + + second_reject_img: Yup.mixed() + .required(t("PassengerBoss.upload_file_second_required")) + .test('fileSize', `${t("PassengerBoss.upload_file_unit")}`, (value) => { + return value.size <= 2 * 1024 * 1024; + }) + .test('fileType', `${t("PassengerBoss.upload_file_format")}`, (value) => { + const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'application/pdf']; // Define your allowed file types + return allowedTypes.includes(value.type); + }) }); const formik = useFormik({ initialValues: { description: "", - reject_img: null + first_reject_img: null, + second_reject_img:null }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - if (values.reject_img != null) formData.append("attachment", values.reject_img); + + const attachments = [ + { title: 'فرم الف', file: values.first_reject_img }, + { title: 'فرم ب', file: values.second_reject_img } + ]; + + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); requestServer(`${REJECT_PASSENGER_BOSS}/${rowId}`, 'post', { data: formData, @@ -49,22 +83,32 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { formik.setFieldValue("description", event.target.value); formik.handleChange(event); }; - const handleUploadChange = (event) => { + const handleUploadChangeAForm = (event) => { const uploadedFile = event.target?.files?.[0]; if (uploadedFile) { - const maxFileSize = 2 * 1024 * 1024; - if (uploadedFile.size > maxFileSize) { - UploadFileNotification(t); - event.target.value = ""; - return; - } const fileType = event.target?.files?.[0].type; const fileName = event.target?.files?.[0].name; - setSelectedImage(URL.createObjectURL(uploadedFile)); - setfileType(fileType); - setfileName(fileName); - formik.setFieldValue("reject_img", uploadedFile); - setShowAddIcon(false); + setSelectedImageAForm(URL.createObjectURL(uploadedFile)); + setFileTypesA(fileType); + setFileNamesA(fileName); + formik.setFieldValue("first_reject_img", uploadedFile).then(() => { + formik.setFieldTouched("first_reject_img", true); + }) + setShowAddIconA(false); + } + }; + const handleUploadChangeBForm = (event) => { + const uploadedFile = event.target?.files?.[0]; + if (uploadedFile) { + const fileType = event.target?.files?.[0].type; + const fileName = event.target?.files?.[0].name; + setSelectedImageBForm(URL.createObjectURL(uploadedFile)); + setFileTypesB(fileType); + setFileNamesB(fileName); + formik.setFieldValue("second_reject_img", uploadedFile).then(() => { + formik.setFieldTouched("second_reject_img", true); + }) + setShowAddIconB(false); } }; return ( @@ -90,20 +134,60 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { /> - {t("UploadSystem.upload_file")}{t("UploadSystem.optional")} - + + + {t("PassengerBoss.first_form")} + formik.handleBlur("first_reject_img")} + error={ + formik.touched.first_reject_img && + Boolean(formik.errors.first_reject_img) + } + /> + + {formik.touched.first_reject_img && formik.errors.first_reject_img} + + + + {t("PassengerBoss.second_form")} + formik.handleBlur("second_reject_img")} + error={ + formik.touched.second_reject_img && + Boolean(formik.errors.second_reject_img) + } + /> + + {formik.touched.second_reject_img && formik.errors.second_reject_img} + + + diff --git a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx index d86c4f2..d84726f 100644 --- a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx @@ -38,7 +38,17 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); if (values.description != "") formData.append("description", values.description); - if (values.confirm_img != null) formData.append("attachment", values.confirm_img); + // if (values.confirm_img != null) formData.append("attachment", values.confirm_img); + + const attachments = [ + { title: 'فرم الف', file: values.confirm_img }, + ]; + + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + requestServer(`${CONFIRM_PASSENGER_OFFICE}/${rowId}`, 'post', { data: formData, diff --git a/src/core/components/UploadSystem.jsx b/src/core/components/UploadSystem.jsx index fd99b01..ea573d7 100644 --- a/src/core/components/UploadSystem.jsx +++ b/src/core/components/UploadSystem.jsx @@ -4,7 +4,7 @@ import AddIcon from "@mui/icons-material/Add"; import DeleteForeverIcon from "@mui/icons-material/DeleteForever"; import {useRef} from "react"; -const UploadSystem = ({ index, +const UploadSystem = ({ selectedImage, setselectedImage, handleUploadChange, @@ -22,17 +22,10 @@ const UploadSystem = ({ index, fileInputRef.current.click(); }; - const handleDeleteImage = (index) => { - const updatedSelectedImages = [...selectedImage]; - updatedSelectedImages[index] = null; - setselectedImage(updatedSelectedImages); - + const handleDeleteImage = () => { + setselectedImage(null); setFieldValue(fieldname, null); - - const showAddIconSelected = [...showAddIcon]; - showAddIconSelected[index] = true; - setShowAddIcon(showAddIconSelected); - + setShowAddIcon(true); if (fileInputRef.current) { fileInputRef.current.value = ""; } @@ -51,7 +44,8 @@ const UploadSystem = ({ index, return ( - {showAddIcon[index] ? ( + {showAddIcon ? ( + // Show the add icon and "Upload File" text when no image is selected <> @@ -160,9 +154,8 @@ const UploadSystem = ({ index, color="error" endIcon={} variant="contained" - onClick={() => handleDeleteImage(index)} // Wrap the function call in an arrow function + onClick={handleDeleteImage} > - {t("UploadSystem.delete")} @@ -171,7 +164,7 @@ const UploadSystem = ({ index, type="file" accept="image/*, .pdf, .doc, .docx, .xls, .xlsx" style={{display: "none"}} - onChange={(event) => handleUploadChange(event, fieldname, index)} + onChange={handleUploadChange} ref={fileInputRef} /> From 48e8691d539a7b360040cc078dc70ce254681ced Mon Sep 17 00:00:00 2001 From: Yasiu1376 Date: Wed, 27 Dec 2023 11:44:05 +0330 Subject: [PATCH 16/18] change back --- .../Form/ConfirmForm/ConfirmContent.jsx | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx index d84726f..d86c4f2 100644 --- a/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-office/Form/ConfirmForm/ConfirmContent.jsx @@ -38,17 +38,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); if (values.description != "") formData.append("description", values.description); - // if (values.confirm_img != null) formData.append("attachment", values.confirm_img); - - const attachments = [ - { title: 'فرم الف', file: values.confirm_img }, - ]; - - attachments.forEach((attachment, index) => { - formData.append(`attachment[${index}][title]`, attachment.title); - formData.append(`attachment[${index}][file]`, attachment.file); - }); - + if (values.confirm_img != null) formData.append("attachment", values.confirm_img); requestServer(`${CONFIRM_PASSENGER_OFFICE}/${rowId}`, 'post', { data: formData, From 3db1ee674ef1b08e617683776a7737389f612e53 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Wed, 27 Dec 2023 11:48:39 +0330 Subject: [PATCH 17/18] complete show files by accordian --- .../Form/ConfirmForm/ConfirmContent.jsx | 19 +++-- .../Form/RejectForm/RejectContent.jsx | 20 +++-- .../Form/ConfirmForm/ConfirmContent.jsx | 49 +++++++---- .../Form/RejectForm/RejectContent.jsx | 20 +++-- .../Form/ConfirmForm/ConfirmContent.jsx | 65 +++++++++------ .../Form/RejectForm/RejectContent.jsx | 20 +++-- src/core/components/CustomAccordion.jsx | 82 +++++++++++-------- src/core/components/ImageContent.jsx | 36 +++++--- 8 files changed, 195 insertions(+), 116 deletions(-) diff --git a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx index c04a2de..438def6 100644 --- a/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/machinary-office/Form/ConfirmForm/ConfirmContent.jsx @@ -115,13 +115,18 @@ const ConfirmContent = ({mutate, setOpenConfirmDialog, rowId, vehicle_type, hand formData.append("sakht_period", values.sakht_period); formData.append("tanafos_period", values.tanafos_period); if (values.description != "") formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل قیمت گذاری", - file: values.confirm_img - } - ]; - if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); + if (values.confirm_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل قیمت گذاری", + file: values.confirm_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${CONFIRM_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, notification: true diff --git a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx index 9083f1d..345f569 100644 --- a/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/machinary-office/Form/RejectForm/RejectContent.jsx @@ -30,14 +30,18 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل قیمت گذاری", - file: values.reject_img - } - ]; - if (values.reject_img != null) formData.append("attachment", attachment); - + if (values.reject_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل قیمت گذاری", + file: values.reject_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${REJECT_MACHINARY_OFFICE}/${rowId}`, 'post', { data: formData, }).then((response) => { 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 e345417..02c5348 100644 --- a/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/ConfirmForm/ConfirmContent.jsx @@ -29,6 +29,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl const [showAddIcon, setShowAddIcon] = useState(true); const requestServer = useRequest({auth: true, notification: false}) const {update_notification} = useNotification() + const [attachmentsData, setAttachmentsData] = useState([]); const [accordionStates, setAccordionStates] = useState([]); const [hasImageShown, setHasImageShown] = useState(false); const [imageLink, setImageLink] = useState(null); @@ -52,9 +53,14 @@ 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); - setAccordionStates(booleanData); - setDetailsData(response.data) + const allAttachments = []; + response.data.data.histories.map((history) => { + history.attachments.map((attachment) => { + allAttachments.push(attachment); + }); + }); + setAttachmentsData(allAttachments); + setDetailsData(response.data); }) .catch(() => { }).finally(() => { @@ -62,6 +68,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }); }, []); + useEffect(() => { + if (attachmentsData.length !== 0) { + const booleanData = Array.from({length: attachmentsData.length}, () => false); + setAccordionStates(booleanData); + } + }, [attachmentsData]); + const handleAccordionChange = (index) => { const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false); setAccordionStates(newAccordionStates); @@ -73,7 +86,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl } else { handleSizeChangeClick('xl'); setHasImageShown(true); - setImageLink(detailsList.data.attachment_files[index]) + setImageLink(attachmentsData[index]) setIsSkeleton(true) } }; @@ -85,15 +98,19 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - if (values.description != "") formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", - file: values.confirm_img - } - ]; - if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); - + if (values.description !== "") formData.append("expert_description", values.description); + if (values.confirm_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.confirm_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${CONFIRM_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, notification: true @@ -128,8 +145,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }; const renderCustomAccordions = () => { - if (detailsList && detailsList.data && detailsList.data.attachment_files) { - return detailsList.data.attachment_files.map((file, index) => ( + if (attachmentsData) { + return attachmentsData.map((file, index) => ( handleAccordionChange(index)} accordionIndex={index} - downloadFile={file.attachment} + downloadFile={file.file} /> )); } diff --git a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx index 2516990..8533094 100644 --- a/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/navgan-province-manager/Form/RejectForm/RejectContent.jsx @@ -30,14 +30,18 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", - file: values.reject_img - } - ]; - if (values.reject_img != null) formData.append("attachment", JSON.stringify(attachment)); - + if (values.reject_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.reject_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${REJECT_NAVGAN_PROVINCE_MANAGER}/${rowId}`, 'post', { data: formData, }).then((response) => { diff --git a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx index e9cb958..5465583 100644 --- a/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/ConfirmForm/ConfirmContent.jsx @@ -27,7 +27,8 @@ 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 [attachmentsData, setAttachmentsData] = useState([]); const [accordionStates, setAccordionStates] = useState([]); const [hasAccordionOpened, setHasAccordionOpened] = useState([]); const {update_notification} = useNotification(); @@ -40,10 +41,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 allAttachments = []; + response.data.data.histories.map((history) => { + history.attachments.map((attachment) => { + allAttachments.push(attachment); + }); + }); + setDetailsData(response.data); + setAttachmentsData(allAttachments); }) .catch(() => { }).finally(() => { @@ -51,6 +56,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }); }, []); + useEffect(() => { + if (attachmentsData.length !== 0) { + const booleanData = Array.from({length: attachmentsData.length}, () => false); + setAccordionStates(booleanData); + setHasAccordionOpened(booleanData); + } + }, [attachmentsData]); + const handleAccordionChange = (index) => { const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false); setAccordionStates(newAccordionStates); @@ -58,12 +71,12 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl if (!newAccordionStates[index]) { handleSizeChangeClick('sm'); setHasImageShown(false); - setIsSkeleton(false) + setIsSkeleton(false); } else { handleSizeChangeClick('xl'); setHasImageShown(true); - setImageLink(detailsList.data.attachment_files[index]) - setIsSkeleton(true) + setImageLink(attachmentsData[index]); + setIsSkeleton(true); const newHasAccordionOpened = [...hasAccordionOpened]; newHasAccordionOpened[index] = true; setHasAccordionOpened(newHasAccordionOpened); @@ -91,15 +104,19 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }, validationSchema, onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); - if (values.description != "") formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", - file: values.confirm_img - } - ]; - if (values.confirm_img != null) formData.append("attachment", JSON.stringify(attachment)); - + if (values.description !== "") formData.append("expert_description", values.description); + if (values.confirm_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.confirm_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${CONFIRM_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, notification: true @@ -134,8 +151,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl }; const renderCustomAccordions = () => { - if (detailsList && detailsList.data && detailsList.data.attachment_files) { - return detailsList.data.attachment_files.map((file, index) => ( + if (attachmentsData) { + return attachmentsData.map((file, index) => ( handleAccordionChange(index)} accordionIndex={index} - downloadFile={file.attachment} + downloadFile={file.file} /> )); } @@ -186,7 +203,9 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl multiline rows={8} label={<> - {t("ConfirmDialog.description")}{t("ConfirmDialog.optional")}} + {t("ConfirmDialog.description")} + {t("ConfirmDialog.optional")} + } value={formik.values.description} onChange={handleDescriptionChange} fullWidth @@ -214,9 +233,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, handleSizeChangeCl Boolean(formik.errors.confirm_img) } /> - + {formik.touched.confirm_img && formik.errors.confirm_img} diff --git a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx index 597dcd8..e370041 100644 --- a/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx +++ b/src/components/dashboard/transportation-assistance/Form/RejectForm/RejectContent.jsx @@ -30,14 +30,18 @@ const RejectContent = ({rowId, mutate, setOpenRejectDialog}) => { onSubmit: (values, {setSubmitting}) => { const formData = new FormData(); formData.append("expert_description", values.description); - const attachment = [ - { - title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", - file: values.reject_img - } - ]; - if (values.reject_img != null) formData.append("attachment", JSON.stringify(attachment)); - + if (values.reject_img != null) { + const attachments = [ + { + title: "فایل ضمیمه کارتابل بررسی وام های تبصره 18", + file: values.reject_img + } + ]; + attachments.forEach((attachment, index) => { + formData.append(`attachment[${index}][title]`, attachment.title); + formData.append(`attachment[${index}][file]`, attachment.file); + }); + } requestServer(`${REJECT_TRANSPORTATION_ASSISTANCE}/${rowId}`, 'post', { data: formData, }).then((response) => { diff --git a/src/core/components/CustomAccordion.jsx b/src/core/components/CustomAccordion.jsx index 20ba932..de0c646 100644 --- a/src/core/components/CustomAccordion.jsx +++ b/src/core/components/CustomAccordion.jsx @@ -3,17 +3,28 @@ import { AccordionDetails, AccordionSummary, Box, - Typography, - Grid, ButtonGroup, Button, CircularProgress + Button, + ButtonGroup, + CircularProgress, + Grid, + Typography } from "@mui/material"; import ExpandMoreIcon from '@mui/icons-material/ExpandMore'; import VerifiedIcon from '@mui/icons-material/Verified'; import Check from "@mui/icons-material/Check"; import FileDownloadOutlinedIcon from "@mui/icons-material/FileDownloadOutlined"; import {useState} from "react"; -const CustomAccordion = ({ title, hasOpened, hasAccordionOpened, handleAccordionChange, accordionIndex , downloadFile}) => { + +const CustomAccordion = ({ + title, + hasOpened, + hasAccordionOpened, + handleAccordionChange, + accordionIndex, + downloadFile + }) => { const [downloadStatus, setDownloadStatus] = useState('initial'); - const handleDownloadClick = (setStatus , url) => { + const handleDownloadClick = (setStatus, url) => { setStatus('downloading'); window.open(url, '_blank'); setTimeout(() => { @@ -23,39 +34,40 @@ const CustomAccordion = ({ title, hasOpened, hasAccordionOpened, handleAccordion }, 1200); }, 1000); }; - return( - handleAccordionChange(accordionIndex)} sx={{ - mb: 2, - boxShadow: 1, - backgroundColor: "#f7f7f7" - }}> - }> - - - {title} - {hasAccordionOpened && } + return ( + handleAccordionChange(accordionIndex)} + sx={{ + mb: 2, + boxShadow: 1, + backgroundColor: "#f7f7f7" + }}> + }> + + + {title} + {hasAccordionOpened && } + - - - - - - - - + + + + + + + + - - - -); + + + ); } export default CustomAccordion; diff --git a/src/core/components/ImageContent.jsx b/src/core/components/ImageContent.jsx index f99e2e8..bf96a4b 100644 --- a/src/core/components/ImageContent.jsx +++ b/src/core/components/ImageContent.jsx @@ -1,30 +1,46 @@ import {Box, Skeleton, Stack} from "@mui/material"; import {useEffect} from "react"; + const ImageContent = (prop) => { useEffect(() => { const timer = setTimeout(() => { prop.setIsSkeleton(false); }, 1500); - return () => clearTimeout(timer); }, [prop.isSkeleton]); - - const isPDF = prop.imageLink && prop.imageLink.attachment && prop.imageLink.attachment.endsWith('.pdf'); + const isPDF = prop.imageLink && prop.imageLink.file && prop.imageLink.file.endsWith('.pdf'); return ( <> - + {prop.isSkeleton && ( - - + + )} {isPDF ? ( - + ) : ( - prop.imageLink && prop.imageLink.attachment && ( - - + prop.imageLink && prop.imageLink.file && ( + + ) )} From f7d3c6a09957ba648721e2ae26dd10083fa70b6a Mon Sep 17 00:00:00 2001 From: Yasiu1376 Date: Wed, 27 Dec 2023 13:10:03 +0330 Subject: [PATCH 18/18] remove conflicts --- .../Form/ConfirmForm/ConfirmContent.jsx | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx index 8dfee61..8cc3c4a 100644 --- a/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx +++ b/src/components/dashboard/passenger-boss/Form/ConfirmForm/ConfirmContent.jsx @@ -38,6 +38,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand const [showAddIconB, setShowAddIconB] = useState(true); const requestServer = useRequest({auth: true, notification: false}) const {update_notification} = useNotification(); + const [attachmentsData, setAttachmentsData] = useState([]); const [accordionStates, setAccordionStates] = useState([]); const [hasImageShown, setHasImageShown] = useState(false); const [imageLink, setImageLink] = useState(null); @@ -48,8 +49,14 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand useEffect(() => { requestServer(`${EXPORT_PASSENGER_BOSS_DETAILS}/${rowId}`, 'get') .then((response) => { - const booleanData = Array.from({length: response.data.data.attachment_files.length}, () => false); - setAccordionStates(booleanData); + const allAttachments = []; + response.data.data.histories.map((history) => { + history.attachments.map((attachment) => { + allAttachments.push(attachment); + }); + }); + setDetailsData(response.data); + setAttachmentsData(allAttachments); setDetailsData(response.data) }) .catch(() => { @@ -58,6 +65,13 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand }); }, []); + useEffect(() => { + if (attachmentsData.length !== 0) { + const booleanData = Array.from({length: attachmentsData.length}, () => false); + setAccordionStates(booleanData); + } + }, [attachmentsData]); + const handleAccordionChange = (index) => { const newAccordionStates = accordionStates.map((state, i) => i === index ? !state : false); setAccordionStates(newAccordionStates); @@ -69,7 +83,7 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand } else { handleSizeChangeClick('xl'); setHasImageShown(true); - setImageLink(detailsList.data.attachment_files[index]) + setImageLink(attachmentsData[index]) setIsSkeleton(true) } }; @@ -131,7 +145,6 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand requestServer(`${CONFIRM_PASSENGER_BOSS}/${rowId}`, 'post',{ notification: true, data: formData, - notification: true }).then((response) => { setOpenConfirmDialog(false) mutate() @@ -184,8 +197,8 @@ const ConfirmContent = ({rowId, mutate, setOpenConfirmDialog, vehicle_type, hand }; const renderCustomAccordions = () => { - if (detailsList && detailsList.data && detailsList.data.attachment_files) { - return detailsList.data.attachment_files.map((file, index) => ( + if (attachmentsData) { + return attachmentsData.map((file, index) => ( handleAccordionChange(index)} accordionIndex={index} - downloadFile={file.attachment} + downloadFile={file.file} /> )); } return null; }; - return ( <>