From dae4ec5264244877bcf64a434ffa2f702d546880 Mon Sep 17 00:00:00 2001 From: yasaman Date: Fri, 26 Jan 2024 16:46:50 +0330 Subject: [PATCH] ComplaintDetails Modified + Bugs Fixed --- .../Complaints/[id]/page.tsx | 2 +- components/AdminCategories.tsx | 14 +- components/AdminKeysManagement.tsx | 12 +- components/AdminNews.tsx | 18 ++- components/AdminOrganizations.tsx | 15 +- components/AdminSlider.tsx | 28 +++- components/ComplainsDetails.tsx | 149 +++++++++--------- 7 files changed, 148 insertions(+), 90 deletions(-) diff --git a/app/UserPanel/(Controller)/ControllerDashboard/Complaints/[id]/page.tsx b/app/UserPanel/(Controller)/ControllerDashboard/Complaints/[id]/page.tsx index 249ead3..64b6319 100644 --- a/app/UserPanel/(Controller)/ControllerDashboard/Complaints/[id]/page.tsx +++ b/app/UserPanel/(Controller)/ControllerDashboard/Complaints/[id]/page.tsx @@ -5,7 +5,7 @@ export default function page({ params }: { params: any }) { const id = params.id; return ( -
+
); diff --git a/components/AdminCategories.tsx b/components/AdminCategories.tsx index fabe0de..450e037 100644 --- a/components/AdminCategories.tsx +++ b/components/AdminCategories.tsx @@ -214,10 +214,18 @@ export default function AdminCategories() { description: data.description, }); } + +const resetFormAdd = () => { + formAdd.reset({ + titleCategory: "", + description: "", + }); +}; + return (
-
+
{/* 1 */}
لیست دسته بندی ها @@ -242,7 +250,7 @@ export default function AdminCategories() {

افزودن دسته بندی

- + { resetFormAdd(); }}> @@ -307,7 +315,7 @@ export default function AdminCategories() { > افزودن - + { resetFormAdd(); }}> بستن
diff --git a/components/AdminKeysManagement.tsx b/components/AdminKeysManagement.tsx index 81cbe3c..4e657cc 100644 --- a/components/AdminKeysManagement.tsx +++ b/components/AdminKeysManagement.tsx @@ -71,6 +71,7 @@ const FormSchemaAddKey = z.object({ }), }); + export default function AdminKeysManagement() { const router = useRouter(); const [keyId, setKeyId] = useState(""); @@ -253,6 +254,15 @@ export default function AdminKeysManagement() { saveTextFile(); } }, [AddKeyMutation.isSuccess]); + + + const resetFormAdd = () => { + formAdd.reset({ + title: "", + publicKey: "", + }); + }; + return (
@@ -264,7 +274,7 @@ export default function AdminKeysManagement() {

افزودن کلید جدید

- + { resetFormAdd(); }}> diff --git a/components/AdminNews.tsx b/components/AdminNews.tsx index b642e70..305fb4c 100644 --- a/components/AdminNews.tsx +++ b/components/AdminNews.tsx @@ -324,11 +324,19 @@ export default function AdminNews() { setPage(headersData.CurrentPage); } }, [data1]); - + +const resetFormAdd = () => { + formAdd.reset({ + titleNews: "", + urlNews: "", + content: "", + description: "", + }); +}; return ( -
+
-
+
{/* 1 */}
لیست خبر ها @@ -353,7 +361,7 @@ export default function AdminNews() {

افزودن خبر

- + { resetFormAdd(); }}> @@ -506,7 +514,7 @@ export default function AdminNews() { > افزودن - + { resetFormAdd(); }}> بستن
diff --git a/components/AdminOrganizations.tsx b/components/AdminOrganizations.tsx index ef03559..9bfb10b 100644 --- a/components/AdminOrganizations.tsx +++ b/components/AdminOrganizations.tsx @@ -68,7 +68,7 @@ const AddOrgFormSchema = z.object({ // message: " توضیحات را وارد کنید", // }), description: z.string(), -}); +}); export default function AdminOrganizations() { const router = useRouter(); @@ -217,10 +217,17 @@ export default function AdminOrganizations() { description: data.description, }); } + + const resetFormAdd = () => { + formAdd.reset({ + titleOrg: "", + description: "", + }); + }; return (
-
+
{/* 1 */}
لیست سازمان ها @@ -245,7 +252,7 @@ export default function AdminOrganizations() {

افزودن سازمان

- + { resetFormAdd(); }}> @@ -310,7 +317,7 @@ export default function AdminOrganizations() { > افزودن - + { resetFormAdd(); }}> بستن
diff --git a/components/AdminSlider.tsx b/components/AdminSlider.tsx index 62d751f..1526c16 100644 --- a/components/AdminSlider.tsx +++ b/components/AdminSlider.tsx @@ -250,12 +250,21 @@ const AddSliderMutation = useMutation({ setOpenAdd(false); refetch1(); + resetField("Title"); + resetField("Image"); + resetField("Url"); + resetField("Description"); toast("عملیات شما با موفقیت انجام شد. ", { className: "!bg-green-500 !text-white", }); }, onError: (err: any | string) => { + resetField("Title"); + resetField("Image"); + resetField("Url"); + resetField("Description"); + toast(<>{err.response.data.detail}, { className: "!bg-red-500 !text-white", }); @@ -297,14 +306,25 @@ function onSubmitAdd(data: AddSliderFormValues) { } AddSliderMutation.mutate(formData); - + resetField("Title"); + resetField("Image"); + resetField("Url"); + resetField("Description"); } +const resetFormAdd = () => { + formAdd.reset({ + titleSlider: "", + uploadImg: null, + urlSlider: "", + description: "", + }); +}; return (
-
+
{/* 1 */}
لیست اسلایدرها @@ -329,7 +349,7 @@ function onSubmitAdd(data: AddSliderFormValues) {

افزودن اسلایدر

- + { resetFormAdd(); }}> @@ -465,7 +485,7 @@ function onSubmitAdd(data: AddSliderFormValues) { > افزودن - + { resetFormAdd(); }}> بستن
diff --git a/components/ComplainsDetails.tsx b/components/ComplainsDetails.tsx index 28d7c41..6e82f6f 100644 --- a/components/ComplainsDetails.tsx +++ b/components/ComplainsDetails.tsx @@ -49,8 +49,6 @@ export default function ComplainsDetails({ const router = useRouter(); let data; - - const getComplaintMutation = useMutation({ mutationKey: ["Complaint", id], mutationFn: getComplaint, @@ -63,7 +61,7 @@ export default function ComplainsDetails({ }); }, }); - + useEffect(() => { const storedData = localStorage.getItem("CompliantData"); const data = JSON.parse(storedData as string); @@ -175,7 +173,7 @@ export default function ComplainsDetails({ const checkKey2 = (item: any) => { const dcKey = Decrypt(item.cipherKeyInspector, selectedFile); - + if (dcKey != false && dcKey != null) { if (check) { // localStorage.setItem("privateKey", dcKey); @@ -196,8 +194,8 @@ export default function ComplainsDetails({ } }; - data = getComplaintMutation?.data; - + data = getComplaintMutation?.data; + return ( <> @@ -272,7 +270,7 @@ export default function ComplainsDetails({
{/* 1 */} -
+

انجام عملیات @@ -408,76 +406,83 @@ export default function ComplainsDetails({ )}

-
-

روند شکایت

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

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

-

- تاریخ : +

+
+

+ روند شکایت +

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

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

+

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

+
+
- {convertDate(item.dateTime)} + {item.text ? item.text : "-"} -

-
-
- - {item.text ? item.text : "-"} - -
- {item.media.length !== 0 && ( - - )} - -
- ); - })} + ); + })} +