Merge pull request 'pramod_Task#69NavigateDailyTaskFormProjectCard' (#33) from pramod_Task#69NavigateDailyTaskFormProjectCard into Feature_Task_Management
Reviewed-on: #33
This commit is contained in:
commit
49cf2db206
@ -181,10 +181,10 @@ const ProjectCard = ({ projectData }) => {
|
||||
<span className="align-left">Modify</span>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<li onClick={()=>navigate(`/activities/records?project=${projectInfo.id}`)}>
|
||||
<a className="dropdown-item">
|
||||
<i className="bx bx-task me-2"></i>
|
||||
<span className="align-left">Activities</span>
|
||||
<span className="align-left" >Activities</span>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
@ -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 (
|
||||
<>
|
||||
<div
|
||||
@ -189,7 +195,7 @@ const DailyTask = () => {
|
||||
<td>{formatDate(task.assignmentDate)}</td>
|
||||
<td className="text-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
|
||||
key={member.id}
|
||||
data-bs-toggle="tooltip"
|
||||
|
@ -65,7 +65,7 @@ const router = createBrowserRouter(
|
||||
{ path: "/employee/manage/:employeeId", element: <ManageEmp /> },
|
||||
{ path: "/inventory", element: <Inventory /> },
|
||||
{ path: "/activities/attendance", element: <AttendancePage /> },
|
||||
{ path: "/activities/records", element: <DailyTask /> },
|
||||
{ path: "/activities/records/:projectId?", element: <DailyTask /> },
|
||||
{ path: "/activities/task", element: <TaskPlannng /> },
|
||||
{ path: "/activities/reports", element: <Reports /> },
|
||||
{ path: "/activities/gallary", element: <ImageGallary /> },
|
||||
|
Loading…
x
Reference in New Issue
Block a user