From 0735b3d59a07872ce01d3631ff863f5ac8c639cc Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Mon, 25 Dec 2023 11:55:34 +0330 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 3db1ee674ef1b08e617683776a7737389f612e53 Mon Sep 17 00:00:00 2001 From: Mohammad Jalali Date: Wed, 27 Dec 2023 11:48:39 +0330 Subject: [PATCH 4/4] 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 && ( + + ) )}