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

Merge branch 'Kartik_Enhancement#335' into Issue_May_4W

Browse Source 
# Conflicts:
#	src/components/Dashboard/Dashboard.jsx
This commit is contained in:
Vikas Nale 2025-05-24 10:27:20 +05:30
commit aa50aeff98
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ import {
useDashboardTeamsCardData,
useDashboardTasksCardData,
} from "../../hooks/useDashboard_Data";
import TasksCard from "./Tasks";
import Teams from "./Teams";
const Dashboard = () => {
const { projects, loading } = useProjects();
@ -121,35 +121,35 @@ const Dashboard = () => {
</div>
{/* Teams Card */}
<div className="col-sm-6 col-lg-4">
<Teams teamsCardData={teamsCardData} /> {/* Use the Teams component */}
</div>
{/* Tasks Card */}
<div className="col-sm-6 col-lg-4">
<div className="card p-3 h-100 text-center d-flex justify-content-between">
<div className="d-flex justify-content-start align-items-center mb-3">
<h5 className="fw-bold mb-0 ms-2">
<i className="bx bx-group text-warning"></i> Teams
<i className="bx bx-task text-success"></i> Tasks
</h5>
</div>
<div className="d-flex justify-content-around align-items-start mt-n2">
<div>
<h4 className="mb-0 fw-bold">
{teamsCardData.totalEmployees?.toLocaleString()}
{tasksCardData.totalTasks?.toLocaleString()}
</h4>
<small className="text-muted">Total Employees</small>
<small className="text-muted">Total</small>
</div>
<div>
<h4 className="mb-0 fw-bold">
{teamsCardData.inToday?.toLocaleString()}
{tasksCardData.completedTasks?.toLocaleString()}
</h4>
<small className="text-muted">In Today</small>
<small className="text-muted">Completed</small>
</div>
</div>
</div>
</div>
{/* Tasks Card */}
<div className="col-sm-6 col-lg-4">
<TasksCard tasksCardData={tasksCardData} /> {/* Use the TasksCard component */}
</div>
{/* Bar Chart */}
<div className="col-xxl-6 col-lg-6">
<div className="card h-100">

32
src/components/Dashboard/Teams.jsx Normal file
View File

@ -0,0 +1,32 @@
import React from "react";
import { useDashboardTeamsCardData } from "../../hooks/useDashboard_Data";
const Teams = () => {
const { teamsCardData } = useDashboardTeamsCardData();
return (
<div className="card p-3 h-100 text-center d-flex justify-content-between">
<div className="d-flex justify-content-start align-items-center mb-3">
<h5 className="fw-bold mb-0 ms-2">
<i className="bx bx-group text-warning"></i> Teams
</h5>
</div>
<div className="d-flex justify-content-around align-items-start mt-n2">
<div>
<h4 className="mb-0 fw-bold">
{teamsCardData.totalEmployees?.toLocaleString()}
</h4>
<small className="text-muted">Total Employees</small>
</div>
<div>
<h4 className="mb-0 fw-bold">
{teamsCardData.inToday?.toLocaleString()}
</h4>
<small className="text-muted">In Today</small>
</div>
</div>
</div>
);
};
export default Teams;