Vaibhav_Dashboard_Enhancement #9

Merged
vikas.nale merged 6 commits from Vaibhav_Dashboard_Enhancement into Feature_Task_Management 2025-04-15 11:42:46 +00:00
2 changed files with 24 additions and 6 deletions
Showing only changes of commit dd697b47b5 - Show all commits

View File

@ -6,7 +6,8 @@ const LineChart = ({
seriesData = [], seriesData = [],
categories = [], categories = [],
colors = ["#1E90FF", "#FF6347"], colors = ["#1E90FF", "#FF6347"],
loading = false loading = false,
lineChartCategoriesDates = [],
}) => { }) => {
const hasValidData = const hasValidData =
Array.isArray(seriesData) && Array.isArray(seriesData) &&
@ -100,11 +101,21 @@ const LineChart = ({
tooltip: { tooltip: {
enabled: true, enabled: true,
x: { x: {
formatter: (val, opts) => val formatter: (value, { dataPointIndex }) => {
if (
lineChartCategoriesDates &&
lineChartCategoriesDates.length > dataPointIndex
) {
return lineChartCategoriesDates[dataPointIndex];
}
return value;
} }
} }
}
}; };
return ( return (
<div className="w-full overflow-x-auto"> <div className="w-full overflow-x-auto">
<ReactApexChart <ReactApexChart

View File

@ -82,7 +82,13 @@ const Dashboard = () => {
day: "numeric", day: "numeric",
}) })
); );
const lineChartCategoriesDates = sortedDashboardData.map((d) =>
new Date(d.date).toLocaleDateString("en-US", {
month: "short",
day: "numeric",
year: "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">
@ -252,6 +258,7 @@ const Dashboard = () => {
seriesData={lineChartSeries} seriesData={lineChartSeries}
categories={lineChartCategories} categories={lineChartCategories}
loading={isLineChartLoading} loading={isLineChartLoading}
lineChartCategoriesDates={lineChartCategoriesDates}
/> />
</div> </div>
</div> </div>