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
  • 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) => (
    }, { 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: },