Compare commits
No commits in common. "77a4154ec98b0b260a67c1089d7411e95cece8b4" and "7308bd8d03ccf85858cf1f22568bf9de49dfb19a" have entirely different histories.
77a4154ec9
...
7308bd8d03
@ -181,10 +181,10 @@ const ProjectCard = ({ projectData }) => {
|
|||||||
<span className="align-left">Modify</span>
|
<span className="align-left">Modify</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li onClick={()=>navigate(`/activities/records?project=${projectInfo.id}`)}>
|
<li>
|
||||||
<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>
|
||||||
|
|||||||
@ -13,12 +13,9 @@ 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,
|
||||||
@ -60,9 +57,6 @@ const DailyTask = () => {
|
|||||||
openModal();
|
openModal();
|
||||||
};
|
};
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (projectId) dispatch(setProjectId(projectId));
|
|
||||||
}, [projectId]);
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<div
|
<div
|
||||||
|
|||||||
@ -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/:projectId?", element: <DailyTask /> },
|
{ path: "/activities/records", 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 /> },
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user