diff --git a/.env.development b/.env.development
index ed51f7b..83262ad 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.708
+NEXT_PUBLIC_APP_VERSION=1.6.709
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 c8f865a..64b1d7d 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.708
+NEXT_PUBLIC_APP_VERSION=1.6.709
NEXT_PUBLIC_CPL_MODE=production
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e68cb4..5673688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.6.709] – 2025-08-13
+
+- Progressbar mit Prozent und Zeit
+
+---
## [1.6.708] – 2025-08-13
- feat: Slot Nummer anzeigen bei Events
diff --git a/components/common/GlobalActivityOverlay.tsx b/components/common/GlobalActivityOverlay.tsx
index 6ca7797..c9e4949 100644
--- a/components/common/GlobalActivityOverlay.tsx
+++ b/components/common/GlobalActivityOverlay.tsx
@@ -35,13 +35,6 @@ export default function GlobalActivityOverlay() {
const clamp = (v: number, min = 0, max = 1) =>
Math.max(min, Math.min(max, v));
- const formatEta = (ms: number) => {
- if (ms <= 0) return "gleich fertig";
- const totalSec = Math.ceil(ms / 1000);
- const m = Math.floor(totalSec / 60);
- const s = totalSec % 60;
- return m > 0 ? `${m}:${s.toString().padStart(2, "0")} min` : `${s} s`;
- };
const compute = (startedAt: number | null, durationMs: number) => {
if (!startedAt) return { pct: 0, remaining: durationMs };
@@ -67,7 +60,7 @@ export default function GlobalActivityOverlay() {
Schleifenmessung läuft… (KÜ: {fmt(ksx)})
{(() => {
- const { pct, remaining } = compute(loopStartedAt, LOOP_MS);
+ const { pct } = compute(loopStartedAt, LOOP_MS);
return (
@@ -77,7 +70,7 @@ export default function GlobalActivityOverlay() {
/>
- {Math.round(pct)}% · ~{formatEta(remaining)}
+ {Math.round(pct)}%
);
@@ -91,17 +84,17 @@ export default function GlobalActivityOverlay() {
TDR-Messung läuft… (KÜ: {fmt(ksy)})
{(() => {
- const { pct, remaining } = compute(tdrStartedAt, TDR_MS);
+ const { pct } = compute(tdrStartedAt, TDR_MS);
return (
- {Math.round(pct)}% · ~{formatEta(remaining)}
+ {Math.round(pct)}%
);
@@ -115,20 +108,17 @@ export default function GlobalActivityOverlay() {
Abgleich läuft… (KÜ: {fmt(ksz)})
{(() => {
- const { pct, remaining } = compute(
- alignmentStartedAt,
- ALIGN_MS
- );
+ const { pct } = compute(alignmentStartedAt, ALIGN_MS);
return (
- {Math.round(pct)}% · ~{formatEta(remaining)}
+ {Math.round(pct)}%
);
diff --git a/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js b/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
index 8ef859f..26db7e4 100644
--- a/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
+++ b/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
@@ -260,7 +260,7 @@ var win_fallSensors = [
// Event Schleifenmessung KSX
var loopMeasurementEvent = [
- 1, 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, 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,
];
//Event TDR-Messung
@@ -270,6 +270,6 @@ var tdrMeasurementEvent = [
];
//Event Abgleich
var alignmentEvent = [
- 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,
+ 1, 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,
];
diff --git a/package-lock.json b/package-lock.json
index 4b0c6c2..ceb8734 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "cpl-v4",
- "version": "1.6.708",
+ "version": "1.6.709",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "cpl-v4",
- "version": "1.6.708",
+ "version": "1.6.709",
"dependencies": {
"@fontsource/roboto": "^5.1.0",
"@headlessui/react": "^2.2.4",
diff --git a/package.json b/package.json
index 889a347..fa1c76c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cpl-v4",
- "version": "1.6.708",
+ "version": "1.6.709",
"private": true,
"scripts": {
"dev": "next dev",