From fa3ff291c8a6d26ff204d4cc26ad19ed45432ad1 Mon Sep 17 00:00:00 2001
From: pramod mahajan <pramod.mahajan@marcoaiot.com>
Date: Thu, 7 Aug 2025 12:57:22 +0530
Subject: [PATCH] display employee tasks in emp profile

---
 package-lock.json                         |  1 +
 src/components/Employee/EmpActivities.jsx | 34 +++++++++++++----------
 src/hooks/useProjects.js                  | 11 ++------
 src/repositories/ProjectRepository.jsx    |  2 +-
 4 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3baaf7c9..75c151b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2460,6 +2460,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
       "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/kossnocorp"
diff --git a/src/components/Employee/EmpActivities.jsx b/src/components/Employee/EmpActivities.jsx
index 53b568ec..5af0a162 100644
--- a/src/components/Employee/EmpActivities.jsx
+++ b/src/components/Employee/EmpActivities.jsx
@@ -8,15 +8,17 @@ const EmpActivities = ({ employee }) => {
   const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
   const myDate = new Date("2025-08-06T10:30:00Z");
   const formattedToday = useFormattedDate(myDate, "dd-MMM-yyyy");
-  console.log(employee);
+
 
   const {
-    ProjectTaskList,
-    loading: selectedProjectLoding,
+    data,
+isError,
+isLoading,
+error,
     refetch,
-  } = useProjectTasksByEmployee(employee?.id);
+  } = useProjectTasksByEmployee(employee?.id,dateRange.startDate,dateRange.endDate);
 
-  console.log(ProjectTaskList);
+ 
   return (
     <>
       <div className="card h-100 mt-4">
@@ -29,26 +31,30 @@ const EmpActivities = ({ employee }) => {
             />
           </div>
           <ul className="timeline mb-0 mt-5 text-start">
-            <li className="timeline-item timeline-item-transparent">
+            {data.map((activity)=>(
+               <li className="timeline-item timeline-item-transparent">
               <span className="timeline-point timeline-point-primary"></span>
               <div className="timeline-event">
                 <div className="timeline-header mb-3">
-                  <h6 className="mb-0">Matrix Properties</h6>
+                  <h6 className="mb-0">{activity.projectName}</h6>
                   <small className="text-body-secondary">
-                    {formattedToday}
+                  {useFormattedDate(activity.assignmentDate, "dd-MMM-yyyy")}
                   </small>
                 </div>
-                <p className="mb-2">Branch Fitting</p>
+                <p className="mb-2"><span className="fw-semibold">Activity:</span>{activity.activityName}</p>
                 <p className="mb-2">
-                  Building 1 &gt; First Floor &gt; Zone One
+                <span className="fw-semibold">Location:</span>  {activity.location}
                 </p>
                 <p className="mb-2">
-                  <span>Planned: 22 Meter</span>
-                  <span className="ms-2">Completed: 22 Meter</span>
+                  <span className="fw-semibold">Planned: {activity.plannedTask}</span>
+                  <span className="ms-2">Completed : {activity.completedTask}</span>
                 </p>
               </div>
             </li>
-            <li className="timeline-item timeline-item-transparent">
+            ))}
+           
+
+            {/* <li className="timeline-item timeline-item-transparent">
               <span className="timeline-point timeline-point-success"></span>
               <div className="timeline-event">
                 <div className="timeline-header mb-3">
@@ -144,7 +150,7 @@ const EmpActivities = ({ employee }) => {
                   </li>
                 </ul>
               </div>
-            </li>
+            </li> */}
           </ul>
         </div>
       </div>
diff --git a/src/hooks/useProjects.js b/src/hooks/useProjects.js
index 2be75a17..554af77e 100644
--- a/src/hooks/useProjects.js
+++ b/src/hooks/useProjects.js
@@ -210,13 +210,9 @@ export const useProjectTasksByEmployee = (
   employeeId,
   fromDate,
   toDate,
-  IsExpandedArea = false
 ) => {
-  const {
-    data: ProjectTaskList,
-    isLoading,
-    error,
-  } = useQuery({
+
+  return useQuery({
     queryKey: ["TasksByEmployee", employeeId],
     queryFn: async () => {
       const res = await ProjectRepository.getProjectTasksByEmployee(
@@ -226,12 +222,11 @@ export const useProjectTasksByEmployee = (
       );
       return res.data;
     },
-    enabled: !!employeeId && !!IsExpandedArea,
+    enabled: !!employeeId && !!fromDate && !!toDate,
     onError: (error) => {
       showToast(error.message || "Error while Fetching project Tasks", "error");
     },
   });
-  return { ProjectTaskList, isLoading, error };
 };
 
 // -- -------------Mutation-------------------------------
diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx
index c930948d..b2f0f7ff 100644
--- a/src/repositories/ProjectRepository.jsx
+++ b/src/repositories/ProjectRepository.jsx
@@ -35,7 +35,7 @@ const ProjectRepository = {
   getProjectTasksByWorkArea: (id) => api.get(`/api/project/tasks/${id}`),
   getProjectTasksByEmployee: (id, fromDate, toDate) =>
     api.get(
-      `/api/project/tasks-employee/${id}?fromDate=${fromDate}&toDate:${toDate}`
+      `/api/project/tasks-employee/${id}?fromDate=${fromDate}&toDate=${toDate}`
     ),
 };