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

pramod_Task#69NavigateDailyTaskFormProjectCard #33

Merged
vikas.nale merged 3 commits from pramod_Task#69NavigateDailyTaskFormProjectCard into Feature_Task_Management 2025-04-19 05:29:34 +00:00
Conversation 0 Commits 3 Files Changed 3 +11 -5
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Project/ProjectCard.jsx
View File

@ -181,10 +181,10 @@ const ProjectCard = ({ projectData }) => {
<span className="align-left">Modify</span> <span className="align-left">Modify</span>
</a> </a>
</li> </li>
<li> <li onClick={()=>navigate(`/activities/records?project=${projectInfo.id}`)}>
<a className="dropdown-item"> <a className="dropdown-item">
<i className="bx bx-task me-2"></i> <i className="bx bx-task me-2"></i>
<span className="align-left">Activities</span> <span className="align-left" >Activities</span>
</a> </a>
</li> </li>
</ul> </ul>

10
src/pages/Activities/DailyTask.jsx
View File

@ -13,9 +13,12 @@ import { ReportTask } from "../../components/Activities/ReportTask";
import ReportTaskComments from "../../components/Activities/ReportTaskComments"; import ReportTaskComments from "../../components/Activities/ReportTaskComments";
import DateRangePicker from "../../components/common/DateRangePicker"; import DateRangePicker from "../../components/common/DateRangePicker";
import DatePicker from "../../components/common/DatePicker"; import DatePicker from "../../components/common/DatePicker";
import { useSearchParams } from "react-router-dom";
const DailyTask = () => { const DailyTask = () => {
const { profile: LoggedUser } = useProfile(); const { profile: LoggedUser } = useProfile();
const [searchParams] = useSearchParams();
const projectId = searchParams.get("project");
const { const {
projects, projects,
@ -56,7 +59,10 @@ const DailyTask = () => {
selectTask(task); selectTask(task);
openModal(); openModal();
}; };
useEffect(() => {
if (projectId) dispatch(setProjectId(projectId));
}, [projectId]);
return ( return (
<> <>
<div <div
@ -189,7 +195,7 @@ const DailyTask = () => {
<td>{formatDate(task.assignmentDate)}</td> <td>{formatDate(task.assignmentDate)}</td>
<td className="text-center"> <td className="text-center">
<div className="d-flex align-items-center avatar-group justify-content-center"> <div className="d-flex align-items-center avatar-group justify-content-center">
{task.teamMembers.slice(0, 3).map((member) => ( {task.teamMembers.slice(0, 3).map((member) => (
<div <div
key={member.id} key={member.id}
data-bs-toggle="tooltip" data-bs-toggle="tooltip"

2
src/router/AppRoutes.jsx
View File

@ -65,7 +65,7 @@ const router = createBrowserRouter(
{ path: "/employee/manage/:employeeId", element: <ManageEmp /> }, { path: "/employee/manage/:employeeId", element: <ManageEmp /> },
{ path: "/inventory", element: <Inventory /> }, { path: "/inventory", element: <Inventory /> },
{ path: "/activities/attendance", element: <AttendancePage /> }, { path: "/activities/attendance", element: <AttendancePage /> },
{ path: "/activities/records", element: <DailyTask /> }, { path: "/activities/records/:projectId?", element: <DailyTask /> },
{ path: "/activities/task", element: <TaskPlannng /> }, { path: "/activities/task", element: <TaskPlannng /> },
{ path: "/activities/reports", element: <Reports /> }, { path: "/activities/reports", element: <Reports /> },
{ path: "/activities/gallary", element: <ImageGallary /> }, { path: "/activities/gallary", element: <ImageGallary /> },