Fix timestamp handling and improve data extraction in HistoryCharts component
This commit is contained in:
@@ -57,25 +57,29 @@ const HistoryChartsContent = () => {
|
|||||||
data?.forEach(sensor => {
|
data?.forEach(sensor => {
|
||||||
if (sensor.value != null && grouped[sensor.valueType]) {
|
if (sensor.value != null && grouped[sensor.valueType]) {
|
||||||
grouped[sensor.valueType].push({
|
grouped[sensor.valueType].push({
|
||||||
timestamp: new Date(sensor.timestamp),
|
timestamp: sensor.timestamp * 1000,
|
||||||
value: sensor.value
|
value: sensor.value
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const sortAndExtract = (entries) => {
|
const sortAndExtract = (entries) => {
|
||||||
const sorted = entries.sort((a, b) => a.timestamp - b.timestamp);
|
const sorted = entries.sort((a, b) => a.timestamp - b.timestamp);
|
||||||
|
|
||||||
const labels = sorted.map(e =>
|
const labels = sorted.map(e =>
|
||||||
new Date(e.timestamp * 1000).toLocaleTimeString('es-ES', {
|
new Date(e.timestamp).toLocaleTimeString('es-ES', {
|
||||||
timeZone: 'Europe/Madrid',
|
timeZone: 'UTC',
|
||||||
hour: '2-digit',
|
hour: '2-digit',
|
||||||
minute: '2-digit'
|
minute: '2-digit'
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
const values = sorted.map(e => e.value);
|
const values = sorted.map(e => e.value);
|
||||||
return { labels, values };
|
return { labels, values };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const temp = sortAndExtract(grouped.temperature);
|
const temp = sortAndExtract(grouped.temperature);
|
||||||
const hum = sortAndExtract(grouped.humidity);
|
const hum = sortAndExtract(grouped.humidity);
|
||||||
const press = sortAndExtract(grouped.pressure);
|
const press = sortAndExtract(grouped.pressure);
|
||||||
|
|||||||
Reference in New Issue
Block a user