diff --git a/src/components/Project/ProjectCard.jsx b/src/components/Project/ProjectCard.jsx index 1c3086fe..296c1605 100644 --- a/src/components/Project/ProjectCard.jsx +++ b/src/components/Project/ProjectCard.jsx @@ -29,6 +29,13 @@ const ProjectCard = ({ projectData }) => { } }; + const getProgress = (planned, completed) => { + return (completed * 100) / planned + "%"; + }; + const getProgressInNumber = (planned, completed) => { + return (completed * 100) / planned ; + }; + const handleClose = () => setShowModal( false ); const getProjectStatusName = (statusId) => { @@ -229,29 +236,38 @@ const ProjectCard = ({ projectData }) => {
- Task: 290/344 - 95% Completed + Task: {projectInfo.completedWork} / { projectInfo.plannedWork} + {Math.floor(getProgressInNumber(projectInfo.plannedWork,projectInfo.completedWork)) || 0} % Completed
-
-
-
-
+
+ {/*
+
*/} +
+ {projectInfo?.teamSize} + + +
+
+ 15 - + +
diff --git a/src/components/Project/ProjectOverview.jsx b/src/components/Project/ProjectOverview.jsx index bf7ba756..1aa1f300 100644 --- a/src/components/Project/ProjectOverview.jsx +++ b/src/components/Project/ProjectOverview.jsx @@ -1,11 +1,10 @@ import React from "react"; -import {useEmployeesByProjectAllocated} from "../../hooks/useProjects"; +import {useEmployeesByProjectAllocated, useProjects} from "../../hooks/useProjects"; const ProjectOverview = ({project}) => { - const {projectEmployees} = useEmployeesByProjectAllocated( project?.id ); - let teamSize = projectEmployees.filter( ( emp ) => emp.isActive ) - +const {projects} = useProjects() +const teamSize = projects.find((pro)=>pro.id == project) return (
@@ -26,7 +25,7 @@ const ProjectOverview = ({project}) =>
  • Current team Size:{" "} - { teamSize?.length} + {teamSize?.teamSize}
  • diff --git a/src/components/common/ProgressBar.jsx b/src/components/common/ProgressBar.jsx new file mode 100644 index 00000000..1a29a343 --- /dev/null +++ b/src/components/common/ProgressBar.jsx @@ -0,0 +1,30 @@ +import React from "react"; + +const ProgressBar = ( {completeValue, totalValue} ) => +{ + + + const getProgress = (complete, total) => { + return (total * 100) / complete + "%"; + }; + return ( +
    +
    +
    +
    +
    + + ); +}; + +export default ProgressBar; diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx index 91799d67..3385b585 100644 --- a/src/pages/project/ProjectDetails.jsx +++ b/src/pages/project/ProjectDetails.jsx @@ -102,7 +102,7 @@ const ProjectDetails = () => {
    {/* Profile Overview */} - + {/* Profile Overview */}
    diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx index 11f6fe67..da90e759 100644 --- a/src/pages/project/ProjectList.jsx +++ b/src/pages/project/ProjectList.jsx @@ -23,7 +23,7 @@ const ProjectList = () => const[HasManageProject,setHasManageProject] = useState(HasManageProjectPermission) const dispatch = useDispatch(); const [currentPage, setCurrentPage] = useState(1); - const [itemsPerPage] = useState(5); + const [itemsPerPage] = useState(6); const handleShow = () => setShowModal(true);