diff --git a/apiMockData/SERVICE/SystemMockData.js b/apiMockData/SERVICE/SystemMockData.js index 03ae4c3..873e080 100644 --- a/apiMockData/SERVICE/SystemMockData.js +++ b/apiMockData/SERVICE/SystemMockData.js @@ -1,6 +1,6 @@ // /apiMockData/SERVICE/SystemMockData.js var win_appVersion = "0.02"; -var win_deviceName = "CPLV4_Ismail_Mockup"; +var win_deviceName = "CPLV4 Ismail Rastede"; var win_mac1 = "0 48 86 81 46 143"; var win_ip = "10.10.0.243"; var win_subnet = "255.255.255.0"; diff --git a/apiMockData/SERVICE/kabelueberwachungMockData.js b/apiMockData/SERVICE/kabelueberwachungMockData.js index 6a84088..221a301 100644 --- a/apiMockData/SERVICE/kabelueberwachungMockData.js +++ b/apiMockData/SERVICE/kabelueberwachungMockData.js @@ -98,34 +98,29 @@ var win_kueID = [ //TDR--------------------------------------------------- var win_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, -]; + 1, 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 win_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 win_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, -]; + 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 win_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 win_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, -]; + 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 win_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 win_tdrActive = [ - 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 -];; + 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 win_tdrLast = [ "2024-10-17 07:51:54:000", "2024-09-30 08:38:50:000", @@ -167,3 +162,9 @@ var win_memoryInterval = [ 5, 0, 15, 0, 0, 15, 15, 0, 0, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0 ]; //Speicherintervall (Kein, 1 MInute, 5 Minuten, 10 Minuten, 15 Minuten, 30 Minuten, 60 Minuten, 360 Minuten (6h), 720 Minuten (12h) + + + + + + diff --git a/components/header/Header.tsx b/components/header/Header.tsx index d58823f..dd05231 100644 --- a/components/header/Header.tsx +++ b/components/header/Header.tsx @@ -95,11 +95,11 @@ function Header() { height={60} priority /> -
+

Meldestation

-

+

{deviceName}

diff --git a/components/main/kabelueberwachung/kue705FO/modals/TdrEinstellung.tsx b/components/main/kabelueberwachung/kue705FO/modals/TdrEinstellung.tsx index 7d9be20..2e5ccde 100644 --- a/components/main/kabelueberwachung/kue705FO/modals/TdrEinstellung.tsx +++ b/components/main/kabelueberwachung/kue705FO/modals/TdrEinstellung.tsx @@ -26,34 +26,63 @@ export default function TdrEinstellung({ slot }: Props) { const handleSave = () => { const { daempfung, geschwindigkeit, trigger } = tdrData; + if (!daempfung.trim() || !geschwindigkeit.trim() || !trigger.trim()) { alert("Bitte alle Felder ausfüllen."); return; } - const base = `${window.location.origin}/CPL?/kabelueberwachung.html`; + const isDev = window.location.hostname === "localhost"; - const urls = [ - `${base}&KTD${slot}=${tdrData.daempfung.trim()}`, - `${base}&KTS${slot}=${tdrData.geschwindigkeit.trim()}`, - `${base}&KTE${slot}=${tdrData.trigger.trim()}`, - ]; + if (isDev) { + const requests = [ + { key: "win_tdrAtten", value: daempfung.trim() }, + { key: "win_tdrSpeed", value: geschwindigkeit.trim() }, + { key: "win_tdrTrigger", value: trigger.trim() }, + ]; - Promise.all( - urls.map((url) => - fetch(url).then((res) => { - if (!res.ok) throw new Error(`Fehler bei ${url}`); - return res.text(); - }) + Promise.all( + requests.map(({ key, value }) => + fetch( + `/api/cpl/updateTdrSettingsDataAPIHandler?key=${key}&slot=${slot}&value=${value}` + ).then((res) => { + if (!res.ok) throw new Error(`Fehler bei ${key}`); + return res.json(); + }) + ) ) - ) - .then(() => { - alert("TDR-Einstellungen erfolgreich gesendet."); - }) - .catch((err) => { - console.error("Fehler beim Senden:", err); - alert("Fehler beim Senden der TDR-Einstellungen."); - }); + .then(() => { + alert("TDR-Mockdaten erfolgreich gespeichert."); + }) + .catch((err) => { + console.error("Fehler beim Speichern der Mockdaten:", err); + alert("Fehler beim Speichern der TDR-Einstellungen."); + }); + } else { + const base = `${window.location.origin}/CPL?/kabelueberwachung.html`; + + const urls = [ + `${base}&KTD${slot}=${daempfung.trim()}`, + `${base}&KTS${slot}=${geschwindigkeit.trim()}`, + `${base}&KTE${slot}=${trigger.trim()}`, + ]; + + Promise.all( + urls.map((url) => + fetch(url).then((res) => { + if (!res.ok) throw new Error(`Fehler bei ${url}`); + return res.text(); + }) + ) + ) + .then(() => { + alert("TDR-Einstellungen erfolgreich gesendet."); + }) + .catch((err) => { + console.error("Fehler beim Senden:", err); + alert("Fehler beim Senden der TDR-Einstellungen."); + }); + } }; const handleTdrToggle = () => { @@ -65,7 +94,7 @@ export default function TdrEinstellung({ slot }: Props) { if (isDev) { fetch( - `/api/cpl/updateTdrSettingsDataAPIHandler?slot=${slot}&value=${ + `/api/cpl/updateTdrSettingsDataAPIHandler?key=win_tdrActive&slot=${slot}&value=${ newState ? 1 : 0 }` ) diff --git a/config/webVersion.ts b/config/webVersion.ts index afcfc0e..3b1e436 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.321"; +const webVersion = "1.6.322"; export default webVersion; diff --git a/pages/api/cpl/updateTdrSettingsDataAPIHandler.ts b/pages/api/cpl/updateTdrSettingsDataAPIHandler.ts index e78fe81..68aa57e 100644 --- a/pages/api/cpl/updateTdrSettingsDataAPIHandler.ts +++ b/pages/api/cpl/updateTdrSettingsDataAPIHandler.ts @@ -4,13 +4,15 @@ import path from "path"; import fs from "fs/promises"; export default async function handler(req, res) { - const { slot, value } = req.query; - + const { slot, value, key } = req.query; if (slot === undefined || value === undefined) { return res.status(400).json({ error: "Missing slot or value" }); } - const key = "win_tdrActive"; + if (!slot || !value || !key) { + return res.status(400).json({ error: "Missing slot, value, or key" }); + } + const filePath = path.join( process.cwd(), "apiMockData/SERVICE/kabelueberwachungMockData.js"