refactor(Dashboard): enhance project data handling and improve chart integration

This commit is contained in:
Vaibhav Surve 2025-04-11 15:45:08 +05:30
parent 02b0c4ccab
commit 895e3da219

View File

@ -1,25 +1,57 @@
import React from 'react'; import React, { useState } from 'react';
import HorizontalBarChart from '../Charts/HorizontalBarChart'; import HorizontalBarChart from '../Charts/HorizontalBarChart';
import LineChart from '../Charts/LineChart'; import LineChart from '../Charts/LineChart';
const dummyCategories = ['Project 1', 'Project 2', 'Project 3', 'Project 4', 'Project 5']; import { useProjects } from '../../hooks/useProjects';
const dummyData = [45, 38, 30, 25, 20]; import {
useDashboard_Data,
const lineChartseries = [ useDashboardProjectsCardData,
{ useDashboardTeamsCardData,
name: "Planned Projects", useDashboardTasksCardData,
data: [20, 25, 30, 35, 40, 45, 50] } from "../../hooks/useDashboard_Data";
},
{
name: "Completed Projects",
data: [5, 15, 28, 36, 42, 46, 48]
}
];
const lineChartCategories = ["January", "February", "March", "April", "May", "June", "July"];
const Dashboard = () => { const Dashboard = () => {
const { projects } = useProjects();
const [selectedProjectId, setSelectedProjectId] = useState('all');
const [FromDate, setFromDate] = useState(() => {
const today = new Date();
return today.toISOString().split('T')[0]; // YYYY-MM-DD
});
const [days, setDays] = useState(10);
const { projectsCardData, } = useDashboardProjectsCardData();
const { teamsCardData,} = useDashboardTeamsCardData();
const { tasksCardData, } = useDashboardTasksCardData();
const { dashboard_data, loading: lineLoading } = useDashboard_Data({
days,
FromDate,
projectId: selectedProjectId === 'all' ? 0 : selectedProjectId,
});
// Bar chart logic
const projectNames = projects?.map(p => p.name) || [];
const projectProgress = projects?.map(p => {
const completed = p.completedWork || 0;
const planned = p.plannedWork || 1;
const percent = (completed / planned) * 100;
return Math.min(Math.round(percent), 100);
}) || [];
// Line chart data
const lineChartSeries = [
{
name: 'Planned Work',
data: dashboard_data.map(d => d.plannedWork || 0),
},
{
name: 'Completed Work',
data: dashboard_data.map(d => d.completedWork || 0),
},
];
const lineChartCategories = dashboard_data.map(d =>
new Date(d.date).toLocaleDateString('en-US', { month: 'short', day: 'numeric' })
);
return ( return (
<div className="container-xxl flex-grow-1 container-p-y"> <div className="container-xxl flex-grow-1 container-p-y">
<div className="row gy-4"> <div className="row gy-4">
@ -28,15 +60,15 @@ const Dashboard = () => {
<div className="col-sm-6 col-lg-4"> <div className="col-sm-6 col-lg-4">
<div className="card p-3 h-100 text-center d-flex justify-content-between"> <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"> <div className="d-flex justify-content-start align-items-center mb-3">
<h5 class="fw-bold mb-0 ms-2"><i class="rounded-circle bx bx-building-house" ></i> Projects</h5> <h5 className="fw-bold mb-0 ms-2"><i className="rounded-circle bx bx-building-house"></i> Projects</h5>
</div> </div>
<div className="d-flex justify-content-around align-items-start mt-n2"> <div className="d-flex justify-content-around align-items-start mt-n2">
<div> <div>
<h4 className="mb-0 fw-bold">25</h4> <h4 className="mb-0 fw-bold">{projectsCardData.totalProjects?.toLocaleString()}</h4>
<small className="text-muted">Total</small> <small className="text-muted">Total</small>
</div> </div>
<div> <div>
<h4 className="mb-0 fw-bold">30</h4> <h4 className="mb-0 fw-bold">{projectsCardData.ongoingProjects?.toLocaleString()}</h4>
<small className="text-muted">Ongoing</small> <small className="text-muted">Ongoing</small>
</div> </div>
</div> </div>
@ -47,15 +79,15 @@ const Dashboard = () => {
<div className="col-sm-6 col-lg-4"> <div className="col-sm-6 col-lg-4">
<div className="card p-3 h-100 text-center d-flex justify-content-between"> <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"> <div className="d-flex justify-content-start align-items-center mb-3">
<h5 class="fw-bold mb-0 ms-2"><i className="bx bx-group text-warning" ></i> Teams</h5> <h5 className="fw-bold mb-0 ms-2"><i className="bx bx-group text-warning"></i> Teams</h5>
</div> </div>
<div className="d-flex justify-content-around align-items-start mt-n2"> <div className="d-flex justify-content-around align-items-start mt-n2">
<div> <div>
<h4 className="mb-0 fw-bold">500</h4> <h4 className="mb-0 fw-bold">{teamsCardData.totalEmployees?.toLocaleString()}</h4>
<small className="text-muted">Total Employees</small> <small className="text-muted">Total Employees</small>
</div> </div>
<div> <div>
<h4 className="mb-0 fw-bold">360</h4> <h4 className="mb-0 fw-bold">{teamsCardData.inToday?.toLocaleString()}</h4>
<small className="text-muted">In Today</small> <small className="text-muted">In Today</small>
</div> </div>
</div> </div>
@ -66,66 +98,106 @@ const Dashboard = () => {
<div className="col-sm-6 col-lg-4"> <div className="col-sm-6 col-lg-4">
<div className="card p-3 h-100 text-center d-flex justify-content-between"> <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"> <div className="d-flex justify-content-start align-items-center mb-3">
<h5 class="fw-bold mb-0 ms-2"><i className="bx bx-task text-success" ></i> Tasks</h5> <h5 className="fw-bold mb-0 ms-2"><i className="bx bx-task text-success"></i> Tasks</h5>
</div> </div>
<div className="d-flex justify-content-around align-items-start mt-n2"> <div className="d-flex justify-content-around align-items-start mt-n2">
<div> <div>
<h4 className="mb-0 fw-bold">10,000</h4> <h4 className="mb-0 fw-bold">{tasksCardData.totalTasks?.toLocaleString()}</h4>
<small className="text-muted">Total</small> <small className="text-muted">Total</small>
</div> </div>
<div> <div>
<h4 className="mb-0 fw-bold">4,000</h4> <h4 className="mb-0 fw-bold">{tasksCardData.completedTasks?.toLocaleString()}</h4>
<small className="text-muted">Completed</small> <small className="text-muted">Completed</small>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{/* Chart Section */}
<div class="col-xxl-6 col-lg-7"> {/* Bar Chart */}
<div class="card h-100"> <div className="col-xxl-6 col-lg-6">
<div class="card-header d-flex align-items-start justify-content-between"> <div className="card h-100">
<div class="card-title mb-0"> <div className="card-header d-flex align-items-start justify-content-between">
<h5 class="mb-1">Projects </h5> <div className="card-title mb-0 text-start">
<p class="card-subtitle">Total Projects Overview</p> <h5 className="mb-1">Projects</h5>
<p className="card-subtitle">Total Projects Overview</p>
</div> </div>
</div> </div>
<div class="card-body"> <div className="card-body">
<HorizontalBarChart <HorizontalBarChart
categories={dummyCategories} categories={projectNames}
seriesData={dummyData} seriesData={projectProgress}
/> />
</div> </div>
</div> </div>
</div> </div>
<div class="col-xxl-6 col-lg-7">
<div class="card h-100"> {/* Line Chart */}
<div class="card-header d-flex align-items-center justify-content-between"> <div className="col-xxl-6 col-lg-6">
<div class="card-title mb-0"> <div className="card h-100">
<h5 class="mb-1">Project Progress</h5> <div className="card-header d-flex flex-wrap align-items-center justify-content-between">
<p class="card-subtitle">Progress Overview by Project</p> <div className="card-title mb-0 text-start">
<h5 className="mb-1">Project Progress</h5>
<p className="card-subtitle">Progress Overview by Project</p>
</div> </div>
<div class="btn-group"> <div className="d-flex flex-wrap gap-2 align-items-center">
<button type="button" class="btn btn-label-primary">Project A</button> {/* Project Dropdown */}
<button <div className="btn-group">
type="button" <button type="button" className="btn btn-label-primary">
class="btn btn-label-primary dropdown-toggle dropdown-toggle-split" {selectedProjectId === 'all'
data-bs-toggle="dropdown" ? 'All Projects'
aria-expanded="false"> : projects?.find(p => p.id === selectedProjectId)?.name || 'Select Project'}
<span class="visually-hidden">Toggle Dropdown</span> </button>
</button> <button
<ul class="dropdown-menu"> type="button"
<li><a class="dropdown-item" href="javascript:void(0);">Project A</a></li> className="btn btn-label-primary dropdown-toggle dropdown-toggle-split"
<li><a class="dropdown-item" href="javascript:void(0);">Project B</a></li> data-bs-toggle="dropdown"
<li><a class="dropdown-item" href="javascript:void(0);">Project C</a></li> aria-expanded="false"
<li><a class="dropdown-item" href="javascript:void(0);">Project D</a></li> >
</ul> <span className="visually-hidden">Toggle Dropdown</span>
</button>
<ul className="dropdown-menu">
<li>
<button className="dropdown-item" onClick={() => setSelectedProjectId('all')}>
All Projects
</button>
</li>
{projects?.map((project) => (
<li key={project.id}>
<button className="dropdown-item" onClick={() => setSelectedProjectId(project.id)}>
{project.name}
</button>
</li>
))}
</ul>
</div>
{/* From Date */}
<input
type="date"
className="form-control"
value={FromDate}
onChange={(e) => setFromDate(e.target.value)}
style={{ maxWidth: '150px' }}
/>
{/* Days */}
<input
type="number"
className="form-control"
value={days}
min={1}
onChange={(e) => setDays(Number(e.target.value))}
style={{ maxWidth: '100px' }}
/>
</div> </div>
</div> </div>
<div class="card-body"> <div className="card-body ">
<LineChart seriesData={lineChartseries} categories={lineChartCategories} /> <LineChart seriesData={lineChartSeries} categories={lineChartCategories} />
{lineLoading && <p className="text-center mt-3">Loading...</p>}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
); );