From 9a8a0501a52d8ac7d967548deccc3d8b5a1900c5 Mon Sep 17 00:00:00 2001 From: ISA Date: Mon, 28 Jul 2025 13:47:21 +0200 Subject: [PATCH] cleanup: Kue705FO --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 5 ++ .../kabelueberwachung/kue705FO/Kue705FO.tsx | 74 +------------------ package-lock.json | 4 +- package.json | 2 +- 6 files changed, 13 insertions(+), 76 deletions(-) diff --git a/.env.development b/.env.development index aa5d894..1467bae 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.653 +NEXT_PUBLIC_APP_VERSION=1.6.654 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 8642815..5cf5dac 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.653 +NEXT_PUBLIC_APP_VERSION=1.6.654 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 41f12f2..ce2d1c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.654] – 2025-07-28 + +- feat: ISO, RSL und TDR separate Charts ohne den Switcher + +--- ## [1.6.653] – 2025-07-28 - fix: KÜ slotnummer in der Messkurven Modal diff --git a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx index 7f1e795..f63601c 100644 --- a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx +++ b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx @@ -1,5 +1,5 @@ "use client"; // components/modules/kue705FO/Kue705FO.tsx -import React, { useState, useRef, useMemo } from "react"; +import React, { useState, useMemo } from "react"; import { useSelector } from "react-redux"; import KueModal from "./modals/SettingsModalWrapper"; import "bootstrap-icons/font/bootstrap-icons.css"; // Import Bootstrap Icons @@ -24,8 +24,6 @@ import useIsoDisplay from "./hooks/useIsoDisplay"; import useLoopDisplay from "./hooks/useLoopDisplay"; import useModulName from "./hooks/useModulName"; -import type { Chart } from "chart.js"; - //--------handlers---------------- // Keep needed imports import handleOpenModal from "./handlers/handleOpenModal"; @@ -41,8 +39,6 @@ const Kue705FO: React.FC = ({ modulName, kueOnline, slotIndex, - tdrLocation, - win_fallSensorsActive, }) => { /* console.log( `Rendering Kue705FO - SlotIndex: ${slotIndex}, ModulName: ${modulName}` @@ -55,17 +51,13 @@ const Kue705FO: React.FC = ({ "Schleife" ); - const [loopTitleText, setloopTitleText] = useState( - "Schleifenwiderstand [kOhm]" - ); + const [, setloopTitleText] = useState("Schleifenwiderstand [kOhm]"); const [isoDisplayText] = useState("Aderbruch"); const [groundFaultDisplayText] = useState("Erdschluss"); const [loopFaultDisplayText] = useState("Schleifenfehler"); const [isoFaultDisplayText] = useState("Isolationsfehler"); const [isoGreaterThan200] = useState(">200 MOhm"); - const [loading, setLoading] = useState(false); - const [showModal, setShowModal] = useState(false); // Separate modal states for each ChartView const [showIsoModal, setShowIsoModal] = useState(false); @@ -78,7 +70,6 @@ const Kue705FO: React.FC = ({ //------- Redux-Variablen abrufen-------------------------------- const { kueVersion: reduxKueVersion, - tdrActive, kueCableBreak: kueCableBreakRaw, kueGroundFault: kueGroundFaultRaw, kueAlarm1: kueAlarm1Raw, @@ -329,9 +320,7 @@ const Kue705FO: React.FC = ({ Number(kueAlarm2?.[slotIndex]) === 1 ? "text-red-500" : "" }`} > - {activeButton === "Schleife" && loading - ? "RSL: Messung" - : `RSL: ${loopDisplayValue} kOhm`} + {`RSL: ${loopDisplayValue} kOhm`} @@ -348,63 +337,6 @@ const Kue705FO: React.FC = ({ - {/* Schleifenwiderstand Bereich */} - {/* -
- - Schleifenwiderstand [kOhm] - -
- -
-
-

- {typeof schleifenwiderstand === "number" - ? schleifenwiderstand - : Number(schleifenwiderstand)}{" "} - kOhm -

-
-
-
-
- */} - - {/* TDR Bereich */} - {/* - {Array.isArray(tdrActive) && tdrActive[slotIndex] === 1 && ( -
- - TDR Entfernung [km] - -
- -
-
-

{latestTdrDistance} km

-
-
-
-
- )} - */} - {/* Modal für Einstellungen */} ) : ( diff --git a/package-lock.json b/package-lock.json index 231e8ba..953ab4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.653", + "version": "1.6.654", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.653", + "version": "1.6.654", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index aaca23a..7a037cb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.653", + "version": "1.6.654", "private": true, "scripts": { "dev": "next dev",