From 4b64e7450e89f744c544a174f2286ab666f6638c Mon Sep 17 00:00:00 2001
From: "kartik.sharma" <kartik.sharma@marcoaiot.com>
Date: Tue, 27 May 2025 11:53:56 +0530
Subject: [PATCH] Convert all date to DD-MM-YYYY accross all component.

---
 src/components/Activities/AttendcesLogs.jsx |  4 +--
 src/components/common/DateRangePicker.jsx   |  2 +-
 src/pages/Activities/DailyTask.jsx          | 38 +++++++++++----------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index b57a9c75..feda6c77 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -127,7 +127,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
         id="DataTables_Table_0_length"
       >
         <div className="col-md-3 my-0 ">
-          <DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday} />
+          <DateRangePicker onRangeChange={setDateRange} defaultStartDate={yesterday}  />
         </div>
         <div className="col-md-2 m-0 text-end">
           <i
@@ -171,7 +171,7 @@ const AttendanceLog = ({ handleModalData, projectId, showOnlyCheckout }) => {
                   acc.push(
                     <tr key={`header-${currentDate}`} className="table-row-header">
                       <td colSpan={6} className="text-start">
-                        <strong>{moment(currentDate).format("YYYY-MM-DD")}</strong>
+                        <strong>{moment(currentDate).format("DD-MM-YYYY")}</strong>
                       </td>
                     </tr>
                   );
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index 07c36e11..c56e742e 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -12,7 +12,7 @@ const DateRangePicker = ({ onRangeChange, DateDifference = 7, defaultStartDate =
 
     const fp = flatpickr(inputRef.current, {
       mode: "range",
-      dateFormat: "Y-m-d",
+      dateFormat: "d-m-Y",
       defaultDate: [fifteenDaysAgo, today],
       static: true,
       clickOpens: true,
diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx
index 5b69c596..58e7d57e 100644
--- a/src/pages/Activities/DailyTask.jsx
+++ b/src/pages/Activities/DailyTask.jsx
@@ -6,7 +6,7 @@ import { useTaskList } from "../../hooks/useTasks";
 import { useProjects } from "../../hooks/useProjects";
 import { setProjectId } from "../../slices/localVariablesSlice";
 import { useProfile } from "../../hooks/useProfile";
-import { formatDate } from "../../utils/dateUtils";
+// import { formatDate } from "../../utils/dateUtils"; // Removed this import
 import GlobalModel from "../../components/common/GlobalModel";
 import AssignRoleModel from "../../components/Project/AssignRole";
 import { ReportTask } from "../../components/Activities/ReportTask";
@@ -14,6 +14,7 @@ import ReportTaskComments from "../../components/Activities/ReportTaskComments";
 import DateRangePicker from "../../components/common/DateRangePicker";
 import DatePicker from "../../components/common/DatePicker";
 import { useSearchParams } from "react-router-dom";
+import moment from "moment";
 
 const DailyTask = () => {
   const [searchParams] = useSearchParams();
@@ -141,6 +142,7 @@ const DailyTask = () => {
                 <DateRangePicker
                   onRangeChange={setDateRange}
                   DateDifference="6"
+                  dateFormat="DD-MM-YYYY"
                 />
               </div>
               <div className="col-sm-3 col-6 text-end mb-1">
@@ -188,7 +190,7 @@ const DailyTask = () => {
                     </tr>
                   )}
                   {!task_loading && TaskList.length === 0 && (
-                     <tr>
+                    <tr>
                       <td colSpan={7} className="text-center">
                         <p>No Reports Found</p>
                       </td>
@@ -199,7 +201,7 @@ const DailyTask = () => {
                       <React.Fragment key={i}>
                         <tr className="table-row-header">
                           <td colSpan={7} className="text-start">
-                            <strong>{date}</strong>
+                            <strong>{moment(date).format("DD-MM-YYYY")}</strong>
                           </td>
                         </tr>
                         {TaskLists.filter((task) =>
@@ -246,7 +248,7 @@ const DailyTask = () => {
                                     task.workItem.completedWork}
                                 </td>
                                 <td>{task.completedTask}</td>
-                                <td>{formatDate(task.assignmentDate)}</td>
+                                <td>{moment(task.assignmentDate).format("DD-MM-YYYY")}</td>
                                 <td className="text-center">
                                   <div
                                     key={refIndex}
@@ -264,23 +266,23 @@ const DailyTask = () => {
                                         ${task.teamMembers
                                           .map(
                                             (member) => `
-                                            <div class="d-flex align-items-center gap-2 mb-2">
-                                              <div class="avatar avatar-xs">
-                                                <span class="avatar-initial rounded-circle bg-label-primary">
-                                                  ${
-                                                    member?.firstName?.charAt(
-                                                      0
-                                                    ) || ""
-                                                  }${
+                                              <div class="d-flex align-items-center gap-2 mb-2">
+                                                <div class="avatar avatar-xs">
+                                                  <span class="avatar-initial rounded-circle bg-label-primary">
+                                                    ${
+                                                      member?.firstName?.charAt(
+                                                        0
+                                                      ) || ""
+                                                    }${
                                               member?.lastName?.charAt(0) || ""
                                             }
-                                                </span>
-                                              </div>
-                                              <span>${member.firstName} ${
+                                                  </span>
+                                                </div>
+                                                <span>${member.firstName} ${
                                               member.lastName
                                             }</span>
-                                            </div>
-                                          `
+                                              </div>
+                                            `
                                           )
                                           .join("")}
                                       </div>
@@ -362,4 +364,4 @@ const DailyTask = () => {
     </>
   );
 };
-export default DailyTask;
+export default DailyTask;
\ No newline at end of file