From 541b77630e82b58835b5d9a759515f3da10e69ad Mon Sep 17 00:00:00 2001 From: YasamanKahdooei Date: Tue, 11 Jun 2024 12:23:38 +0330 Subject: [PATCH] Complate RequestProcess Componnent --- assets/images/icons8-document-50.png | Bin 0 -> 1269 bytes assets/images/icons8-image-50.png | Bin 0 -> 1755 bytes assets/images/icons8-video-camera-50.png | Bin 0 -> 2139 bytes assets/images/icons8-voice-id-50.png | Bin 0 -> 1463 bytes components/Requests/RequestCard.tsx | 5 +- components/Requests/RequestComments.tsx | 4 +- components/Requests/RequestProcess.tsx | 128 ++++++++++++++++++---- components/Requests/RequestViolations.tsx | 6 +- 8 files changed, 114 insertions(+), 29 deletions(-) create mode 100644 assets/images/icons8-document-50.png create mode 100644 assets/images/icons8-image-50.png create mode 100644 assets/images/icons8-video-camera-50.png create mode 100644 assets/images/icons8-voice-id-50.png diff --git a/assets/images/icons8-document-50.png b/assets/images/icons8-document-50.png new file mode 100644 index 0000000000000000000000000000000000000000..c3283ee90e68cb72276ced868b4e9bd4c8b356eb GIT binary patch literal 1269 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 literal 0 HcmV?d00001 diff --git a/assets/images/icons8-video-camera-50.png b/assets/images/icons8-video-camera-50.png new file mode 100644 index 0000000000000000000000000000000000000000..cbaf7aea8ecf0906200fb572c85b45be20227a00 GIT binary patch literal 2139 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 R6psJ^002ovPDHLkV1lzmz108! literal 0 HcmV?d00001 diff --git a/components/Requests/RequestCard.tsx b/components/Requests/RequestCard.tsx index f17ce69..365562d 100644 --- a/components/Requests/RequestCard.tsx +++ b/components/Requests/RequestCard.tsx @@ -72,8 +72,7 @@ const RequestCard: React.FC = ({ item, isSelfRequest }) => { }; return ( - //
- <> + <>
= ({ item, isSelfRequest }) => { = ({ return ( <> - + e.stopPropagation()}> - + e.stopPropagation()}> {isLoading && (
diff --git a/components/Requests/RequestProcess.tsx b/components/Requests/RequestProcess.tsx index 9046537..c6a1ff9 100644 --- a/components/Requests/RequestProcess.tsx +++ b/components/Requests/RequestProcess.tsx @@ -17,6 +17,12 @@ import { useQuery } from "@tanstack/react-query"; import { getReportHistory } from "@/utils/CitizenReport"; import { convertDate, convertFullTime, convertTime } from "@/lib/utils"; import { log } from "console"; +import Image from "next/image"; +import imgdocument from "@/assets/images/icons8-document-50.png"; +import imgimage from "@/assets/images/icons8-image-50.png"; +import imgvideo from "@/assets/images/icons8-video-camera-50.png"; +import imgvoice from "@/assets/images/icons8-voice-id-50.png"; +import axios from "axios"; // Define types for props interface RequestProcessProps { @@ -24,7 +30,9 @@ interface RequestProcessProps { } interface Media { + url: string; url3: string; + mediaType: number; } interface Reason { @@ -49,7 +57,6 @@ const RequestProcess: React.FC = ({ reportId }) => { // Component state const [history, setHistory] = useState([]); const [step, setStep] = useState(); - // const [step, setStep] = useState(); const { data, isLoading, isError, isSuccess, refetch } = useQuery({ queryKey: ["History", reportId], @@ -63,18 +70,33 @@ const RequestProcess: React.FC = ({ reportId }) => { if (data) { setHistory(data?.data); setStep(data?.data?.length); - - // for (let i = 1; i <= data.data.length; i++) { - // // setStep.push(i); - // newArr.push(i); - // } - console.log("History state updated:", data); - console.log("🚀 ~ useEffect ~ data?.data?.length:", data?.data?.length); } - - console.log("🚀 ~ useEffect ~ setStep:", step); }, [data]); + const handleDownload = async (url: string) => { + try { + const response = await axios.get(url, { + responseType: "blob", // دریافت فایل به صورت blob + }); + + const filename = getFilenameFromUrl(url); + const blob = new Blob([response.data], { type: response.data.type }); + const link = document.createElement("a"); + link.href = URL.createObjectURL(blob); + link.download = filename; + document.body.appendChild(link); + link.click(); + document.body.removeChild(link); + URL.revokeObjectURL(link.href); + } catch (error) { + console.error("Download failed:", error); + } + }; + + const getFilenameFromUrl = (url: string) => { + return url.split("/").pop() || "downloaded-file"; + }; + return (
@@ -84,17 +106,17 @@ const RequestProcess: React.FC = ({ reportId }) => { مشاهده روند بررسی
- + {history.map((history, index, array) => ( <>
    -
  1. - +
  2. + {array.length - index}
    @@ -109,17 +131,77 @@ const RequestProcess: React.FC = ({ reportId }) => { > {history?.reason?.title}
    -
    - -
    + {history?.attachments?.length > 0 && ( +
    +
    + پیوست ها +
    +
    + {history?.attachments?.map((attachment, index) => ( +
    handleDownload(attachment.url)} + key={index} + > + {attachment.mediaType == 0 && ( + picture + )} + + {attachment.mediaType == 1 && ( + picture + )} + + {attachment.mediaType == 2 && ( + picture + )} + + {attachment.mediaType == 3 && ( + picture + )} +
    + ))} +
    +
    + )}
- - {convertTime(history.dateTime)} - - - {convertDate(history.dateTime)} - +
+ + {convertTime(history.dateTime)} + + + {convertDate(history.dateTime)} + +
))} diff --git a/components/Requests/RequestViolations.tsx b/components/Requests/RequestViolations.tsx index 9fe31d2..02618a1 100644 --- a/components/Requests/RequestViolations.tsx +++ b/components/Requests/RequestViolations.tsx @@ -148,6 +148,7 @@ const RequestViolations: React.FC = ({ // 2. Define a submit handler. function onSubmit(values: z.infer) { + // e.stopPropagation(); console.log(values); setViolationType(values.violationTypeId); setViolationDescription(values.description); @@ -163,13 +164,16 @@ const RequestViolations: React.FC = ({ }, }); } + return ( <> {/* */} - + e.stopPropagation()} + />