diff --git a/.env.development b/.env.development index 9a6cf3a..a7c07b0 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.714 +NEXT_PUBLIC_APP_VERSION=1.6.715 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 ba04e08..9a33b49 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.714 +NEXT_PUBLIC_APP_VERSION=1.6.715 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e048bd..b65d291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.715] – 2025-08-14 + +- fix: KÜ Version 4.20 in daschboard KÜs Status anzeigen + +--- ## [1.6.714] – 2025-08-14 - docs: Kabelüberwachung Overlay für Events (Abgleich, TDR und RSL) Messung diff --git a/components/main/analogInputs/AnalogInputsChartModal.tsx b/components/main/analogInputs/AnalogInputsChartModal.tsx new file mode 100644 index 0000000..d69bfcd --- /dev/null +++ b/components/main/analogInputs/AnalogInputsChartModal.tsx @@ -0,0 +1,57 @@ +"use client"; + +import React from "react"; +import { Dialog } from "@headlessui/react"; +import { useSelector, useDispatch } from "react-redux"; +import { RootState } from "@/redux/store"; +import { setIsChartModalOpen } from "@/redux/slices/analogInputs/analogInputsUiSlice"; +import AnalogInputsChart from "@/components/main/analogInputs/AnalogInputsChart"; + +export default function AnalogInputsChartModal({ + loading, + setLoading, +}: { + loading: boolean; + setLoading: (v: boolean) => void; +}) { + const dispatch = useDispatch(); + const isOpen = useSelector( + (state: RootState) => state.analogInputsUi.isChartModalOpen + ); + const selectedId = useSelector( + (state: RootState) => state.analogInputsHistory.selectedId + ); + + if (!isOpen) return null; + + return ( + + ); +} diff --git a/components/main/analogInputs/AnalogInputsTable.tsx b/components/main/analogInputs/AnalogInputsTable.tsx index de367b6..62eb165 100644 --- a/components/main/analogInputs/AnalogInputsTable.tsx +++ b/components/main/analogInputs/AnalogInputsTable.tsx @@ -9,6 +9,7 @@ import settingsIcon from "@iconify/icons-mdi/settings"; import waveformIcon from "@iconify/icons-mdi/waveform"; import { setSelectedAnalogInput } from "@/redux/slices/analogInputs/selectedAnalogInputSlice"; import { setIsSettingsModalOpen } from "@/redux/slices/analogInputs/analogInputsUiSlice"; +import { setIsChartModalOpen } from "@/redux/slices/analogInputs/analogInputsUiSlice"; import { setSelectedId, setAutoLoad, @@ -36,7 +37,7 @@ export default function AnalogInputsTable({ loading }: { loading: boolean }) { return (
| Messwert | Einheit | Bezeichnung | -Aktion | +Einstellungen | +Messkurve | @@ -127,6 +129,21 @@ export default function AnalogInputsTable({ loading }: { loading: boolean }) {+ + | ))} diff --git a/components/main/analogInputs/AnalogInputsView.tsx b/components/main/analogInputs/AnalogInputsView.tsx index b0cca90..cef10f6 100644 --- a/components/main/analogInputs/AnalogInputsView.tsx +++ b/components/main/analogInputs/AnalogInputsView.tsx @@ -2,7 +2,7 @@ // components/main/analogInputs/AnalogInputsView.tsx import React, { useState, useEffect } from "react"; import AnalogInputsTable from "@/components/main/analogInputs/AnalogInputsTable"; -import AnalogInputsChart from "@/components/main/analogInputs/AnalogInputsChart"; +import AnalogInputsChartModal from "@/components/main/analogInputs/AnalogInputsChartModal"; import AnalogInputsSettingsModal from "@/components/main/analogInputs/AnalogInputsSettingsModal"; import { getAnalogInputsThunk } from "@/redux/thunks/getAnalogInputsThunk"; import { useAppDispatch } from "@/redux/store"; @@ -15,9 +15,7 @@ function AnalogInputsView() { const selectedInput = useSelector( (state: RootState) => state.selectedAnalogInput ); - const selectedId = useSelector( - (state: RootState) => state.analogInputsHistory.selectedId - ); + // selectedId is now displayed within the modal header const dispatch = useAppDispatch(); @@ -33,29 +31,24 @@ function AnalogInputsView() { return (
|---|