Compare commits

..

No commits in common. "1d3fcff85998bb2f84b74b85995093f990b633bd" and "4e315aafcf4b5710f937862dc73b1cc0443899a4" have entirely different histories.

2 changed files with 52 additions and 55 deletions

View File

@ -14,13 +14,13 @@ import {
getProjectStatusName, getProjectStatusName,
} from "../../utils/projectStatus"; } from "../../utils/projectStatus";
import GlobalModel from "../common/GlobalModel"; import GlobalModel from "../common/GlobalModel";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import { setProjectId } from "../../slices/localVariablesSlice"; import { setProjectId } from "../../slices/localVariablesSlice";
const ProjectCard = ({ projectData, recall }) => { const ProjectCard = ({ projectData, recall }) => {
const [projectInfo, setProjectInfo] = useState(projectData); const [ projectInfo, setProjectInfo ] = useState( projectData );
const { projects_Details, loading, error, refetch } = useProjectDetails( const { projects_Details, loading, error, refetch } = useProjectDetails(
projectInfo?.id, false projectInfo?.id,false
); );
const [showModal, setShowModal] = useState(false); const [showModal, setShowModal] = useState(false);
const dispatch = useDispatch() const dispatch = useDispatch()
@ -37,9 +37,9 @@ const ProjectCard = ({ projectData, recall }) => {
}, },
}) })
useEffect(() => { useEffect(()=>{
setProjectInfo(projectData); setProjectInfo(projectData);
}, [projectData]) }, [ projectData ] )
const handleShow = async () => { const handleShow = async () => {
try { try {
@ -63,10 +63,6 @@ const ProjectCard = ({ projectData, recall }) => {
dispatch(setProjectId(projectInfo.id)) dispatch(setProjectId(projectInfo.id))
navigate(`/projects/details`); navigate(`/projects/details`);
}; };
const handleViewActivities = () => {
dispatch(setProjectId(projectInfo.id))
navigate(`/activities/records?project=${projectInfo.id}`);
};
const handleFormSubmit = (updatedProject) => { const handleFormSubmit = (updatedProject) => {
if (projectInfo?.id) { if (projectInfo?.id) {
@ -75,7 +71,7 @@ const ProjectCard = ({ projectData, recall }) => {
updatedData: updatedProject, updatedData: updatedProject,
}); });
} }
}; };
return ( return (
<> <>
@ -161,7 +157,11 @@ const ProjectCard = ({ projectData, recall }) => {
</a> </a>
</li> </li>
<li <li
onClick={handleViewActivities} 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>

View File

@ -69,11 +69,6 @@ const ProjectListView = ({ projectData, recall }) => {
navigate(`/projects/details`); navigate(`/projects/details`);
}; };
const handleViewActivities = () => {
dispatch(setProjectId(projectInfo.id))
navigate(`/activities/records?project=${projectInfo.id}`);
};
const handleFormSubmit = (updatedProject) => { const handleFormSubmit = (updatedProject) => {
if (projectInfo?.id) { if (projectInfo?.id) {
updateProject({ updateProject({
@ -188,7 +183,9 @@ const ProjectListView = ({ projectData, recall }) => {
</a> </a>
</li> </li>
<li <li
onClick={handleViewActivities} 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>