refactor: Umbenennung von 'chartData' in Redux kabelueberwachung Slice zu 'loopMeasurementCurveChartData' für bessere Klarheit
Die Variable 'chartData' wurde in 'loopMeasurementCurveChartData' umbenannt, um den Inhalt und Zweck der Daten klarer zu definieren. Diese Änderung verbessert die Lesbarkeit und Wartbarkeit des Codes, indem sie die Bedeutung der Variablen präziser beschreibt.
This commit is contained in:
@@ -17,7 +17,7 @@ interface ChartSwitcherProps {
|
|||||||
const ChartSwitcher: React.FC<ChartSwitcherProps> = ({ isOpen, onClose }) => {
|
const ChartSwitcher: React.FC<ChartSwitcherProps> = ({ isOpen, onClose }) => {
|
||||||
const dispatch = useDispatch();
|
const dispatch = useDispatch();
|
||||||
const activeMode = useSelector(
|
const activeMode = useSelector(
|
||||||
(state: RootState) => state.chartData.activeMode
|
(state: RootState) => state.loopMeasurementCurveChartData.activeMode
|
||||||
);
|
);
|
||||||
|
|
||||||
// **Neue Funktion: Modal schließen + Redux-Status zurücksetzen**
|
// **Neue Funktion: Modal schließen + Redux-Status zurücksetzen**
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import { RootState } from "../../../../../../redux/store";
|
|||||||
import {
|
import {
|
||||||
setVonDatum,
|
setVonDatum,
|
||||||
setBisDatum,
|
setBisDatum,
|
||||||
setChartData,
|
setLoopMeasurementCurveChartData,
|
||||||
setSelectedMode,
|
setSelectedMode,
|
||||||
setSelectedSlotType,
|
setSelectedSlotType,
|
||||||
setChartOpen,
|
setChartOpen,
|
||||||
@@ -74,7 +74,7 @@ const LoopChartActionBar: React.FC = () => {
|
|||||||
console.log("✅ Daten erfolgreich geladen:", jsonData);
|
console.log("✅ Daten erfolgreich geladen:", jsonData);
|
||||||
|
|
||||||
if (Array.isArray(jsonData)) {
|
if (Array.isArray(jsonData)) {
|
||||||
dispatch(setChartData(jsonData));
|
dispatch(setLoopMeasurementCurveChartData(jsonData));
|
||||||
|
|
||||||
// Falls das Chart zum ersten Mal geöffnet wird, setze vonDatum & bisDatum
|
// Falls das Chart zum ersten Mal geöffnet wird, setze vonDatum & bisDatum
|
||||||
if (!isChartOpen && jsonData.length > 0) {
|
if (!isChartOpen && jsonData.length > 0) {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ const LoopMeasurementChart = () => {
|
|||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
// Daten & Datum aus Redux abrufen
|
// Daten & Datum aus Redux abrufen
|
||||||
const { chartData, vonDatum, bisDatum } = useSelector(
|
const { loopMeasurementCurveChartData, vonDatum, bisDatum } = useSelector(
|
||||||
(state: RootState) => state.kabelueberwachungChart
|
(state: RootState) => state.kabelueberwachungChart
|
||||||
);
|
);
|
||||||
const selectedMode = useSelector(
|
const selectedMode = useSelector(
|
||||||
@@ -33,12 +33,12 @@ const LoopMeasurementChart = () => {
|
|||||||
chartInstance.current.destroy();
|
chartInstance.current.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log("Chart Data:", chartData);
|
console.log("Chart Data:", loopMeasurementCurveChartData);
|
||||||
console.log("Von Datum:", vonDatum, "Bis Datum:", bisDatum);
|
console.log("Von Datum:", vonDatum, "Bis Datum:", bisDatum);
|
||||||
console.log("Selected Mode:", selectedMode);
|
console.log("Selected Mode:", selectedMode);
|
||||||
|
|
||||||
// Daten filtern basierend auf vonDatum und bisDatum
|
// Daten filtern basierend auf vonDatum und bisDatum
|
||||||
const filteredData = chartData.filter((entry) => {
|
const filteredData = loopMeasurementCurveChartData.filter((entry) => {
|
||||||
const timestampMs = new Date(entry.t).getTime();
|
const timestampMs = new Date(entry.t).getTime();
|
||||||
return (
|
return (
|
||||||
timestampMs >= new Date(vonDatum).getTime() &&
|
timestampMs >= new Date(vonDatum).getTime() &&
|
||||||
@@ -167,7 +167,7 @@ const LoopMeasurementChart = () => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [chartData, vonDatum, bisDatum, selectedMode]);
|
}, [loopMeasurementCurveChartData, vonDatum, bisDatum, selectedMode]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div style={{ position: "relative", width: "100%", height: "400px" }}>
|
<div style={{ position: "relative", width: "100%", height: "400px" }}>
|
||||||
|
|||||||
@@ -9,14 +9,16 @@ const TDRChart: React.FC = () => {
|
|||||||
const chartInstance = useRef<Chart | null>(null);
|
const chartInstance = useRef<Chart | null>(null);
|
||||||
|
|
||||||
// TDR-Daten aus dem Redux Store selektieren
|
// TDR-Daten aus dem Redux Store selektieren
|
||||||
const chartData = useSelector((state: any) => state.tdrChartData.data);
|
const loopMeasurementCurveChartData = useSelector(
|
||||||
|
(state: any) => state.tdrChartData.data
|
||||||
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Importiere und registriere das Zoom-Plugin innerhalb des useEffect-Hooks
|
// Importiere und registriere das Zoom-Plugin innerhalb des useEffect-Hooks
|
||||||
import("chartjs-plugin-zoom").then((zoomPlugin) => {
|
import("chartjs-plugin-zoom").then((zoomPlugin) => {
|
||||||
Chart.register(...registerables, zoomPlugin.default);
|
Chart.register(...registerables, zoomPlugin.default);
|
||||||
|
|
||||||
if (chartRef.current && chartData.length > 0) {
|
if (chartRef.current && loopMeasurementCurveChartData.length > 0) {
|
||||||
if (chartInstance.current) {
|
if (chartInstance.current) {
|
||||||
chartInstance.current.destroy();
|
chartInstance.current.destroy();
|
||||||
}
|
}
|
||||||
@@ -29,7 +31,7 @@ const TDRChart: React.FC = () => {
|
|||||||
datasets: [
|
datasets: [
|
||||||
{
|
{
|
||||||
label: "TDR Entfernung (km)",
|
label: "TDR Entfernung (km)",
|
||||||
data: chartData,
|
data: loopMeasurementCurveChartData,
|
||||||
borderColor: "rgba(255, 99, 132, 1)",
|
borderColor: "rgba(255, 99, 132, 1)",
|
||||||
backgroundColor: "rgba(255, 99, 132, 0.2)",
|
backgroundColor: "rgba(255, 99, 132, 0.2)",
|
||||||
tension: 0.1,
|
tension: 0.1,
|
||||||
@@ -80,7 +82,7 @@ const TDRChart: React.FC = () => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, [chartData]);
|
}, [loopMeasurementCurveChartData]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import React, { useState, useEffect, useRef } from "react";
|
import React, { useState, useEffect, useRef } from "react";
|
||||||
import DateRangePicker from "../DateRangePicker";
|
import DateRangePicker from "../DateRangePicker";
|
||||||
import TDRChart from "../../../../kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart";
|
import TDRChart from "../../../../kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart";
|
||||||
import { setChartData } from "../../../../../../redux/slices/chartDataSlice";
|
import { setLoopMeasurementCurveChartData } from "../../../../../../redux/slices/chartDataSlice";
|
||||||
import { parseISO } from "date-fns";
|
import { parseISO } from "date-fns";
|
||||||
import { useDispatch } from "react-redux";
|
import { useDispatch } from "react-redux";
|
||||||
import { setTDRChartData } from "../../../../../../redux/slices/tdrChartDataSlice";
|
import { setTDRChartData } from "../../../../../../redux/slices/tdrChartDataSlice";
|
||||||
@@ -101,9 +101,8 @@ const TDRChartActionBar: React.FC = () => {
|
|||||||
const chartRef = useRef<HTMLCanvasElement>(null);
|
const chartRef = useRef<HTMLCanvasElement>(null);
|
||||||
|
|
||||||
// Zustand für die Chart-Daten
|
// Zustand für die Chart-Daten
|
||||||
const [chartData, setChartData] = useState<
|
const [loopMeasurementCurveChartData, setLoopMeasurementCurveChartData] =
|
||||||
{ timestamp: string; tdr: number }[]
|
useState<{ timestamp: string; tdr: number }[]>([]);
|
||||||
>([]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Aktuelles Jahr und Monat ermitteln
|
// Aktuelles Jahr und Monat ermitteln
|
||||||
@@ -127,7 +126,7 @@ const TDRChartActionBar: React.FC = () => {
|
|||||||
})
|
})
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
// Annahme: data ist ein Array von Objekten mit den Eigenschaften 'timestamp' und 'tdr'
|
// Annahme: data ist ein Array von Objekten mit den Eigenschaften 'timestamp' und 'tdr'
|
||||||
setChartData(data);
|
setLoopMeasurementCurveChartData(data);
|
||||||
})
|
})
|
||||||
.catch((error) => {
|
.catch((error) => {
|
||||||
console.error("Fehler beim Abrufen der Daten:", error);
|
console.error("Fehler beim Abrufen der Daten:", error);
|
||||||
|
|||||||
@@ -73,13 +73,14 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
>(); //Test erstmal leer ohne isolationswert
|
>(); //Test erstmal leer ohne isolationswert
|
||||||
const [showModal, setShowModal] = useState(false);
|
const [showModal, setShowModal] = useState(false);
|
||||||
const [showChartModal, setShowChartModal] = useState(false);
|
const [showChartModal, setShowChartModal] = useState(false);
|
||||||
const [chartData, setChartData] = useState(null);
|
const [loopMeasurementCurveChartData, setLoopMeasurementCurveChartData] =
|
||||||
|
useState(null);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (chartData) {
|
if (loopMeasurementCurveChartData) {
|
||||||
dispatch(setSelectedChartData(chartData));
|
dispatch(setSelectedChartData(loopMeasurementCurveChartData));
|
||||||
}
|
}
|
||||||
}, [chartData, dispatch]); // Führe dispatch nur aus, wenn chartData sich ändert
|
}, [loopMeasurementCurveChartData, dispatch]); // Führe dispatch nur aus, wenn loopMeasurementCurveChartData sich ändert
|
||||||
|
|
||||||
// Redux-Variablen abrufen
|
// Redux-Variablen abrufen
|
||||||
const {
|
const {
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ const initialState: ChartDataState = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
export const chartDataSlice = createSlice({
|
export const chartDataSlice = createSlice({
|
||||||
name: "chartData",
|
name: "loopMeasurementCurveChartData",
|
||||||
initialState,
|
initialState,
|
||||||
reducers: {
|
reducers: {
|
||||||
setChartData: (state, action: PayloadAction<any[]>) => {
|
setLoopMeasurementCurveChartData: (state, action: PayloadAction<any[]>) => {
|
||||||
state.data = action.payload;
|
state.data = action.payload;
|
||||||
},
|
},
|
||||||
clearChartData: (state) => {
|
clearChartData: (state) => {
|
||||||
@@ -26,6 +26,9 @@ export const chartDataSlice = createSlice({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
export const { setChartData, clearChartData, setActiveMode } =
|
export const {
|
||||||
chartDataSlice.actions;
|
setLoopMeasurementCurveChartData,
|
||||||
|
clearChartData,
|
||||||
|
setActiveMode,
|
||||||
|
} = chartDataSlice.actions;
|
||||||
export default chartDataSlice.reducer;
|
export default chartDataSlice.reducer;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
||||||
|
|
||||||
interface KabelueberwachungChartState {
|
interface KabelueberwachungChartState {
|
||||||
chartData: any[];
|
loopMeasurementCurveChartData: any[];
|
||||||
vonDatum: string;
|
vonDatum: string;
|
||||||
bisDatum: string;
|
bisDatum: string;
|
||||||
selectedMode: "DIA0" | "DIA1" | "DIA2";
|
selectedMode: "DIA0" | "DIA1" | "DIA2";
|
||||||
@@ -11,7 +11,7 @@ interface KabelueberwachungChartState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const initialState: KabelueberwachungChartState = {
|
const initialState: KabelueberwachungChartState = {
|
||||||
chartData: [],
|
loopMeasurementCurveChartData: [],
|
||||||
vonDatum: "2025-02-01",
|
vonDatum: "2025-02-01",
|
||||||
bisDatum: "2025-02-28",
|
bisDatum: "2025-02-28",
|
||||||
selectedMode: "DIA0",
|
selectedMode: "DIA0",
|
||||||
@@ -27,8 +27,8 @@ const kabelueberwachungChartSlice = createSlice({
|
|||||||
setSlotNumber: (state, action: PayloadAction<number | null>) => {
|
setSlotNumber: (state, action: PayloadAction<number | null>) => {
|
||||||
state.slotNumber = action.payload;
|
state.slotNumber = action.payload;
|
||||||
},
|
},
|
||||||
setChartData: (state, action: PayloadAction<any[]>) => {
|
setLoopMeasurementCurveChartData: (state, action: PayloadAction<any[]>) => {
|
||||||
state.chartData = action.payload;
|
state.loopMeasurementCurveChartData = action.payload;
|
||||||
},
|
},
|
||||||
setVonDatum: (state, action: PayloadAction<string>) => {
|
setVonDatum: (state, action: PayloadAction<string>) => {
|
||||||
state.vonDatum = action.payload.replace(/-/g, ";"); // Speichert als "YYYY;MM;DD"
|
state.vonDatum = action.payload.replace(/-/g, ";"); // Speichert als "YYYY;MM;DD"
|
||||||
@@ -56,7 +56,7 @@ const kabelueberwachungChartSlice = createSlice({
|
|||||||
});
|
});
|
||||||
|
|
||||||
export const {
|
export const {
|
||||||
setChartData,
|
setLoopMeasurementCurveChartData,
|
||||||
setVonDatum,
|
setVonDatum,
|
||||||
setBisDatum,
|
setBisDatum,
|
||||||
setSelectedMode,
|
setSelectedMode,
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const store = configureStore({
|
|||||||
reducer: {
|
reducer: {
|
||||||
auth: authReducer,
|
auth: authReducer,
|
||||||
variables: variablesReducer,
|
variables: variablesReducer,
|
||||||
chartData: chartDataReducer,
|
loopMeasurementCurveChartData: chartDataReducer,
|
||||||
webVersion: webVersionReducer,
|
webVersion: webVersionReducer,
|
||||||
digitalInputs: digitalInputsReducer,
|
digitalInputs: digitalInputsReducer,
|
||||||
kabelueberwachungChart: kabelueberwachungChartReducer,
|
kabelueberwachungChart: kabelueberwachungChartReducer,
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { createLoopChart } from "./chartUtils";
|
|||||||
|
|
||||||
export const loadLoopChartData = (
|
export const loadLoopChartData = (
|
||||||
slotIndex: number,
|
slotIndex: number,
|
||||||
setChartData: (data: any) => void
|
setLoopMeasurementCurveChartData: (data: any) => void
|
||||||
) => {
|
) => {
|
||||||
const environment = process.env.NODE_ENV || "production";
|
const environment = process.env.NODE_ENV || "production";
|
||||||
const fileData =
|
const fileData =
|
||||||
@@ -13,7 +13,7 @@ export const loadLoopChartData = (
|
|||||||
fetch(fileData)
|
fetch(fileData)
|
||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
setChartData(data);
|
setLoopMeasurementCurveChartData(data);
|
||||||
createLoopChart(data, "Schleifenmesskurve");
|
createLoopChart(data, "Schleifenmesskurve");
|
||||||
})
|
})
|
||||||
.catch((error) =>
|
.catch((error) =>
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { createTDRChart } from "./chartUtils";
|
|||||||
|
|
||||||
export const loadTDRChartData = (
|
export const loadTDRChartData = (
|
||||||
selectedFileName: string | null,
|
selectedFileName: string | null,
|
||||||
setChartData: (data: any) => void
|
setLoopMeasurementCurveChartData: (data: any) => void
|
||||||
) => {
|
) => {
|
||||||
if (!selectedFileName) {
|
if (!selectedFileName) {
|
||||||
console.error("Kein Dateiname in Redux gespeichert.");
|
console.error("Kein Dateiname in Redux gespeichert.");
|
||||||
@@ -20,7 +20,7 @@ export const loadTDRChartData = (
|
|||||||
.then((response) => response.json())
|
.then((response) => response.json())
|
||||||
.then((data) => {
|
.then((data) => {
|
||||||
console.log("Geladene TDR-Daten:", data);
|
console.log("Geladene TDR-Daten:", data);
|
||||||
setChartData(data);
|
setLoopMeasurementCurveChartData(data);
|
||||||
createTDRChart(data);
|
createTDRChart(data);
|
||||||
})
|
})
|
||||||
.catch((error) => console.error("Fehler beim Laden der TDR-Daten:", error));
|
.catch((error) => console.error("Fehler beim Laden der TDR-Daten:", error));
|
||||||
|
|||||||
Reference in New Issue
Block a user