admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

display employee tasks in emp profile

Browse Source
This commit is contained in:
pramod mahajan 2025-08-07 12:57:22 +05:30
parent beefe6396c
commit fa3ff291c8
4 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package-lock.json generated
View File

@ -2460,6 +2460,7 @@
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
"integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
"license": "MIT",
"funding": { "funding": {
"type": "github", "type": "github",
"url": "https://github.com/sponsors/kossnocorp" "url": "https://github.com/sponsors/kossnocorp"

34
src/components/Employee/EmpActivities.jsx
View File

@ -8,15 +8,17 @@ const EmpActivities = ({ employee }) => {
const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" }); const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
const myDate = new Date("2025-08-06T10:30:00Z"); const myDate = new Date("2025-08-06T10:30:00Z");
const formattedToday = useFormattedDate(myDate, "dd-MMM-yyyy"); const formattedToday = useFormattedDate(myDate, "dd-MMM-yyyy");
console.log(employee);
const { const {
ProjectTaskList, data,
loading: selectedProjectLoding, isError,
isLoading,
error,
refetch, refetch,
} = useProjectTasksByEmployee(employee?.id); } = useProjectTasksByEmployee(employee?.id,dateRange.startDate,dateRange.endDate);
console.log(ProjectTaskList);
return ( return (
<> <>
<div className="card h-100 mt-4"> <div className="card h-100 mt-4">
@ -29,26 +31,30 @@ const EmpActivities = ({ employee }) => {
/> />
</div> </div>
<ul className="timeline mb-0 mt-5 text-start"> <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> <span className="timeline-point timeline-point-primary"></span>
<div className="timeline-event"> <div className="timeline-event">
<div className="timeline-header mb-3"> <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"> <small className="text-body-secondary">
{formattedToday} {useFormattedDate(activity.assignmentDate, "dd-MMM-yyyy")}
</small> </small>
</div> </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"> <p className="mb-2">
Building 1 &gt; First Floor &gt; Zone One <span className="fw-semibold">Location:</span> {activity.location}
</p> </p>
<p className="mb-2"> <p className="mb-2">
<span>Planned: 22 Meter</span> <span className="fw-semibold">Planned: {activity.plannedTask}</span>
<span className="ms-2">Completed: 22 Meter</span> <span className="ms-2">Completed : {activity.completedTask}</span>
</p> </p>
</div> </div>
</li> </li>
<li className="timeline-item timeline-item-transparent"> ))}
{/* <li className="timeline-item timeline-item-transparent">
<span className="timeline-point timeline-point-success"></span> <span className="timeline-point timeline-point-success"></span>
<div className="timeline-event"> <div className="timeline-event">
<div className="timeline-header mb-3"> <div className="timeline-header mb-3">
@ -144,7 +150,7 @@ const EmpActivities = ({ employee }) => {
</li> </li>
</ul> </ul>
</div> </div>
</li> </li> */}
</ul> </ul>
</div> </div>
</div> </div>

11
src/hooks/useProjects.js
View File

@ -210,13 +210,9 @@ export const useProjectTasksByEmployee = (
employeeId, employeeId,
fromDate, fromDate,
toDate, toDate,
IsExpandedArea = false
) => { ) => {
const {
data: ProjectTaskList, return useQuery({
isLoading,
error,
} = useQuery({
queryKey: ["TasksByEmployee", employeeId], queryKey: ["TasksByEmployee", employeeId],
queryFn: async () => { queryFn: async () => {
const res = await ProjectRepository.getProjectTasksByEmployee( const res = await ProjectRepository.getProjectTasksByEmployee(
@ -226,12 +222,11 @@ export const useProjectTasksByEmployee = (
); );
return res.data; return res.data;
}, },
enabled: !!employeeId && !!IsExpandedArea, enabled: !!employeeId && !!fromDate && !!toDate,
onError: (error) => { onError: (error) => {
showToast(error.message || "Error while Fetching project Tasks", "error"); showToast(error.message || "Error while Fetching project Tasks", "error");
}, },
}); });
return { ProjectTaskList, isLoading, error };
}; };
// -- -------------Mutation------------------------------- // -- -------------Mutation-------------------------------

2
src/repositories/ProjectRepository.jsx
View File

@ -35,7 +35,7 @@ const ProjectRepository = {
getProjectTasksByWorkArea: (id) => api.get(`/api/project/tasks/${id}`), getProjectTasksByWorkArea: (id) => api.get(`/api/project/tasks/${id}`),
getProjectTasksByEmployee: (id, fromDate, toDate) => getProjectTasksByEmployee: (id, fromDate, toDate) =>
api.get( api.get(
`/api/project/tasks-employee/${id}?fromDate=${fromDate}&toDate:${toDate}` `/api/project/tasks-employee/${id}?fromDate=${fromDate}&toDate=${toDate}`
), ),
}; };