Fix: Preserve chart state during zoom, pan, and date changes
- Added React.useMemo to memoize chartData and chartOptions to prevent unnecessary re-renders. - Ensured chart zoom and pan states are maintained during interactions. - Improved performance and user experience by avoiding chart
This commit is contained in:
@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
|
|||||||
NEXT_PUBLIC_EXPORT_STATIC=false
|
NEXT_PUBLIC_EXPORT_STATIC=false
|
||||||
NEXT_PUBLIC_USE_CGI=false
|
NEXT_PUBLIC_USE_CGI=false
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.6.618
|
NEXT_PUBLIC_APP_VERSION=1.6.623
|
||||||
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
|
NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
|
||||||
|
|
||||||
|
|||||||
@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
|
|||||||
NEXT_PUBLIC_EXPORT_STATIC=true
|
NEXT_PUBLIC_EXPORT_STATIC=true
|
||||||
NEXT_PUBLIC_USE_CGI=true
|
NEXT_PUBLIC_USE_CGI=true
|
||||||
# App-Versionsnummer
|
# App-Versionsnummer
|
||||||
NEXT_PUBLIC_APP_VERSION=1.6.618
|
NEXT_PUBLIC_APP_VERSION=1.6.623
|
||||||
NEXT_PUBLIC_CPL_MODE=production
|
NEXT_PUBLIC_CPL_MODE=production
|
||||||
50
CHANGELOG.md
50
CHANGELOG.md
@@ -1,3 +1,53 @@
|
|||||||
|
## [1.6.623] – 2025-07-22
|
||||||
|
|
||||||
|
- feat(AnalogInputsChart): Zeitraum im DatePicker und Redux initialisieren und synchronisieren
|
||||||
|
|
||||||
|
- Initialwert für Zeitraum (letzte 30 Tage) im Redux-Store gesetzt
|
||||||
|
- DatePicker-Änderungen werden im Redux gespeichert
|
||||||
|
- Fetch-Button verwendet Zeitraum aus Redux und loggt die Fetch-URL
|
||||||
|
- Chart zeigt Daten entsprechend ausgewähltem Zeitraum
|
||||||
|
|
||||||
|
---
|
||||||
|
## [1.6.622] – 2025-07-22
|
||||||
|
|
||||||
|
- feat(AnalogInputsChart): Zeitraum im DatePicker und Redux initialisieren und synchronisieren
|
||||||
|
|
||||||
|
- Initialwert für Zeitraum (letzte 30 Tage) im Redux-Store gesetzt
|
||||||
|
- DatePicker-Änderungen werden im Redux gespeichert
|
||||||
|
- Fetch-Button verwendet Zeitraum aus Redux und loggt die Fetch-URL
|
||||||
|
- Chart zeigt Daten entsprechend ausgewähltem Zeitraum
|
||||||
|
|
||||||
|
---
|
||||||
|
## [1.6.621] – 2025-07-22
|
||||||
|
|
||||||
|
- feat(AnalogInputsChart): Zeitraum im DatePicker und Redux initialisieren und synchronisieren
|
||||||
|
|
||||||
|
- Initialwert für Zeitraum (letzte 30 Tage) im Redux-Store gesetzt
|
||||||
|
- DatePicker-Änderungen werden im Redux gespeichert
|
||||||
|
- Fetch-Button verwendet Zeitraum aus Redux und loggt die Fetch-URL
|
||||||
|
- Chart zeigt Daten entsprechend ausgewähltem Zeitraum
|
||||||
|
|
||||||
|
---
|
||||||
|
## [1.6.620] – 2025-07-22
|
||||||
|
|
||||||
|
- feat(AnalogInputsChart): Zeitraum im DatePicker und Redux initialisieren und synchronisieren
|
||||||
|
|
||||||
|
- Initialwert für Zeitraum (letzte 30 Tage) im Redux-Store gesetzt
|
||||||
|
- DatePicker-Änderungen werden im Redux gespeichert
|
||||||
|
- Fetch-Button verwendet Zeitraum aus Redux und loggt die Fetch-URL
|
||||||
|
- Chart zeigt Daten entsprechend ausgewähltem Zeitraum
|
||||||
|
|
||||||
|
---
|
||||||
|
## [1.6.619] – 2025-07-22
|
||||||
|
|
||||||
|
- feat(AnalogInputsChart): Zeitraum im DatePicker und Redux initialisieren und synchronisieren
|
||||||
|
|
||||||
|
- Initialwert für Zeitraum (letzte 30 Tage) im Redux-Store gesetzt
|
||||||
|
- DatePicker-Änderungen werden im Redux gespeichert
|
||||||
|
- Fetch-Button verwendet Zeitraum aus Redux und loggt die Fetch-URL
|
||||||
|
- Chart zeigt Daten entsprechend ausgewähltem Zeitraum
|
||||||
|
|
||||||
|
---
|
||||||
## [1.6.618] – 2025-07-21
|
## [1.6.618] – 2025-07-21
|
||||||
|
|
||||||
- feat(mock): Script fetchAnalogInputsData auf ES-Module (.mjs) umgestellt, Datum automatisch gesetzt
|
- feat(mock): Script fetchAnalogInputsData auf ES-Module (.mjs) umgestellt, Datum automatisch gesetzt
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import {
|
|||||||
} from "chart.js";
|
} from "chart.js";
|
||||||
import "chartjs-adapter-date-fns";
|
import "chartjs-adapter-date-fns";
|
||||||
import { de } from "date-fns/locale";
|
import { de } from "date-fns/locale";
|
||||||
|
import { Listbox } from "@headlessui/react";
|
||||||
import { getAnalogInputsHistoryThunk } from "@/redux/thunks/getAnalogInputsHistoryThunk";
|
import { getAnalogInputsHistoryThunk } from "@/redux/thunks/getAnalogInputsHistoryThunk";
|
||||||
import {
|
import {
|
||||||
setVonDatum,
|
setVonDatum,
|
||||||
@@ -25,10 +26,10 @@ import {
|
|||||||
setZeitraum,
|
setZeitraum,
|
||||||
setAutoLoad,
|
setAutoLoad,
|
||||||
} from "@/redux/slices/analogInputs/analogInputsHistorySlice";
|
} from "@/redux/slices/analogInputs/analogInputsHistorySlice";
|
||||||
import DateRangePicker from "@/components/common/DateRangePicker";
|
|
||||||
import { Listbox } from "@headlessui/react";
|
|
||||||
import { getColor } from "@/utils/colors";
|
import { getColor } from "@/utils/colors";
|
||||||
|
import AnalogInputsDatePicker from "./AnalogInputsDatePicker";
|
||||||
|
|
||||||
|
// ✅ Nur die Basis-ChartJS-Module registrieren
|
||||||
ChartJS.register(
|
ChartJS.register(
|
||||||
LineElement,
|
LineElement,
|
||||||
PointElement,
|
PointElement,
|
||||||
@@ -40,47 +41,38 @@ ChartJS.register(
|
|||||||
TimeScale
|
TimeScale
|
||||||
);
|
);
|
||||||
|
|
||||||
type AnalogInputHistoryPoint = {
|
|
||||||
t: string;
|
|
||||||
m?: number;
|
|
||||||
i?: number;
|
|
||||||
a?: number;
|
|
||||||
g?: number;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default function AnalogInputsChart() {
|
export default function AnalogInputsChart() {
|
||||||
useEffect(() => {
|
|
||||||
const loadZoomPlugin = async () => {
|
|
||||||
const zoomPlugin = (await import("chartjs-plugin-zoom")).default;
|
|
||||||
if (!ChartJS.registry.plugins.get("zoom")) {
|
|
||||||
ChartJS.register(zoomPlugin);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
loadZoomPlugin();
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
const dispatch = useDispatch<AppDispatch>();
|
const dispatch = useDispatch<AppDispatch>();
|
||||||
const chartRef = useRef<any>(null);
|
const chartRef = useRef<Line | null>(null);
|
||||||
|
|
||||||
|
// Redux Werte für Chart-Daten
|
||||||
const { zeitraum, vonDatum, bisDatum, data, autoLoad, selectedId } =
|
const { zeitraum, vonDatum, bisDatum, data, autoLoad, selectedId } =
|
||||||
useSelector((state: RootState) => state.analogInputsHistory);
|
useSelector((state: RootState) => state.analogInputsHistory);
|
||||||
const selectedAnalogInput = useSelector(
|
const selectedAnalogInput = useSelector(
|
||||||
(state: RootState) => state.selectedAnalogInput
|
(state: RootState) => state.selectedAnalogInput
|
||||||
);
|
);
|
||||||
const [localZeitraum, setLocalZeitraum] = React.useState(zeitraum);
|
|
||||||
|
|
||||||
// Synchronisiere lokalen State, wenn Redux-Value sich ändert (z.B. nach Reset)
|
// Redux initiale Datum-Werte
|
||||||
React.useEffect(() => {
|
|
||||||
setLocalZeitraum(zeitraum);
|
|
||||||
}, [zeitraum]);
|
|
||||||
|
|
||||||
// Initialisiere Zeitraum im Redux-Store, falls leer
|
|
||||||
const vonDatumRedux = useSelector(
|
const vonDatumRedux = useSelector(
|
||||||
(state: RootState) => state.dateRangePicker.vonDatum
|
(state: RootState) => state.dateRangePicker.vonDatum
|
||||||
);
|
);
|
||||||
const bisDatumRedux = useSelector(
|
const bisDatumRedux = useSelector(
|
||||||
(state: RootState) => state.dateRangePicker.bisDatum
|
(state: RootState) => state.dateRangePicker.bisDatum
|
||||||
);
|
);
|
||||||
|
|
||||||
|
// ✅ Lokale States für Picker + Zeitraum
|
||||||
|
const [localVonDatum, setLocalVonDatum] = React.useState(vonDatumRedux || "");
|
||||||
|
const [localBisDatum, setLocalBisDatum] = React.useState(bisDatumRedux || "");
|
||||||
|
const [localZeitraum, setLocalZeitraum] = React.useState(zeitraum);
|
||||||
|
|
||||||
|
// Synchronisiere lokale Werte mit Redux (z.B. nach AutoLoad Reset)
|
||||||
|
useEffect(() => {
|
||||||
|
setLocalVonDatum(vonDatumRedux || "");
|
||||||
|
setLocalBisDatum(bisDatumRedux || "");
|
||||||
|
setLocalZeitraum(zeitraum);
|
||||||
|
}, [vonDatumRedux, bisDatumRedux, zeitraum]);
|
||||||
|
|
||||||
|
// Initiale Default-Werte: 30 Tage zurück
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!vonDatumRedux || !bisDatumRedux) {
|
if (!vonDatumRedux || !bisDatumRedux) {
|
||||||
const today = new Date();
|
const today = new Date();
|
||||||
@@ -88,269 +80,200 @@ export default function AnalogInputsChart() {
|
|||||||
const fromDateObj = new Date(today);
|
const fromDateObj = new Date(today);
|
||||||
fromDateObj.setDate(today.getDate() - 30);
|
fromDateObj.setDate(today.getDate() - 30);
|
||||||
const fromDate = fromDateObj.toISOString().slice(0, 10);
|
const fromDate = fromDateObj.toISOString().slice(0, 10);
|
||||||
dispatch(setVonDatum(fromDate));
|
setLocalVonDatum(fromDate);
|
||||||
dispatch(setBisDatum(toDate));
|
setLocalBisDatum(toDate);
|
||||||
}
|
}
|
||||||
}, [vonDatumRedux, bisDatumRedux, dispatch]);
|
}, []);
|
||||||
|
|
||||||
// ✅ Button-Klick → Fetch auslösen
|
// ✅ Nur lokale Änderung beim Picker
|
||||||
|
const handleDateChange = (from: string, to: string) => {
|
||||||
|
setLocalVonDatum(from);
|
||||||
|
setLocalBisDatum(to);
|
||||||
|
};
|
||||||
|
|
||||||
|
// ✅ Button → Redux + Fetch triggern
|
||||||
const handleFetchData = () => {
|
const handleFetchData = () => {
|
||||||
if (!selectedAnalogInput?.id) return;
|
if (!selectedAnalogInput?.id) return;
|
||||||
// Zeitraum aus Redux holen
|
|
||||||
const latestVonDatum =
|
// Redux aktualisieren
|
||||||
vonDatumRedux || new Date().toISOString().slice(0, 10);
|
dispatch(setVonDatum(localVonDatum));
|
||||||
const latestBisDatum =
|
dispatch(setBisDatum(localBisDatum));
|
||||||
bisDatumRedux || new Date().toISOString().slice(0, 10);
|
|
||||||
dispatch(setZeitraum(localZeitraum));
|
dispatch(setZeitraum(localZeitraum));
|
||||||
// Debug: Fetch-URL loggen
|
|
||||||
const debugUrl = `/api/cpl/getAnalogInputsHistory?eingang=${selectedAnalogInput.id}&zeitraum=${localZeitraum}&von=${latestVonDatum}&bis=${latestBisDatum}`;
|
// Debug anzeigen
|
||||||
console.log("Fetch-URL:", debugUrl);
|
console.log(
|
||||||
|
"Fetch-URL:",
|
||||||
|
`/api/cpl/getAnalogInputsHistory?eingang=${selectedAnalogInput.id}&zeitraum=${localZeitraum}&von=${localVonDatum}&bis=${localBisDatum}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Thunk-Fetch mit neuen Werten
|
||||||
dispatch(
|
dispatch(
|
||||||
getAnalogInputsHistoryThunk({
|
getAnalogInputsHistoryThunk({
|
||||||
eingang: selectedAnalogInput.id,
|
eingang: selectedAnalogInput.id,
|
||||||
zeitraum: localZeitraum,
|
zeitraum: localZeitraum,
|
||||||
vonDatum: latestVonDatum,
|
vonDatum: localVonDatum,
|
||||||
bisDatum: latestBisDatum,
|
bisDatum: localBisDatum,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
if (
|
|
||||||
chartRef.current &&
|
|
||||||
chartRef.current.options &&
|
|
||||||
chartRef.current.options.scales &&
|
|
||||||
chartRef.current.options.scales.x
|
|
||||||
) {
|
|
||||||
const chart = chartRef.current;
|
|
||||||
chart.options.scales.x.min = new Date(latestVonDatum).getTime();
|
|
||||||
chart.options.scales.x.max = new Date(latestBisDatum).getTime();
|
|
||||||
|
|
||||||
// Aktualisiere die Daten des Diagramms
|
|
||||||
const chartKey = selectedAnalogInput?.id
|
|
||||||
? String(selectedAnalogInput.id + 99)
|
|
||||||
: null;
|
|
||||||
const inputData = chartKey ? data[chartKey] ?? [] : [];
|
|
||||||
const filteredData = inputData.filter((point) => {
|
|
||||||
const date = new Date(point.t);
|
|
||||||
const from = new Date(latestVonDatum);
|
|
||||||
const to = new Date(latestBisDatum);
|
|
||||||
return (!from || date >= from) && (!to || date <= to);
|
|
||||||
});
|
|
||||||
|
|
||||||
chart.data.datasets = [
|
|
||||||
{
|
|
||||||
label: selectedAnalogInput?.label
|
|
||||||
? `Messwerteingang ${selectedAnalogInput.label}`
|
|
||||||
: "Messwerte",
|
|
||||||
data: filteredData.map((point) => ({
|
|
||||||
x: new Date(point.t),
|
|
||||||
y: point.m,
|
|
||||||
})),
|
|
||||||
fill: false,
|
|
||||||
borderColor: getColor("littwin-blue"),
|
|
||||||
backgroundColor: "rgba(59,130,246,0.3)",
|
|
||||||
borderWidth: 2,
|
|
||||||
pointRadius: 0,
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
chart.update("none");
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// ✅ Filtere Daten aus Redux
|
// ✅ Chart-Daten aus Redux filtern (Chart reagiert nur nach Button)
|
||||||
const chartKey = selectedAnalogInput?.id
|
const chartKey = selectedAnalogInput?.id
|
||||||
? String(selectedAnalogInput.id + 99)
|
? String(selectedAnalogInput.id + 99)
|
||||||
: null;
|
: null;
|
||||||
const inputData = chartKey ? data[chartKey] ?? [] : [];
|
const inputData = chartKey ? data[chartKey] ?? [] : [];
|
||||||
// ✅ Zeitbereich anwenden (nur Anzeige gefiltert)
|
|
||||||
const filteredData = inputData.filter((point) => {
|
const filteredData = inputData.filter((point) => {
|
||||||
const date = new Date(point.t);
|
const date = new Date(point.t);
|
||||||
const from = vonDatumRedux ? new Date(vonDatumRedux) : null;
|
const from = vonDatumRedux ? new Date(vonDatumRedux) : null;
|
||||||
const to = bisDatumRedux ? new Date(bisDatumRedux) : null;
|
const to = bisDatumRedux ? new Date(bisDatumRedux) : null;
|
||||||
return (!from || date >= from) && (!to || date <= to);
|
return (!from || date >= from) && (!to || date <= to);
|
||||||
});
|
});
|
||||||
useEffect(() => {
|
|
||||||
const today = new Date();
|
|
||||||
const vor30Tagen = new Date(today);
|
|
||||||
vor30Tagen.setDate(today.getDate() - 30);
|
|
||||||
|
|
||||||
if (!vonDatum) dispatch(setVonDatum(vor30Tagen.toISOString().slice(0, 10)));
|
const memoizedChartData = React.useMemo(() => {
|
||||||
if (!bisDatum) dispatch(setBisDatum(today.toISOString().slice(0, 10)));
|
return {
|
||||||
}, [dispatch, vonDatum, bisDatum]);
|
datasets:
|
||||||
|
filteredData.length > 0
|
||||||
|
? zeitraum === "DIA0"
|
||||||
|
? [
|
||||||
|
{
|
||||||
|
label: selectedAnalogInput?.label
|
||||||
|
? `Messwert (m) ${selectedAnalogInput.label}`
|
||||||
|
: "Messwert (m)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.m === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.m })),
|
||||||
|
borderColor: getColor("littwin-blue"),
|
||||||
|
backgroundColor: "rgba(59,130,246,0.3)",
|
||||||
|
borderWidth: 2,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Minimum (i)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.i === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.i })),
|
||||||
|
borderColor: "gray",
|
||||||
|
borderDash: [4, 2],
|
||||||
|
borderWidth: 1,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Maximum (a)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.a === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.a })),
|
||||||
|
borderColor: "gray",
|
||||||
|
borderDash: [4, 2],
|
||||||
|
borderWidth: 1,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: [
|
||||||
|
{
|
||||||
|
label: "Minimum (i)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.i === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.i })),
|
||||||
|
borderColor: "gray",
|
||||||
|
borderDash: [4, 2],
|
||||||
|
borderWidth: 1,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Maximum (a)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.a === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.a })),
|
||||||
|
borderColor: "gray",
|
||||||
|
borderDash: [4, 2],
|
||||||
|
borderWidth: 1,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Durchschnitt (g)",
|
||||||
|
data: filteredData
|
||||||
|
.filter((p) => typeof p.g === "number")
|
||||||
|
.map((p) => ({ x: new Date(p.t), y: p.g })),
|
||||||
|
borderColor: getColor("littwin-blue"),
|
||||||
|
backgroundColor: "rgba(59,130,246,0.3)",
|
||||||
|
borderWidth: 2,
|
||||||
|
pointRadius: 0,
|
||||||
|
tension: 0.1,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: [],
|
||||||
|
};
|
||||||
|
}, [filteredData, zeitraum, selectedAnalogInput]);
|
||||||
|
|
||||||
const handleFetchChartData = () => {
|
const memoizedChartOptions = React.useMemo(() => {
|
||||||
if (!selectedId) return;
|
return {
|
||||||
dispatch(
|
responsive: true,
|
||||||
getAnalogInputsHistoryThunk({
|
plugins: {
|
||||||
eingang: selectedId,
|
legend: { position: "top" as const },
|
||||||
zeitraum,
|
tooltip: {
|
||||||
vonDatum,
|
mode: "index" as const,
|
||||||
bisDatum,
|
intersect: false,
|
||||||
})
|
callbacks: {
|
||||||
);
|
label: (context: TooltipItem<"line">) => {
|
||||||
};
|
const label = context.dataset.label || "";
|
||||||
|
return `${label}: ${context.parsed.y}`;
|
||||||
const dataKey = selectedId ? String(selectedId + 99) : null;
|
},
|
||||||
let filteredPoints: AnalogInputHistoryPoint[] = [];
|
title: (items: TooltipItem<"line">[]) => {
|
||||||
if (dataKey && data[dataKey]) {
|
const date = items[0].parsed.x;
|
||||||
const fromDate = vonDatum ? new Date(vonDatum) : null;
|
return `Zeitpunkt: ${new Date(date).toLocaleString("de-DE")}`;
|
||||||
const toDate = bisDatum ? new Date(bisDatum) : null;
|
},
|
||||||
|
|
||||||
filteredPoints = data[dataKey].filter((p: AnalogInputHistoryPoint) => {
|
|
||||||
const pointDate = new Date(p.t);
|
|
||||||
return (
|
|
||||||
(!fromDate || pointDate >= fromDate) && (!toDate || pointDate <= toDate)
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
const chartData = {
|
|
||||||
datasets:
|
|
||||||
filteredPoints.length > 0
|
|
||||||
? zeitraum === "DIA0"
|
|
||||||
? [
|
|
||||||
{
|
|
||||||
label: selectedAnalogInput?.label
|
|
||||||
? `Messwert (m) ${selectedAnalogInput.label}`
|
|
||||||
: "Messwert (m)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.m === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.m })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: getColor("littwin-blue"),
|
|
||||||
backgroundColor: "rgba(59,130,246,0.3)",
|
|
||||||
borderWidth: 2,
|
|
||||||
pointRadius: 0,
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Minimum (i)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.i === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.i })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: "gray", // grau
|
|
||||||
borderWidth: 1,
|
|
||||||
pointRadius: 0,
|
|
||||||
borderDash: [4, 2],
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Maximum (a)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.a === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.a })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: "gray", // rot
|
|
||||||
borderWidth: 1,
|
|
||||||
pointRadius: 0,
|
|
||||||
borderDash: [4, 2],
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: [
|
|
||||||
{
|
|
||||||
label: "Minimum (i)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.i === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.i })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: "gray", // grün
|
|
||||||
borderWidth: 1,
|
|
||||||
pointRadius: 0,
|
|
||||||
borderDash: [4, 2],
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Maximum (a)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.a === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.a })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: "gray", // rot
|
|
||||||
borderWidth: 1,
|
|
||||||
pointRadius: 0,
|
|
||||||
borderDash: [4, 2],
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: "Durchschnitt (g)",
|
|
||||||
data: filteredData
|
|
||||||
.filter((point) => typeof point.g === "number")
|
|
||||||
.map((point) => ({ x: new Date(point.t), y: point.g })),
|
|
||||||
fill: false,
|
|
||||||
borderColor: getColor("littwin-blue"),
|
|
||||||
backgroundColor: "rgba(59,130,246,0.3)",
|
|
||||||
borderWidth: 2,
|
|
||||||
pointRadius: 0,
|
|
||||||
tension: 0.1,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
: [],
|
|
||||||
};
|
|
||||||
|
|
||||||
const chartOptions = {
|
|
||||||
responsive: true,
|
|
||||||
plugins: {
|
|
||||||
legend: { position: "top" as const },
|
|
||||||
tooltip: {
|
|
||||||
mode: "index" as const,
|
|
||||||
intersect: false,
|
|
||||||
callbacks: {
|
|
||||||
label: function (context: TooltipItem<"line">) {
|
|
||||||
const label = context.dataset.label || "";
|
|
||||||
return `${label}: ${context.parsed.y}`;
|
|
||||||
},
|
|
||||||
title: function (tooltipItems: TooltipItem<"line">[]) {
|
|
||||||
const date = tooltipItems[0].parsed.x;
|
|
||||||
return `Zeitpunkt: ${new Date(date).toLocaleString("de-DE")}`;
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
|
||||||
title: {
|
|
||||||
display: true,
|
|
||||||
text: selectedAnalogInput?.label
|
|
||||||
? `Verlauf: ${selectedAnalogInput.label}`
|
|
||||||
: "Messwert-Verlauf",
|
|
||||||
},
|
|
||||||
zoom: {
|
|
||||||
pan: { enabled: true, mode: "x" as const },
|
|
||||||
zoom: {
|
|
||||||
wheel: { enabled: true },
|
|
||||||
pinch: { enabled: true },
|
|
||||||
mode: "x" as const,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
scales: {
|
|
||||||
x: {
|
|
||||||
type: "time" as const,
|
|
||||||
time: {
|
|
||||||
unit: "day" as const,
|
|
||||||
tooltipFormat: "dd.MM.yyyy HH:mm",
|
|
||||||
displayFormats: {
|
|
||||||
day: "dd.MM.yyyy",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
adapters: { date: { locale: de } },
|
|
||||||
title: { display: true, text: "Zeit" },
|
|
||||||
// ✅ Hier definieren wir den sichtbaren Bereich dynamisch
|
|
||||||
min: vonDatum ? new Date(vonDatum).getTime() : undefined,
|
|
||||||
max: bisDatum ? new Date(bisDatum).getTime() : undefined,
|
|
||||||
},
|
|
||||||
y: {
|
|
||||||
title: {
|
title: {
|
||||||
display: true,
|
display: true,
|
||||||
text: `Messwert ${selectedAnalogInput?.unit || ""}`,
|
text: selectedAnalogInput?.label
|
||||||
|
? `Verlauf: ${selectedAnalogInput.label}`
|
||||||
|
: "Messwert-Verlauf",
|
||||||
|
},
|
||||||
|
zoom: {
|
||||||
|
pan: {
|
||||||
|
enabled: true,
|
||||||
|
mode: "x",
|
||||||
|
},
|
||||||
|
zoom: {
|
||||||
|
wheel: { enabled: true },
|
||||||
|
pinch: { enabled: true },
|
||||||
|
mode: "x",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
scales: {
|
||||||
};
|
x: {
|
||||||
// DateRangePicker Event → Redux-Datum setzen (aber KEIN Fetch!)
|
type: "time" as const,
|
||||||
const handleDateChange = (from: string, to: string) => {
|
time: {
|
||||||
dispatch(setVonDatum(from));
|
unit: "day" as const,
|
||||||
dispatch(setBisDatum(to));
|
tooltipFormat: "dd.MM.yyyy HH:mm",
|
||||||
};
|
displayFormats: {
|
||||||
|
day: "dd.MM.yyyy",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
adapters: { date: { locale: de } },
|
||||||
|
title: { display: true, text: "Zeit" },
|
||||||
|
min: vonDatum ? new Date(vonDatum).getTime() : undefined,
|
||||||
|
max: bisDatum ? new Date(bisDatum).getTime() : undefined,
|
||||||
|
},
|
||||||
|
y: {
|
||||||
|
title: {
|
||||||
|
display: true,
|
||||||
|
text: `Messwert ${selectedAnalogInput?.unit || ""}`,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}, [vonDatum, bisDatum, selectedAnalogInput]);
|
||||||
|
|
||||||
|
// ✅ AutoLoad nur beim ersten Laden
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (autoLoad && selectedId) {
|
if (autoLoad && selectedId) {
|
||||||
dispatch(
|
dispatch(
|
||||||
@@ -361,15 +284,30 @@ export default function AnalogInputsChart() {
|
|||||||
bisDatum,
|
bisDatum,
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
dispatch(setAutoLoad(false)); // ✅ zurücksetzen, sonst endlose Schleife
|
dispatch(setAutoLoad(false));
|
||||||
}
|
}
|
||||||
}, [autoLoad, selectedId, dispatch, zeitraum, vonDatum, bisDatum]);
|
}, [autoLoad, selectedId, dispatch, zeitraum, vonDatum, bisDatum]);
|
||||||
|
|
||||||
|
// Dynamisches Importieren von chartjs-plugin-zoom nur im Browser
|
||||||
|
useEffect(() => {
|
||||||
|
if (typeof window !== "undefined") {
|
||||||
|
import("chartjs-plugin-zoom").then((module) => {
|
||||||
|
ChartJS.register(module.default);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col gap-3">
|
<div className="flex flex-col gap-3">
|
||||||
<div className="flex flex-wrap items-center gap-4 mb-2">
|
<div className="flex flex-wrap items-center gap-4 mb-2">
|
||||||
<DateRangePicker />
|
{/* ✅ Neuer DatePicker mit schönem Styling (lokal, ohne Redux) */}
|
||||||
|
<AnalogInputsDatePicker
|
||||||
|
from={localVonDatum}
|
||||||
|
to={localBisDatum}
|
||||||
|
onChange={handleDateChange}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{/* ✅ Zeitraum-Auswahl (Listbox nur lokal) */}
|
||||||
<Listbox value={localZeitraum} onChange={setLocalZeitraum}>
|
<Listbox value={localZeitraum} onChange={setLocalZeitraum}>
|
||||||
<div className="relative w-48">
|
<div className="relative w-48">
|
||||||
<Listbox.Button className="w-full border px-3 py-1 rounded bg-white flex justify-between items-center text-sm">
|
<Listbox.Button className="w-full border px-3 py-1 rounded bg-white flex justify-between items-center text-sm">
|
||||||
@@ -400,6 +338,7 @@ export default function AnalogInputsChart() {
|
|||||||
</div>
|
</div>
|
||||||
</Listbox>
|
</Listbox>
|
||||||
|
|
||||||
|
{/* ✅ Button: lädt die Daten & aktualisiert Redux */}
|
||||||
<button
|
<button
|
||||||
onClick={handleFetchData}
|
onClick={handleFetchData}
|
||||||
className="px-4 py-1 bg-littwin-blue text-white rounded text-sm"
|
className="px-4 py-1 bg-littwin-blue text-white rounded text-sm"
|
||||||
@@ -408,20 +347,21 @@ export default function AnalogInputsChart() {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Chart-Anzeige */}
|
||||||
<div className="h-[50vh] w-full">
|
<div className="h-[50vh] w-full">
|
||||||
{!selectedAnalogInput?.id ? (
|
{!selectedAnalogInput?.id ? (
|
||||||
<div className="flex items-center justify-center h-full text-gray-500 text-lg gap-2">
|
<div className="flex items-center justify-center h-full text-gray-500 text-lg gap-2">
|
||||||
<i
|
<i className="bi bi-info-circle text-2xl mr-2" />
|
||||||
className="bi bi-info-circle text-2xl mr-2"
|
|
||||||
aria-hidden="true"
|
|
||||||
></i>
|
|
||||||
<span>
|
<span>
|
||||||
Bitte wählen Sie einen Eingang aus von der Tabelle, um die
|
Bitte wählen Sie einen Eingang aus, um die Messkurve anzuzeigen
|
||||||
Messkurve anzuzeigen
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<Line ref={chartRef} data={chartData} options={chartOptions} />
|
<Line
|
||||||
|
ref={chartRef}
|
||||||
|
data={memoizedChartData}
|
||||||
|
options={memoizedChartOptions}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
93
components/main/analogInputs/AnalogInputsDatePicker.tsx
Normal file
93
components/main/analogInputs/AnalogInputsDatePicker.tsx
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
"use client";
|
||||||
|
// components/main/analogInputs/AnalogInputsDatePicker.tsx
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import DatePicker from "react-datepicker";
|
||||||
|
import "react-datepicker/dist/react-datepicker.css";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
from: string;
|
||||||
|
to: string;
|
||||||
|
onChange: (from: string, to: string) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default function AnalogInputsDatePicker({ from, to, onChange }: Props) {
|
||||||
|
const today = new Date();
|
||||||
|
|
||||||
|
const thirtyDaysAgo = new Date();
|
||||||
|
thirtyDaysAgo.setDate(today.getDate() - 30);
|
||||||
|
|
||||||
|
const sixMonthsAgo = new Date();
|
||||||
|
sixMonthsAgo.setMonth(today.getMonth() - 6);
|
||||||
|
|
||||||
|
// interne Date-Objekte für react-datepicker
|
||||||
|
const parseISO = (dateStr: string) => {
|
||||||
|
if (!dateStr) return null;
|
||||||
|
const [year, month, day] = dateStr.split("-").map(Number);
|
||||||
|
return new Date(year, month - 1, day);
|
||||||
|
};
|
||||||
|
|
||||||
|
const formatISO = (date: Date) => date.toLocaleDateString("sv-SE"); // yyyy-MM-dd
|
||||||
|
|
||||||
|
const [localFromDate, setLocalFromDate] = useState<Date | null>(
|
||||||
|
from ? parseISO(from) : thirtyDaysAgo
|
||||||
|
);
|
||||||
|
const [localToDate, setLocalToDate] = useState<Date | null>(
|
||||||
|
to ? parseISO(to) : today
|
||||||
|
);
|
||||||
|
|
||||||
|
// Wenn Props von außen kommen (z.B. Reset), synchronisieren
|
||||||
|
useEffect(() => {
|
||||||
|
if (from) setLocalFromDate(parseISO(from));
|
||||||
|
if (to) setLocalToDate(parseISO(to));
|
||||||
|
}, [from, to]);
|
||||||
|
|
||||||
|
const handleFromChange = (date: Date | null) => {
|
||||||
|
setLocalFromDate(date);
|
||||||
|
if (date && localToDate) {
|
||||||
|
onChange(formatISO(date), formatISO(localToDate));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleToChange = (date: Date | null) => {
|
||||||
|
setLocalToDate(date);
|
||||||
|
if (localFromDate && date) {
|
||||||
|
onChange(formatISO(localFromDate), formatISO(date));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex space-x-4 items-center">
|
||||||
|
{/* Von */}
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<label className="block text-sm font-semibold">Von</label>
|
||||||
|
<DatePicker
|
||||||
|
selected={localFromDate}
|
||||||
|
onChange={handleFromChange}
|
||||||
|
selectsStart
|
||||||
|
startDate={localFromDate}
|
||||||
|
endDate={localToDate}
|
||||||
|
minDate={sixMonthsAgo}
|
||||||
|
maxDate={today}
|
||||||
|
dateFormat="dd.MM.yyyy"
|
||||||
|
className="border px-2 py-1 rounded"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Bis */}
|
||||||
|
<div className="flex items-center space-x-2">
|
||||||
|
<label className="block text-sm font-semibold">Bis</label>
|
||||||
|
<DatePicker
|
||||||
|
selected={localToDate}
|
||||||
|
onChange={handleToChange}
|
||||||
|
selectsEnd
|
||||||
|
startDate={localFromDate}
|
||||||
|
endDate={localToDate}
|
||||||
|
minDate={sixMonthsAgo}
|
||||||
|
maxDate={today}
|
||||||
|
dateFormat="dd.MM.yyyy"
|
||||||
|
className="border px-2 py-1 rounded"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.618",
|
"version": "1.6.623",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.618",
|
"version": "1.6.623",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fontsource/roboto": "^5.1.0",
|
"@fontsource/roboto": "^5.1.0",
|
||||||
"@headlessui/react": "^2.2.4",
|
"@headlessui/react": "^2.2.4",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.618",
|
"version": "1.6.623",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user