diff --git a/.env.development b/.env.development index ab2dcaa..a1c73bb 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.706 +NEXT_PUBLIC_APP_VERSION=1.6.707 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 280e338..64a0ae3 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.706 +NEXT_PUBLIC_APP_VERSION=1.6.707 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 270056a..ba20c49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.707] – 2025-08-13 + +- feat: Meldung für Events darstellen (Kalibrierung, TDR ud Schleifenmessung) + +--- ## [1.6.706] – 2025-08-13 - Events Schleifenmessung, TDR-Messung und Abgleich in public/CPL/kueData.js eingefügt um später zu lesen und entsprechend ' Bitte Warten' Meldung zu erstellen für den User diff --git a/components/common/GlobalActivityOverlay.tsx b/components/common/GlobalActivityOverlay.tsx index 171ca14..8bca54c 100644 --- a/components/common/GlobalActivityOverlay.tsx +++ b/components/common/GlobalActivityOverlay.tsx @@ -6,14 +6,23 @@ export default function GlobalActivityOverlay() { const anyLoop = useAppSelector((s) => s.deviceEvents.anyLoopActive); const anyTdr = useAppSelector((s) => s.deviceEvents.anyTdrActive); const anyAlign = useAppSelector((s) => s.deviceEvents.anyAlignmentActive); + const ksx = useAppSelector((s) => s.deviceEvents.ksx); + const ksy = useAppSelector((s) => s.deviceEvents.ksy); + const ksz = useAppSelector((s) => s.deviceEvents.ksz); const active = anyLoop || anyTdr || anyAlign; if (!active) return null; + const fmt = (arr: number[]) => + arr + .map((v, i) => (v ? i + 1 : 0)) + .filter((n) => n !== 0) + .join(", "); + const messages: string[] = []; - if (anyLoop) messages.push("Schleifenmessung läuft…"); - if (anyTdr) messages.push("TDR-Messung läuft…"); - if (anyAlign) messages.push("Abgleich läuft…"); + if (anyLoop) messages.push(`Schleifenmessung läuft… (KÜ: ${fmt(ksx)})`); + if (anyTdr) messages.push(`TDR-Messung läuft… (KÜ: ${fmt(ksy)})`); + if (anyAlign) messages.push(`Abgleich läuft… (KÜ: ${fmt(ksz)})`); return (