From 9c977086ca1fe774c3fcda767abb5f1825e68acb Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sat, 19 Apr 2025 01:43:11 +0530 Subject: [PATCH 1/3] added activity url with perticular project --- src/components/Project/ProjectCard.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Project/ProjectCard.jsx b/src/components/Project/ProjectCard.jsx index c02bb6f8..bd0a0fca 100644 --- a/src/components/Project/ProjectCard.jsx +++ b/src/components/Project/ProjectCard.jsx @@ -181,10 +181,10 @@ const ProjectCard = ({ projectData }) => { Modify -
  • +
  • navigate(`/activities/records?project=${projectInfo.id}`)}> - Activities + Activities
  • -- 2.43.0 From c412bf6e98165cc61096580bf16e9311def45340 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Sat, 19 Apr 2025 01:46:55 +0530 Subject: [PATCH 2/3] this component read projectId from the URL using useSearchParams. --- src/pages/Activities/DailyTask.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/Activities/DailyTask.jsx b/src/pages/Activities/DailyTask.jsx index 00a55439..44ed2480 100644 --- a/src/pages/Activities/DailyTask.jsx +++ b/src/pages/Activities/DailyTask.jsx @@ -13,9 +13,12 @@ import { ReportTask } from "../../components/Activities/ReportTask"; import ReportTaskComments from "../../components/Activities/ReportTaskComments"; import DateRangePicker from "../../components/common/DateRangePicker"; import DatePicker from "../../components/common/DatePicker"; +import { useSearchParams } from "react-router-dom"; const DailyTask = () => { const { profile: LoggedUser } = useProfile(); + const [searchParams] = useSearchParams(); + const projectId = searchParams.get("project"); const { projects, @@ -56,7 +59,10 @@ const DailyTask = () => { selectTask(task); openModal(); }; - + + useEffect(() => { + if (projectId) dispatch(setProjectId(projectId)); + }, [projectId]); return ( <>
    { {formatDate(task.assignmentDate)}
    - {task.teamMembers.slice(0, 3).map((member) => ( + {task.teamMembers.slice(0, 3).map((member) => (
    Date: Sat, 19 Apr 2025 01:49:45 +0530 Subject: [PATCH 3/3] implement url and add route at /activities/records and enpty --- src/router/AppRoutes.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx index 7e20bef4..456be8ad 100644 --- a/src/router/AppRoutes.jsx +++ b/src/router/AppRoutes.jsx @@ -65,7 +65,7 @@ const router = createBrowserRouter( { path: "/employee/manage/:employeeId", element: }, { path: "/inventory", element: }, { path: "/activities/attendance", element: }, - { path: "/activities/records", element: }, + { path: "/activities/records/:projectId?", element: }, { path: "/activities/task", element: }, { path: "/activities/reports", element: }, { path: "/activities/gallary", element: }, -- 2.43.0