From 974f468766277b7b7b474e654a77b20cdfba8519 Mon Sep 17 00:00:00 2001 From: ISA Date: Wed, 13 Aug 2025 12:17:13 +0200 Subject: [PATCH] feat: Slot Nummer anzeigen bei Events --- .env.development | 2 +- .env.production | 2 +- CHANGELOG.md | 5 +++++ components/common/GlobalActivityOverlay.tsx | 15 ++++++++++++--- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 22 insertions(+), 8 deletions(-) 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 (
diff --git a/package-lock.json b/package-lock.json index 544c2b1..f915c51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.706", + "version": "1.6.707", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.706", + "version": "1.6.707", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index 43b3ee0..321eb12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.706", + "version": "1.6.707", "private": true, "scripts": { "dev": "next dev",