From f43ddccc46776e350fce959324115f23d9b76db2 Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 10 Sep 2025 08:27:33 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20DateRangePicker=20in=20KVZ=20f=C3=BCr?= =?UTF-8?q?=20Meldungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 5 ++ .../kue705FO/Charts/KVZChart/KVZChartView.tsx | 56 ++++++++++++++----- package-lock.json | 4 +- package.json | 2 +- 6 files changed, 51 insertions(+), 20 deletions(-) diff --git a/.env.development b/.env.development index 422c5ec..9985aa7 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_USE_CGI=false # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.887 +NEXT_PUBLIC_APP_VERSION=1.6.888 NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) diff --git a/.env.production b/.env.production index 05c87db..9c1f060 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_USE_CGI=true # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.6.887 +NEXT_PUBLIC_APP_VERSION=1.6.888 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ae6bac..c346cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.888] – 2025-09-10 + +- feat: TDR Meldungen DateRangePicker + +--- ## [1.6.887] – 2025-09-10 - style: actionbar in RSL und ISO diff --git a/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx b/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx index d7827d6..ae16132 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx @@ -1,6 +1,9 @@ "use client"; // KVZChartView.tsx import React, { useEffect } from "react"; +import DateRangePicker from "@/components/common/DateRangePicker"; +import { getMessagesThunk } from "@/redux/thunks/getMessagesThunk"; +import { setLoading } from "@/redux/slices/kabelueberwachungChartSlice"; import ReactModal from "react-modal"; import { useDispatch, useSelector } from "react-redux"; import { AppDispatch, RootState } from "@/redux/store"; @@ -31,11 +34,11 @@ const KVZChartView: React.FC = ({ slotIndex, }) => { const dispatch = useDispatch(); - const isFullScreen = useSelector( - (state: RootState) => state.kabelueberwachungChartSlice.isFullScreen + const { isFullScreen, slotNumber, vonDatum, bisDatum } = useSelector( + (state: RootState) => state.kabelueberwachungChartSlice ); - const slotNumber = useSelector( - (state: RootState) => state.kabelueberwachungChartSlice.slotNumber + const { vonDatum: pickerVonDatum, bisDatum: pickerBisDatum } = useSelector( + (state: RootState) => state.dateRangePicker ); // Beim Öffnen Slot setzen (damit konsistent zu anderen Modals) @@ -63,8 +66,19 @@ const KVZChartView: React.FC = ({ onClose(); }; - const toggleFullScreen = () => { - dispatch(setFullScreen(!isFullScreen)); + const toggleFullScreen = () => dispatch(setFullScreen(!isFullScreen)); + + const handleFetchMessages = async () => { + const fromDate = pickerVonDatum ?? vonDatum; + const toDate = pickerBisDatum ?? bisDatum; + try { + dispatch(setLoading(true)); + await dispatch(getMessagesThunk({ fromDate, toDate })).unwrap(); + } catch (err) { + console.error("❌ Fehler beim Laden der Meldungen (KVZ)", err); + } finally { + dispatch(setLoading(false)); + } }; return ( @@ -80,12 +94,13 @@ const KVZChartView: React.FC = ({ bottom: "auto", marginRight: "-50%", transform: "translate(-50%, -50%)", - width: isFullScreen ? "90vw" : "50rem", - height: isFullScreen ? "90vh" : "28rem", + width: isFullScreen ? "90vw" : "60rem", + height: isFullScreen ? "90vh" : "32rem", padding: "1rem", transition: "all 0.3s ease-in-out", display: "flex", flexDirection: "column", + overflowX: "hidden", }, }} > @@ -131,17 +146,28 @@ const KVZChartView: React.FC = ({

KVz Zustände & Meldungen

- {/* LED Bereich */} -
-
-