From 3a19edcd83818f31e960ef33fd578f4f2a0037ed Mon Sep 17 00:00:00 2001 From: ISA Date: Sun, 27 Oct 2024 09:22:00 +0100 Subject: [PATCH] =?UTF-8?q?=20kueConfig.js=20und=20kueDetailTdr.js=20l?= =?UTF-8?q?=C3=B6schen=20und=20die=20Variable=20in=20kueData.js=20einf?= =?UTF-8?q?=C3=BCgen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Header.jsx | 117 ++++++++-------- public/CPL/SERVICE/kueConfig.js | 4 - public/CPL/SERVICE/kueData.js | 10 +- public/CPL/SERVICE/kueDetailTdr.js | 17 --- public/CPLmockData/SERVICE/kueConfig.js | 77 ----------- public/CPLmockData/SERVICE/kueData.js | 65 +++++++++ public/CPLmockData/SERVICE/kueDetailTdr.js | 147 --------------------- utils/loadWindowVariables.js | 8 +- 8 files changed, 132 insertions(+), 313 deletions(-) delete mode 100644 public/CPL/SERVICE/kueConfig.js delete mode 100644 public/CPL/SERVICE/kueDetailTdr.js delete mode 100644 public/CPLmockData/SERVICE/kueConfig.js delete mode 100644 public/CPLmockData/SERVICE/kueDetailTdr.js diff --git a/components/Header.jsx b/components/Header.jsx index b529239..f42989a 100644 --- a/components/Header.jsx +++ b/components/Header.jsx @@ -1,4 +1,5 @@ -"use client"; // components/Header.jsx +// components/Header.jsx +"use client"; import React, { useEffect, useState } from "react"; import Image from "next/image"; import "bootstrap-icons/font/bootstrap-icons.css"; @@ -6,72 +7,68 @@ import { loadWindowVariables } from "../utils/loadWindowVariables"; import SettingsModal from "./modales/SettingsModal"; function Header() { - const [isClient, setIsClient] = useState(false); const [stationsname, setStationsname] = useState("Lädt..."); const [cplStatus, setCplStatus] = useState("Lädt..."); const [showSettingsModal, setShowSettingsModal] = useState(false); - const [logOnce, setLogOnce] = useState(false); + + // Flag außerhalb des State-Managements, um die Ausgabe nur einmal zu loggen + let variablesLogged = false; useEffect(() => { - setIsClient(true); - }, []); - - const handleSettingsClick = () => { - setShowSettingsModal(true); - }; - - const handleCloseSettingsModal = () => { - setShowSettingsModal(false); - }; - - const handleLogout = () => { - window.location.href = "/offline.html"; - }; - - useEffect(() => { - if (isClient && !logOnce) { - const environment = process.env.NEXT_PUBLIC_NODE_ENV || "production"; - const script = document.createElement("script"); - - // Laden von nur System.js abhängig von der Umgebung - script.src = - environment === "production" - ? `/CPL?/CPL/SERVICE/System.js` - : `/CPLmockData/SERVICE/System.js`; - - script.async = true; - script.onload = () => { - // console.log(`System.js wurde erfolgreich geladen.`); - - // Systemvariablen überprüfen und zuweisen - if (window.deviceName) { - setStationsname(window.deviceName || "Unbekannt"); - setCplStatus(window.hardware_version || "Unbekannt"); - } else { - console.error("Systemvariablen sind nicht vollständig verfügbar."); + loadWindowVariables() + .then(() => { + if (!variablesLogged) { + console.log("Geladene Systemvariablen:", { + deviceName: window.deviceName, + ip: window.ip, + mac1: window.mac1, + mac2: window.mac2, + subnet: window.subnet, + gateway: window.gateway, + datetime: window.datetime, + kueOnline: window.kueOnline, + kueIso: window.kueIso, + kueValid: window.kueValid, + kueAlarm1: window.kueAlarm1, + kueAlarm2: window.kueAlarm2, + kueRes: window.kueRes, + kueCableBreak: window.kueCableBreak, + kueGroundFault: window.kueGroundFault, + kueLimit1: window.kueLimit1, + kueLimit2Low: window.kueLimit2Low, + kueLimit2High: window.kueLimit2High, + kueDelay1: window.kueDelay1, + kueLoopInterval: window.kueLoopInterval, + kueID: window.kueID, + kueName: window.kueName, + kueVersion: window.kueVersion, + kueOverflow: window.kueOverflow, + kue100V: window.kue100V, + kueResidence: window.kueResidence, + kueBooting: window.kueBooting, + tdrAtten: window.tdrAtten, + tdrPulse: window.tdrPulse, + tdrSpeed: window.tdrSpeed, + tdrAmp: window.tdrAmp, + tdrTrigger: window.tdrTrigger, + tdrLocation: window.tdrLocation, + tdrActive: window.tdrActive, + tdrLast: window.tdrLast, + }); + variablesLogged = true; // Setze das Flag, um das erneute Loggen zu verhindern } - console.log(" Header Systemvariablen geladen:", { - deviceName: window.deviceName, - ip: window.ip, - mac1: window.mac1, - mac2: window.mac2, - subnet: window.subnet, - gateway: window.gateway, - datetime: window.datetime, - }); + setStationsname(window.deviceName || "Unbekannt"); + setCplStatus(window.hardware_version || "Unbekannt"); + }) + .catch((error) => { + console.error("Fehler beim Laden der Variablen:", error); + }); + }, []); - setLogOnce(true); - }; - - script.onerror = (error) => - console.error("Fehler beim Laden von System.js:", error); - - document.head.appendChild(script); - } - }, [isClient, logOnce]); - - if (!isClient) return null; + const handleSettingsClick = () => setShowSettingsModal(true); + const handleCloseSettingsModal = () => setShowSettingsModal(false); + const handleLogout = () => (window.location.href = "/offline.html"); return (
@@ -105,7 +102,7 @@ function Header() {
diff --git a/public/CPL/SERVICE/kueConfig.js b/public/CPL/SERVICE/kueConfig.js deleted file mode 100644 index eb6aaa0..0000000 --- a/public/CPL/SERVICE/kueConfig.js +++ /dev/null @@ -1,4 +0,0 @@ -var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>]; -var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>]; -var kueName=[<%=KSA80%>,<%=KSA81%>,<%=KSA82%>,<%=KSA83%>]; -var kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>]; \ No newline at end of file diff --git a/public/CPL/SERVICE/kueData.js b/public/CPL/SERVICE/kueData.js index 21e4449..e07637b 100644 --- a/public/CPL/SERVICE/kueData.js +++ b/public/CPL/SERVICE/kueData.js @@ -19,7 +19,15 @@ var kueOverflow=[<%=KIW80%>,<%=KIW81%>,<%=KIW82%>,<%=KIW83%>]; var kue100V=[<%=KSS80%>,<%=KSS81%>,<%=KSS82%>,<%=KSS83%>]; var kueResidence=[<%=KSN80%>,<%=KSN81%>,<%=KSN82%>,<%=KSN83%>]; var kueBooting=[<%=KSB80%>,<%=KSB81%>,<%=KSB82%>,<%=KSB83%>]; - +//TDR---------------------------- +var tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>]; +var tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>]; +var tdrSpeed=[<%=KTS80%>,<%=KTS81%>,<%=KTS82%>,<%=KTS83%>]; +var tdrAmp=[<%=KTA80%>,<%=KTA81%>,<%=KTA82%>,<%=KTA83%>]; +var tdrTrigger=[<%=KTE80%>,<%=KTE81%>,<%=KTE82%>,<%=KTE83%>]; +var tdrLocation=[<%=KTF80%>,<%=KTF81%>,<%=KTF82%>,<%=KTF83%>]; +var tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>]; +var tdrLast=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>]; diff --git a/public/CPL/SERVICE/kueDetailTdr.js b/public/CPL/SERVICE/kueDetailTdr.js deleted file mode 100644 index 243f0f5..0000000 --- a/public/CPL/SERVICE/kueDetailTdr.js +++ /dev/null @@ -1,17 +0,0 @@ -var kueOnline=[<%=KSO80%>,<%=KSO81%>,<%=KSO82%>,<%=KSO83%>]; -var kueValid=[<%=KIV80%>,<%=KIV81%>,<%=KIV82%>,<%=KIV83%>]; - - -var kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>]; -var kueName=[<%=KSA80%>,<%=KSA81%>,<%=KSA82%>,<%=KSA83%>]; -var kueVersion=[<%=KSV80%>,<%=KSV81%>,<%=KSV82%>,<%=KSV83%>]; - - -var tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>]; -var tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>]; -var tdrSpeed=[<%=KTS80%>,<%=KTS81%>,<%=KTS82%>,<%=KTS83%>]; -var tdrAmp=[<%=KTA80%>,<%=KTA81%>,<%=KTA82%>,<%=KTA83%>]; -var tdrTrigger=[<%=KTE80%>,<%=KTE81%>,<%=KTE82%>,<%=KTE83%>]; -var tdrLocation=[<%=KTF80%>,<%=KTF81%>,<%=KTF82%>,<%=KTF83%>]; -var tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>]; -var tdrLast=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>]; \ No newline at end of file diff --git a/public/CPLmockData/SERVICE/kueConfig.js b/public/CPLmockData/SERVICE/kueConfig.js deleted file mode 100644 index 39425d4..0000000 --- a/public/CPLmockData/SERVICE/kueConfig.js +++ /dev/null @@ -1,77 +0,0 @@ -var kueOnline = [ - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, -]; -var kueID = [ - "FTZ_2", - "B23", - "Kabel 3", - "Kabel 4", - "Kabel 5", - "Kabel 6", - "FTZ4562", - "Kabel 8", - "12344", - "Kabel 10", - "Kabel 11", - "Kabel 12", - "Kabel 13", - "Kabel 14", - "Kabel 15", - "H56-77", - "Kabel 17", - "Kabel 18", - "Kabel 19", - "Kabel 20", - "Kabel 21", - "Kabel 22", - "Kabel 23", - "Kabel 24", - "Kabel 25", - "Kabel 26", - "Kabel 27", - "Kabel 28", - "Kabel 29", - "Kabel 30", - "Kabel 31", - "Kabel 32", -]; -var kueName = [ - "Kabel_2", - "Petersfehn", - "Kabel 3", - "Kabel 4", - "Kabel 5", - "Kabel 6", - "Melanie", - "Kabel 8", - "Merle", - "Kabel 10", - "Kabel 11", - "Kabel 12", - "Kabel 13", - "Kabel 14", - "Kabel 15", - "Daniela", - "Kabel 17", - "Kabel 18", - "Kabel 19", - "Kabel 20", - "Kabel 21", - "Kabel 22", - "Kabel 23", - "Kabel 24", - "Kabel 25", - "Kabel 26", - "Kabel 27", - "Kabel 28", - "Kabel 29", - "Kabel 30", - "Kabel 31", - "Kabel 32", -]; -var kueIso = [ - 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.5, 10.0, 10.0, 10.0, 10.0, - 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.0, 10.5, 10.0, 10.0, 10.0, 10.0, 10.0, - 10.5, 10.0, 200.0, 200.0, 200.0, 200.0, -]; diff --git a/public/CPLmockData/SERVICE/kueData.js b/public/CPLmockData/SERVICE/kueData.js index 1d25c92..37f3cbe 100644 --- a/public/CPLmockData/SERVICE/kueData.js +++ b/public/CPLmockData/SERVICE/kueData.js @@ -145,3 +145,68 @@ var kueBooting = [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ]; +//TDR--------------------------------------------------- +var tdrAtten = [ + 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, + 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, + 2.0, 2.0, +]; +var tdrPulse = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, +]; +var tdrSpeed = [ + 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, + 100, 100, +]; +var tdrAmp = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, +]; +var tdrTrigger = [ + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, +]; +var tdrLocation = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, +]; +var tdrActive = [ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, +]; +var tdrLast = [ + "2024-10-17 07:51:54:000", + "2024-09-30 08:38:50:000", + "?", + "?", + "?", + "?", + "?", + "?", + "2024-09-30 08:36:43:000", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", + "?", +]; diff --git a/public/CPLmockData/SERVICE/kueDetailTdr.js b/public/CPLmockData/SERVICE/kueDetailTdr.js deleted file mode 100644 index de50828..0000000 --- a/public/CPLmockData/SERVICE/kueDetailTdr.js +++ /dev/null @@ -1,147 +0,0 @@ -/* var kueOnline = [ - 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, -]; */ -/* var kueValid = [ - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, -]; */ - -/* var kueID = [ - "FTZ_2", - "B23", - "Kabel 3", - "Kabel 4", - "Kabel 5", - "Kabel 6", - "FTZ4562", - "Kabel 8", - "12344", - "Kabel 10", - "Kabel 11", - "Kabel 12", - "Kabel 13", - "Kabel 14", - "Kabel 15", - "H56-77", - "Kabel 17", - "Kabel 18", - "Kabel 19", - "Kabel 20", - "Kabel 21", - "Kabel 22", - "Kabel 23", - "Kabel 24", - "Kabel 25", - "Kabel 26", - "Kabel 27", - "Kabel 28", - "Kabel 29", - "Kabel 30", - "Kabel 31", - "Kabel 32", -]; -var kueName = [ - "Kabel_2", - "Petersfehn", - "Kabel 3", - "Kabel 4", - "Kabel 5", - "Kabel 6", - "Melanie", - "Kabel 8", - "Merle", - "Kabel 10", - "Kabel 11", - "Kabel 12", - "Kabel 13", - "Kabel 14", - "Kabel 15", - "Daniela", - "Kabel 17", - "Kabel 18", - "Kabel 19", - "Kabel 20", - "Kabel 21", - "Kabel 22", - "Kabel 23", - "Kabel 24", - "Kabel 25", - "Kabel 26", - "Kabel 27", - "Kabel 28", - "Kabel 29", - "Kabel 30", - "Kabel 31", - "Kabel 32", -]; */ -/* var kueVersion = [ - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, 419, - 419, 419, -]; */ - -var tdrAtten = [ - 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, - 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, - 2.0, 2.0, -]; -var tdrPulse = [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -]; -var tdrSpeed = [ - 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, - 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, - 100, 100, -]; -var tdrAmp = [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -]; -var tdrTrigger = [ - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, -]; -var tdrLocation = [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -]; -var tdrActive = [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -]; -var tdrLast = [ - "2024-10-17 07:51:54:000", - "2024-09-30 08:38:50:000", - "?", - "?", - "?", - "?", - "?", - "?", - "2024-09-30 08:36:43:000", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", - "?", -]; diff --git a/utils/loadWindowVariables.js b/utils/loadWindowVariables.js index e5023a3..662355c 100644 --- a/utils/loadWindowVariables.js +++ b/utils/loadWindowVariables.js @@ -60,13 +60,7 @@ export async function loadWindowVariables() { }); }; - const scripts = [ - "de.js", - "kueData.js", - "kueDetailTdr.js", - "Start.js", - "System.js", - ]; + const scripts = ["de.js", "kueData.js", "Start.js", "System.js"]; // Load all required scripts Promise.all(scripts.map(loadScript))