From 6655175c0d3b6981aa186a16ec79f16446d4d6f1 Mon Sep 17 00:00:00 2001 From: yasaman Date: Sat, 3 Feb 2024 15:00:35 +0330 Subject: [PATCH] PrintPage Modified --- components/Footer.tsx | 2 +- components/Navbar.tsx | 2 +- components/RequestResult.tsx | 3 +-- components/RequestStep2.tsx | 6 +++++- components/printPage.tsx | 31 +++++++++++++++++++++++++++---- 5 files changed, 35 insertions(+), 9 deletions(-) diff --git a/components/Footer.tsx b/components/Footer.tsx index 3164921..92acedf 100644 --- a/components/Footer.tsx +++ b/components/Footer.tsx @@ -29,7 +29,7 @@ export default function Footer() {
-

+

{/* */} diff --git a/components/RequestResult.tsx b/components/RequestResult.tsx index adcd52e..337323c 100644 --- a/components/RequestResult.tsx +++ b/components/RequestResult.tsx @@ -33,8 +33,7 @@ export default function Result() { const contentRef = useRef(); const handlePrint = useReactToPrint({ // content: () => contentRef.current, - content: () => { - console.log(contentRef.current); // Log the content to the console + content: () => { return contentRef.current; }, }); diff --git a/components/RequestStep2.tsx b/components/RequestStep2.tsx index 99db394..e09174c 100644 --- a/components/RequestStep2.tsx +++ b/components/RequestStep2.tsx @@ -130,9 +130,13 @@ export default function RequestStep2() { mutationKey: ["authorizedComplaintSubmit"], mutationFn: postAuthorizedComplaintSubmit, onSuccess: (res) => { + const currentDate = new Date(); + const formattedDate = currentDate.toISOString() + localStorage.setItem("trackingNumber", res.trackingNumber); localStorage.setItem("password", res.password); - localStorage.setItem("registeredAt", res.registeredAt); + // localStorage.setItem("registeredAt", res.registeredAt); + localStorage.setItem("registeredAt", formattedDate); localStorage.removeItem("authorized"); localStorage.removeItem("unknown"); router.push("/RequestResult"); diff --git a/components/printPage.tsx b/components/printPage.tsx index 891ffc2..ca59d1a 100644 --- a/components/printPage.tsx +++ b/components/printPage.tsx @@ -1,5 +1,7 @@ -// components/PrintPage.tsx -import React from "react"; +"use client"; +import React, { useEffect } from "react"; +// import { convertDate } from "@/lib/utils"; +import dayjs from "dayjs"; interface PrintPageProps { contentRef: React.RefObject; @@ -8,6 +10,17 @@ interface PrintPageProps { password: string; } +// Convert Date +function convertDate(date: string) { + const convertedDate = dayjs(date) + .calendar("jalali") + .locale("fa") + .format("YYYY/M/DD"); + return convertedDate; +} +const registeredAt = localStorage.getItem("registeredAt"); +const convertedDate = registeredAt ? convertDate(registeredAt) : "Invalid Date"; + const PrintPage: React.FC = ({ contentRef, fetchedContent, @@ -20,9 +33,19 @@ const PrintPage: React.FC = ({ className="w-screen h-screen border-2 border-spacing-6 p-36 bg-slate-200 bg-[url('/img/bg-print.jpg')] bg-no-repeat bg-bottom bg-cover font-[yekan]" dir="rtl" > -
+
+

سامانه نظارت شهرداری یزد

+

+ تاریخ: {convertedDate} +

+
-

+

+ +

کد پیگیری : {trackingNumber}