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

Services_Bugs :- UI changes of Purchase Modal. #523

Merged
pramod.mahajan merged 21 commits from Services_Bugs into Purchase_Invoice_Management 2025-11-28 06:42:44 +00:00
Conversation 0 Commits 21 Files Changed 24 +10 -6
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 711dfb8f00 - Show all commits

4
src/components/Dashboard/Dashboard.jsx
View File

@ -58,7 +58,9 @@ const Dashboard = () => {
{!isAllProjectsSelected && ( {!isAllProjectsSelected && (
<div className="col-xxl-4 col-lg-4"> <div className="col-xxl-4 col-lg-4">
<ProjectStatistics /> <div className="card h-100">
<ProjectStatistics />
</div>
</div> </div>
)} )}
<div className="col-12 col-xl-4 col-md-6"> <div className="col-12 col-xl-4 col-md-6">

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

@ -165,7 +165,7 @@ const ProjectStatistics = ({ project }) => {
}, [selectedProject]); }, [selectedProject]);
return ( return (
<div className="card h-100"> <>
<div className="card-header text-start"> <div className="card-header text-start">
<h5 className="card-action-title mb-0"> <h5 className="card-action-title mb-0">
{" "} {" "}
@ -242,8 +242,8 @@ const ProjectStatistics = ({ project }) => {
</li> </li>
</ul> </ul>
</div> </div>
</>
</div>
); );
}; };

8
src/pages/project/ProjectDetails.jsx
View File

@ -24,6 +24,7 @@ import { useProjectAccess } from "../../hooks/useProjectAccess";
import "./ProjectDetails.css"; import "./ProjectDetails.css";
import ProjectOrganizations from "../../components/Project/ProjectOrganizations"; import ProjectOrganizations from "../../components/Project/ProjectOrganizations";
import ProjectStatistics from "../../components/Project/ProjectStatistics";
const ProjectDetails = () => { const ProjectDetails = () => {
const projectId = useSelectedProject(); const projectId = useSelectedProject();
@ -81,13 +82,14 @@ const ProjectDetails = () => {
return ( return (
<div className="row"> <div className="row">
<div className="col-lg-4 col-md-5 mt-2"> <div className="col-lg-4 col-md-5 mt-2">
<AboutProject /> <AboutProject />
<ProjectOverview project={projectId} /> <div className="card"><ProjectStatistics project={projectId} /></div>
</div> </div>
<div className="col-lg-8 col-md-7 mt-2"> <div className="col-lg-8 col-md-7 mt-2">
<ProjectProgressChart ShowAllProject="false" DefaultRange="1M" /> <ProjectProgressChart ShowAllProject="false" DefaultRange="1M" />
<div className="mt-5"> <div className="mt-5">
<AttendanceOverview /> <AttendanceOverview/>
</div> </div>
</div> </div>
</div> </div>