cleanup: Kue705FO
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.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)
|
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.653
|
NEXT_PUBLIC_APP_VERSION=1.6.654
|
||||||
NEXT_PUBLIC_CPL_MODE=production
|
NEXT_PUBLIC_CPL_MODE=production
|
||||||
@@ -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
|
## [1.6.653] – 2025-07-28
|
||||||
|
|
||||||
- fix: KÜ slotnummer in der Messkurven Modal
|
- fix: KÜ slotnummer in der Messkurven Modal
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
"use client"; // components/modules/kue705FO/Kue705FO.tsx
|
"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 { useSelector } from "react-redux";
|
||||||
import KueModal from "./modals/SettingsModalWrapper";
|
import KueModal from "./modals/SettingsModalWrapper";
|
||||||
import "bootstrap-icons/font/bootstrap-icons.css"; // Import Bootstrap Icons
|
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 useLoopDisplay from "./hooks/useLoopDisplay";
|
||||||
import useModulName from "./hooks/useModulName";
|
import useModulName from "./hooks/useModulName";
|
||||||
|
|
||||||
import type { Chart } from "chart.js";
|
|
||||||
|
|
||||||
//--------handlers----------------
|
//--------handlers----------------
|
||||||
// Keep needed imports
|
// Keep needed imports
|
||||||
import handleOpenModal from "./handlers/handleOpenModal";
|
import handleOpenModal from "./handlers/handleOpenModal";
|
||||||
@@ -41,8 +39,6 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
modulName,
|
modulName,
|
||||||
kueOnline,
|
kueOnline,
|
||||||
slotIndex,
|
slotIndex,
|
||||||
tdrLocation,
|
|
||||||
win_fallSensorsActive,
|
|
||||||
}) => {
|
}) => {
|
||||||
/* console.log(
|
/* console.log(
|
||||||
`Rendering Kue705FO - SlotIndex: ${slotIndex}, ModulName: ${modulName}`
|
`Rendering Kue705FO - SlotIndex: ${slotIndex}, ModulName: ${modulName}`
|
||||||
@@ -55,17 +51,13 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
"Schleife"
|
"Schleife"
|
||||||
);
|
);
|
||||||
|
|
||||||
const [loopTitleText, setloopTitleText] = useState(
|
const [, setloopTitleText] = useState("Schleifenwiderstand [kOhm]");
|
||||||
"Schleifenwiderstand [kOhm]"
|
|
||||||
);
|
|
||||||
const [isoDisplayText] = useState("Aderbruch");
|
const [isoDisplayText] = useState("Aderbruch");
|
||||||
const [groundFaultDisplayText] = useState("Erdschluss");
|
const [groundFaultDisplayText] = useState("Erdschluss");
|
||||||
const [loopFaultDisplayText] = useState("Schleifenfehler");
|
const [loopFaultDisplayText] = useState("Schleifenfehler");
|
||||||
const [isoFaultDisplayText] = useState("Isolationsfehler");
|
const [isoFaultDisplayText] = useState("Isolationsfehler");
|
||||||
const [isoGreaterThan200] = useState(">200 MOhm");
|
const [isoGreaterThan200] = useState(">200 MOhm");
|
||||||
|
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
|
|
||||||
const [showModal, setShowModal] = useState(false);
|
const [showModal, setShowModal] = useState(false);
|
||||||
// Separate modal states for each ChartView
|
// Separate modal states for each ChartView
|
||||||
const [showIsoModal, setShowIsoModal] = useState(false);
|
const [showIsoModal, setShowIsoModal] = useState(false);
|
||||||
@@ -78,7 +70,6 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
//------- Redux-Variablen abrufen--------------------------------
|
//------- Redux-Variablen abrufen--------------------------------
|
||||||
const {
|
const {
|
||||||
kueVersion: reduxKueVersion,
|
kueVersion: reduxKueVersion,
|
||||||
tdrActive,
|
|
||||||
kueCableBreak: kueCableBreakRaw,
|
kueCableBreak: kueCableBreakRaw,
|
||||||
kueGroundFault: kueGroundFaultRaw,
|
kueGroundFault: kueGroundFaultRaw,
|
||||||
kueAlarm1: kueAlarm1Raw,
|
kueAlarm1: kueAlarm1Raw,
|
||||||
@@ -329,9 +320,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
Number(kueAlarm2?.[slotIndex]) === 1 ? "text-red-500" : ""
|
Number(kueAlarm2?.[slotIndex]) === 1 ? "text-red-500" : ""
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{activeButton === "Schleife" && loading
|
{`RSL: ${loopDisplayValue} kOhm`}
|
||||||
? "RSL: Messung"
|
|
||||||
: `RSL: ${loopDisplayValue} kOhm`}
|
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -348,63 +337,6 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Schleifenwiderstand Bereich */}
|
|
||||||
{/*
|
|
||||||
<div className="absolute bottom-[5.963rem] left-[0.068rem] w-[7.074rem] h-[4.1rem] bg-gray-300 border-[0.094rem] border-gray-400 p-[0.063rem]">
|
|
||||||
<span className="text-black text-[0.438rem] absolute top-[0.125rem] left-[0.063rem] mt-1">
|
|
||||||
Schleifenwiderstand [kOhm]
|
|
||||||
</span>
|
|
||||||
<div className="relative w-full h-[2.813rem] bg-gray-100 border border-gray-400 flex items-center justify-center mt-4">
|
|
||||||
<button
|
|
||||||
onClick={() =>
|
|
||||||
handleRefreshClick("Schleife", slotIndex, setLoading)
|
|
||||||
}
|
|
||||||
className="absolute -top-[0.063rem] -right-[0.063rem] w-[1.25rem] h-[1.25rem] bg-gray-400 flex items-center justify-center"
|
|
||||||
disabled={loading}
|
|
||||||
>
|
|
||||||
<span className="text-white text-[1.125rem]">⟳</span>
|
|
||||||
</button>
|
|
||||||
<div className="absolute bottom-[0.313rem] left-1/2 transform -translate-x-1/2 w-[6.25rem] flex justify-center items-center">
|
|
||||||
<div className="text-center text-black text-[0.625rem]">
|
|
||||||
<p>
|
|
||||||
{typeof schleifenwiderstand === "number"
|
|
||||||
? schleifenwiderstand
|
|
||||||
: Number(schleifenwiderstand)}{" "}
|
|
||||||
kOhm
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
*/}
|
|
||||||
|
|
||||||
{/* TDR Bereich */}
|
|
||||||
{/*
|
|
||||||
{Array.isArray(tdrActive) && tdrActive[slotIndex] === 1 && (
|
|
||||||
<div className="absolute bottom-[0.063rem] left-[0.068rem] w-[7.074rem] h-[4.1rem] bg-gray-300 border-[0.094rem] border-gray-400 p-[0.063rem]">
|
|
||||||
<span className="text-black text-[0.438rem] absolute top-[0.125rem] left-[0.063rem] mt-1">
|
|
||||||
TDR Entfernung [km]
|
|
||||||
</span>
|
|
||||||
<div className="relative w-full h-[2.813rem] bg-gray-100 border border-gray-400 flex items-center justify-center mt-4">
|
|
||||||
<button
|
|
||||||
onClick={() =>
|
|
||||||
handleRefreshClick("TDR", slotIndex, setLoading)
|
|
||||||
}
|
|
||||||
className="absolute -top-[0.063rem] -right-[0.063rem] w-[1.25rem] h-[1.25rem] bg-gray-400 flex items-center justify-center"
|
|
||||||
disabled={loading}
|
|
||||||
>
|
|
||||||
<span className="text-white text-[1.125rem]">⟳</span>
|
|
||||||
</button>
|
|
||||||
<div className="absolute bottom-[0.313rem] left-1/2 transform -translate-x-1/2 w-[6.25rem] flex justify-center items-center">
|
|
||||||
<div className="text-center text-black text-[0.625rem]">
|
|
||||||
<p>{latestTdrDistance} km</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
*/}
|
|
||||||
|
|
||||||
{/* Modal für Einstellungen */}
|
{/* Modal für Einstellungen */}
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.653",
|
"version": "1.6.654",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "cpl-v4",
|
"name": "cpl-v4",
|
||||||
"version": "1.6.653",
|
"version": "1.6.654",
|
||||||
"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.653",
|
"version": "1.6.654",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
Reference in New Issue
Block a user