From b8cab40e70860abbc7d0b26de36cfa182c7cf199 Mon Sep 17 00:00:00 2001 From: Hossein Rahmani Date: Mon, 8 Jan 2024 22:44:09 +0330 Subject: [PATCH] Bugs fixed + complaint ui changed --- components/ComplainsDetails.tsx | 417 +++++++++++++++++++++-------- components/InspectorOperations.tsx | 2 +- lib/utils.ts | 8 + package-lock.json | 4 +- package.json | 2 +- 5 files changed, 323 insertions(+), 110 deletions(-) diff --git a/components/ComplainsDetails.tsx b/components/ComplainsDetails.tsx index 8593878..8ac58d0 100644 --- a/components/ComplainsDetails.tsx +++ b/components/ComplainsDetails.tsx @@ -7,7 +7,7 @@ import { ComplainDetailsItems } from "@/constants"; import { useMutation } from "@tanstack/react-query"; import { OperateByInspector, getComplaint } from "@/utils/inspectorApi"; import useData from "@/store/useData"; -import { Decrypt, convertDate } from "@/lib/utils"; +import { Decrypt, convertDate, convertFullTime } from "@/lib/utils"; import { Badge } from "./ui/badge"; import InspectorOperations from "./InspectorOperations"; import { ArrowDownToLine, ArrowRight, File } from "lucide-react"; @@ -51,17 +51,20 @@ export default function ComplainsDetails({ const getComplaintMutation = useMutation({ mutationKey: ["Complaint", id], mutationFn: getComplaint, - onSuccess: (res) => {}, + onSuccess: (res) => { + localStorage.setItem("trackingNumber", res.trackingNumber); + }, onError: (err) => {}, }); useEffect(() => { - const tn = localStorage.getItem("trackingNumber") as string; + const storedData = localStorage.getItem("CompliantData"); + const data = JSON.parse(storedData as string); const pw = localStorage.getItem("privateKey") as string; - console.log(tn, pw); - if (tn != null && pw != null) { + localStorage.setItem("trackingNumber", data.trackingNumber); + if (pw != null) { getComplaintMutation.mutate({ - trackingNumber: tn as string, + trackingNumber: data.trackingNumber, password: pw, }); setOpen(false); @@ -157,9 +160,9 @@ export default function ComplainsDetails({ console.log(dcKey); if (dcKey != false && dcKey != null) { if (check) { - localStorage.setItem("trackingNumber", item.trackingNumber); localStorage.setItem("privateKey", dcKey); } + localStorage.setItem("trackingNumber", item.trackingNumber); setKey(dcKey); getComplaintMutation.mutate({ trackingNumber: item.trackingNumber, @@ -205,7 +208,7 @@ export default function ComplainsDetails({ htmlFor="terms" className="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70" > - ذخیره کلید برای دفعات بعد + ذخیره کلید برای استفاده در زمان های بعدی @@ -245,42 +248,10 @@ export default function ComplainsDetails({

بازگشت

-
-
-
-

- گزارش شکایت -

-
-

- موضوع شکایت:{" "} - - {data?.title} - -

-

- دستگاه مربوطه:{" "} - - {data?.complaintOrganization - ? data?.complaintOrganization.title - : "-"} - -

-

- پرسنل مربوطه:{" "} - - {data.complaining ? data.complaining : "-"} - -

-

- زمان ثبت:{" "} - - {convertDate(data.registeredAt)} - -

-
-
-
+ +
+
+

انجام عملیات

@@ -293,74 +264,308 @@ export default function ComplainsDetails({ />
-
-

روند شکایت

-
- {data.contents?.map((item: any) => { - return ( -
-
-

- {item.sender == 0 ? "شهروند" : "بازرس"} -

-

- تاریخ : - - {convertDate(item.dateTime)} - -

-
-
- - {item.text ? item.text : "-"} +
+
+ {data.user == null ? ( + <> +
+

+ اطلاعات کلی +

+

+ موضوع شکایت:{" "} + + {data?.title} -

- {item.media.length !== 0 && ( - - )} -
-
- {item?.media.map((item: any, index: number) => { - return ( - + + ) : ( + <> +
+

+ اطلاعات کلی +

+

+ موضوع شکایت:{" "} + + {data?.title} + +

+

+ دستگاه مربوطه:{" "} + + {data?.complaintOrganization + ? data?.complaintOrganization.title + : "-"} + +

+

+ فرد مربوطه:{" "} + + {data.complaining ? data.complaining : "-"} + +

+

+ زمان ثبت:{" "} + + {convertFullTime(data.registeredAt)} + +

+
+
+

+ اطلاعات شاکی +

+

+ نام:{" "} + + {data.user?.firstName ? data.user?.firstName : "-"} + +

+

+ نام خانوادگی:{" "} + + {data.user?.lastName ? data.user?.lastName : "-"} + +

+

+ کدملی:{" "} + + {data.user?.nationalId ? data.user?.nationalId : "-"} + +

+

+ شماره موبایل:{" "} + + {data.user?.phoneNumber + ? data.user?.phoneNumber + : "-"} + +

+
+ + )} +
+ - ); - })} + ); + })} + {data.contents?.map((item: any) => { + return ( +
+
+

+ + {item.sender == 0 ? "شهروند" : "بازرس"} + +

+

+ تاریخ : + + {convertDate(item.dateTime)} + +

+
+
+ + {item.text ? item.text : "-"} + +
+ {item.media.length !== 0 && ( + + )} +
+
+ {item?.media.map((item: any, index: number) => { + return ( + + ); + })} +
+
+
+ ); + })} + {data.contents?.map((item: any) => { + return ( +
+
+

+ + {item.sender == 0 ? "شهروند" : "بازرس"} + +

+

+ تاریخ : + + {convertDate(item.dateTime)} + +

+
+
+ + {item.text ? item.text : "-"} + +
+ {item.media.length !== 0 && ( + + )} +
+
+ {item?.media.map((item: any, index: number) => { + return ( + + ); + })} +
+
+
+ ); + })} +
-
+

انجام عملیات

diff --git a/components/InspectorOperations.tsx b/components/InspectorOperations.tsx index 3db6abe..d4725b6 100644 --- a/components/InspectorOperations.tsx +++ b/components/InspectorOperations.tsx @@ -88,7 +88,7 @@ export default function InspectorOperations({ }); const tk = localStorage.getItem("trackingNumber"); updateData({ - trackingNumber: tk, + trackingNumber: complaintData.trackingNumber, password: key2 ? key2 : (localStorage.getItem("privateKey") as string), }); }, diff --git a/lib/utils.ts b/lib/utils.ts index 9b28f42..00fa253 100644 --- a/lib/utils.ts +++ b/lib/utils.ts @@ -19,6 +19,14 @@ export function convertDate(date: string) { return convertedDate; } +export function convertFullTime(date: string) { + const convertedDate = dayjs(date) + .calendar("jalali") + .locale("fa") + .format(" HH:mm - YYYY/M/DD"); + return convertedDate; +} + export function Decrypt(encryptedData: any, privateKey: any) { const decryptor = new JSEncrypt(); decryptor.setPrivateKey(privateKey); diff --git a/package-lock.json b/package-lock.json index eea12c6..3e65ab8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "sootzani", - "version": "0.2.1", + "version": "0.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "sootzani", - "version": "0.2.1", + "version": "0.2.2", "dependencies": { "@hookform/resolvers": "^3.3.2", "@radix-ui/react-alert-dialog": "^1.0.5", diff --git a/package.json b/package.json index 2b4637a..8c3a2c1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sootzani", - "version": "0.2.1", + "version": "0.2.2", "private": true, "scripts": { "dev": "next dev",