From 68b23c8d5e7a159ef06ea693eed8cc170f1be498 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Sat, 19 Apr 2025 16:36:21 +0530
Subject: [PATCH] Fixed the bug of mismatch dates where dates showing one day
 earlier than expected

---
 src/components/Activities/AttendcesLogs.jsx     | 5 +++--
 src/components/Activities/CheckCheckOutForm.jsx | 5 ++---
 src/components/Dashboard/Dashboard.jsx          | 3 ++-
 src/components/Project/ManageProjectInfo.jsx    | 6 ++++--
 src/components/common/DateRangePicker.jsx       | 8 +++++---
 src/utils/dateUtils.jsx                         | 3 ++-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index 65a85be9..626c3c05 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -12,8 +12,9 @@ const AttendanceLog = ({ attendance, handleModalData, projectId }) => {
   const { data, loading, error } = useSelector((store) => store.attendanceLogs);
 
   // Set the default selected date to the current date
-  const currentDate = new Date().toISOString().split("T")[0]; // "YYYY-MM-DD"
-
+  
+  // const currentDate = new Date().toISOString().split("T")[0]; // "YYYY-MM-DD"
+  const currentDate = new Date().toLocaleDateString('en-CA');
   const handleDateChange = (e) => {
     const date = e.target.value;
     setSelectedDate(date);
diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index 93b8069c..c4012e81 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -35,7 +35,6 @@ const CheckCheckOutmodel = ({modeldata,closeModal,handleSubmitForm,}) => {
 
   const onSubmit = ( data ) =>
   {
-    console.log(data)
     let record = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude,employeeId:modeldata.employeeId,action:modeldata.action,id:modeldata?.id || null}
    if(modeldata.forWhichTab === 1){
     handleSubmitForm(record)
@@ -134,7 +133,8 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
 
   const getCurrentDate = () => {
     const today = new Date();
-    return today.toISOString().split("T")[0]; 
+    // return today.toISOString().split("T")[0]; 
+    return today.toLocaleDateString('en-CA');
   };
 
   
@@ -143,7 +143,6 @@ export const Regularization = ({modeldata,closeModal,handleSubmitForm})=>{
 
     let record = {...data, date: new Date().toLocaleDateString(),latitude:coords.latitude,longitude:coords.longitude, }
 
-    console.log(record)
     handleSubmitForm(record)
     closeModal()
   };
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index fd970c1a..f4eb0ba3 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -37,7 +37,8 @@ const Dashboard = () => {
 
   const days = getDaysFromRange(range);
   const today = new Date();
-  const FromDate = today.toISOString().split("T")[0]; // Always today
+  // const FromDate = today.toISOString().split("T")[0];
+  const FromDate = today.toLocaleDateString('en-CA'); // Always today
 
   const { projectsCardData } = useDashboardProjectsCardData();
   const { teamsCardData } = useDashboardTeamsCardData();
diff --git a/src/components/Project/ManageProjectInfo.jsx b/src/components/Project/ManageProjectInfo.jsx
index 5173e5aa..45f04b7c 100644
--- a/src/components/Project/ManageProjectInfo.jsx
+++ b/src/components/Project/ManageProjectInfo.jsx
@@ -3,7 +3,8 @@ import { useForm, Controller } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 
-const currentDate = new Date().toISOString().split("T")[0];
+// const currentDate = new Date().toISOString().split("T")[0];
+const currentDate = new Date().toLocaleDateString('en-CA');
 const formatDate = (date) => {
   if (!date) {
     return currentDate;
@@ -12,7 +13,8 @@ const formatDate = (date) => {
   if (isNaN(d.getTime())) {
     return currentDate;
   }
-  return d.toISOString().split("T")[0];
+  // return d.toISOString().split("T")[0];
+  return d.toLocaleDateString('en-CA');
 };
 const ManageProjectInfo = ({ project, handleSubmitForm, onClose }) => {
   const [CurrentProject, setCurrentProject] = useState();
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index 9c5bc2a4..438069cc 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -20,10 +20,12 @@ const DateRangePicker = ({ onRangeChange }) => {
         onRangeChange?.({ startDate, endDate });
       },
     });
-
+    
     onRangeChange?.({
-      startDate: fifteenDaysAgo.toISOString().split("T")[0],
-      endDate: today.toISOString().split("T")[0],
+      // startDate: fifteenDaysAgo.toISOString().split("T")[0],
+      // endDate: today.toISOString().split("T")[0],
+      startDate: fifteenDaysAgo.toLocaleDateString('en-CA'),
+      endDate: today.toLocaleDateString('en-CA'),
     });
 
     return () => {
diff --git a/src/utils/dateUtils.jsx b/src/utils/dateUtils.jsx
index 7f4a222a..f18efd0f 100644
--- a/src/utils/dateUtils.jsx
+++ b/src/utils/dateUtils.jsx
@@ -23,7 +23,8 @@ export const getDateDifferenceInDays = (startDate, endDate) => {
 export const formatDate = (date) => {
   if (!date) return ""; // Return an empty string if no date
   const dateObj = new Date(date);
-  return dateObj.toISOString().split("T")[0]; // Get the date in YYYY-MM-DD format
+  // return dateObj.toISOString().split("T")[0];
+  return dateObj.toLocaleDateString('en-CA'); // Get the date in YYYY-MM-DD format
 };
 
 export const convertShortTime = (dateString) => {
-- 
2.43.0