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 (
<>
@@ -29,26 +31,30 @@ const EmpActivities = ({ employee }) => {
/>
- -
+ {data.map((activity)=>(
+
-
-
Matrix Properties
+ {activity.projectName}
- {formattedToday}
+ {useFormattedDate(activity.assignmentDate, "dd-MMM-yyyy")}
-
Branch Fitting
+
Activity:{activity.activityName}
- Building 1 > First Floor > Zone One
+ Location: {activity.location}
- Planned: 22 Meter
- Completed: 22 Meter
+ Planned: {activity.plannedTask}
+ Completed : {activity.completedTask}
- -
+ ))}
+
+
+ {/*
-
@@ -144,7 +150,7 @@ const EmpActivities = ({ employee }) => {
-
+ */}
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}`
),
};