update monthlybarchart to extract from db
This commit is contained in:
parent
5a17af8486
commit
606c1047f6
@ -194,7 +194,7 @@ const AdminDashboard = () => {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div ref={monthlyChartRef} className="pb-5">
|
<div ref={monthlyChartRef} className="pb-5">
|
||||||
<MonthlyBarChart siteData={currentSiteDetails} />
|
<MonthlyBarChart siteId={siteIdMap[selectedSite]} />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import React from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
BarChart,
|
BarChart,
|
||||||
Bar,
|
Bar,
|
||||||
@ -8,61 +8,106 @@ import {
|
|||||||
ResponsiveContainer,
|
ResponsiveContainer,
|
||||||
Legend,
|
Legend,
|
||||||
} from 'recharts';
|
} from 'recharts';
|
||||||
import { SiteDetails } from '@/types/SiteData';
|
import { format } from 'date-fns';
|
||||||
|
import { fetchPowerTimeseries } from '@/app/utils/api';
|
||||||
|
|
||||||
interface MonthlyBarChartProps {
|
interface MonthlyBarChartProps {
|
||||||
siteData: SiteDetails | null;
|
siteId: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface TimeSeriesEntry {
|
||||||
|
time: string;
|
||||||
|
value: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const groupTimeSeries = (
|
||||||
|
data: TimeSeriesEntry[],
|
||||||
|
mode: 'monthly'
|
||||||
|
): TimeSeriesEntry[] => {
|
||||||
|
const groupMap = new Map<string, number[]>();
|
||||||
|
|
||||||
|
for (const entry of data) {
|
||||||
|
const date = new Date(entry.time);
|
||||||
|
const key = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
|
||||||
|
if (!groupMap.has(key)) groupMap.set(key, []);
|
||||||
|
groupMap.get(key)!.push(entry.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Array.from(groupMap.entries()).map(([time, values]) => ({
|
||||||
|
time,
|
||||||
|
value: values.reduce((sum, v) => sum + v, 0),
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
const consumptionColor = '#003049';
|
const consumptionColor = '#003049';
|
||||||
const generationColor = '#669bbc';
|
const generationColor = '#669bbc';
|
||||||
|
|
||||||
// Month names for X-axis labels
|
const MonthlyBarChart: React.FC<MonthlyBarChartProps> = ({ siteId }) => {
|
||||||
const MONTHS = [
|
const [chartData, setChartData] = useState<
|
||||||
'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
|
{ month: string; consumption: number; generation: number }[]
|
||||||
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec',
|
>([]);
|
||||||
];
|
const [loading, setLoading] = useState(true);
|
||||||
|
|
||||||
const MonthlyBarChart: React.FC<MonthlyBarChartProps> = ({ siteData }) => {
|
useEffect(() => {
|
||||||
const chartData = React.useMemo(() => {
|
if (!siteId) return;
|
||||||
if (
|
|
||||||
!siteData ||
|
const fetchMonthlyData = async () => {
|
||||||
siteData.consumptionData.length === 0 ||
|
setLoading(true);
|
||||||
siteData.generationData.length === 0
|
const start = '2025-01-01T00:00:00+08:00';
|
||||||
) {
|
const end = '2025-12-31T23:59:59+08:00';
|
||||||
return [];
|
|
||||||
|
try {
|
||||||
|
const res = await fetchPowerTimeseries(siteId, start, end);
|
||||||
|
|
||||||
|
const groupedConsumption = groupTimeSeries(res.consumption, 'monthly');
|
||||||
|
const groupedGeneration = groupTimeSeries(res.generation, 'monthly');
|
||||||
|
|
||||||
|
const monthMap = new Map<string, { consumption: number; generation: number }>();
|
||||||
|
|
||||||
|
for (const entry of groupedConsumption) {
|
||||||
|
if (!monthMap.has(entry.time)) {
|
||||||
|
monthMap.set(entry.time, { consumption: 0, generation: 0 });
|
||||||
|
}
|
||||||
|
monthMap.get(entry.time)!.consumption = entry.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Initialize totals
|
for (const entry of groupedGeneration) {
|
||||||
const monthlyData = Array.from({ length: 12 }, (_, month) => ({
|
if (!monthMap.has(entry.time)) {
|
||||||
month: MONTHS[month],
|
monthMap.set(entry.time, { consumption: 0, generation: 0 });
|
||||||
consumption: 0,
|
}
|
||||||
generation: 0,
|
monthMap.get(entry.time)!.generation = entry.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
const formatted = Array.from(monthMap.entries())
|
||||||
|
.sort(([a], [b]) => a.localeCompare(b))
|
||||||
|
.map(([key, val]) => ({
|
||||||
|
month: format(new Date(`${key}-01`), 'MMM'),
|
||||||
|
consumption: val.consumption,
|
||||||
|
generation: val.generation,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
// Group daily data into months (assume data is in order from Jan 1 to Dec 31)
|
setChartData(formatted.slice(-6)); // last 6 months
|
||||||
// Group daily data into months (assume data is in order from Jan 1 to Dec 31)
|
} catch (error) {
|
||||||
for (let i = 0; i < siteData.consumptionData.length; i++) {
|
console.error('Failed to fetch monthly power data:', error);
|
||||||
const monthIndex = Math.floor(i / 30.42); // Rough approximation
|
setChartData([]);
|
||||||
if (monthIndex < 12) {
|
} finally {
|
||||||
monthlyData[monthIndex].consumption += siteData.consumptionData[i];
|
setLoading(false);
|
||||||
monthlyData[monthIndex].generation += siteData.generationData[i];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
// ✅ Only return the last 6 months
|
fetchMonthlyData();
|
||||||
return monthlyData.slice(-6);
|
}, [siteId]);
|
||||||
|
|
||||||
}, [siteData]);
|
if (loading || !siteId || chartData.length === 0) {
|
||||||
|
|
||||||
if (!siteData || chartData.length === 0) {
|
|
||||||
return (
|
return (
|
||||||
<div className="bg-white p-4 rounded-lg shadow-md dark:bg-gray-800 dark:text-white-light">
|
<div className="bg-white p-4 rounded-lg shadow-md dark:bg-gray-800 dark:text-white-light">
|
||||||
<div className="flex justify-between items-center mb-2">
|
<div className="flex justify-between items-center mb-2">
|
||||||
<h2 className="text-lg font-bold pb-3">Monthly Energy Yield</h2>
|
<h2 className="text-lg font-bold pb-3">Monthly Energy Yield</h2>
|
||||||
</div>
|
</div>
|
||||||
<div className="h-96 w-full flex items-center justify-center">
|
<div className="h-96 w-full flex items-center justify-center">
|
||||||
<p className="text-white/70">No data available for chart. Please select a site.</p>
|
<p className="text-white/70">
|
||||||
|
{loading ? 'Loading data...' : 'No data available for chart.'}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@ -91,3 +136,4 @@ const MonthlyBarChart: React.FC<MonthlyBarChartProps> = ({ siteData }) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export default MonthlyBarChart;
|
export default MonthlyBarChart;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user