diff --git a/.env.development b/.env.development index 9985aa7..12d6bb5 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.888 +NEXT_PUBLIC_APP_VERSION=1.6.889 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 9c1f060..57eedde 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.888 +NEXT_PUBLIC_APP_VERSION=1.6.889 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c346cf6..f8a0ac3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.889] – 2025-09-10 + +- feat: DateRangePicker in KVZ für Meldungen + +--- ## [1.6.888] – 2025-09-10 - feat: TDR Meldungen DateRangePicker diff --git a/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx b/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx index ae16132..474bea3 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/KVZChart/KVZChartView.tsx @@ -165,7 +165,10 @@ const KVZChartView: React.FC = ({ Anzeigen -
+
diff --git a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx index 5c5ae37..c5ff5d7 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChart.tsx @@ -211,8 +211,7 @@ const TDRChart: React.FC<{ isFullScreen: boolean }> = ({ isFullScreen }) => { //-------------------------------------- return ( -
- +
{tdrChartData.length === 0 ? (
⚠️ Keine Daten verfügbar für diesen Slot diff --git a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx index 9f5b0bb..540791b 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/TDRChart/TDRChartActionBar.tsx @@ -262,7 +262,8 @@ const TDRChartActionBar: React.FC = () => { "px-3 h-8 cursor-pointer rounded-sm m-0.5 flex items-center justify-start transition-colors text-[13px]"; if (selected) return `${base} dropdown-option-active font-medium`; - if (active) return `${base} dropdown-option-hover`; + if (active) + return `${base} dropdown-option-hover`; return `${base}`; }} > @@ -296,7 +297,9 @@ const TDRChartActionBar: React.FC = () => {
diff --git a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx index 4659073..cea72fd 100644 --- a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx +++ b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx @@ -31,7 +31,6 @@ import useKueVersion from "./hooks/useKueVersion"; import useIsoDisplay from "./hooks/useIsoDisplay"; import useLoopDisplay from "./hooks/useLoopDisplay"; import useModulName from "./hooks/useModulName"; -import { useAdminAuth } from "../../settingsPageComponents/hooks/useAdminAuth"; //--------handlers---------------- // Keep needed imports @@ -57,7 +56,8 @@ const Kue705FO: React.FC = ({ const { kueName } = useSelector((state: RootState) => state.kueDataSlice); // Admin authentication hook for security - using showModal as true for continuous auth check - const { isAdminLoggedIn } = useAdminAuth(true); + // Admin Auth hook retained (result not currently needed after KVZ visibility change) + // const { isAdminLoggedIn } = useAdminAuth(true); // Modulname (max 48 Zeichen) vorbereiten const moduleNameRaw = useMemo( @@ -277,10 +277,10 @@ const Kue705FO: React.FC = ({ const isTdrActiveForSlot = tdrActive?.[slotIndex] === 1; // KVz aktiv Status für diesen Slot prüfen - nur wenn Admin authentifiziert ist, KVz vorhanden ist UND aktiviert ist + // Anpassung: KVZ Button soll sichtbar/benutzbar bleiben, auch wenn Admin sich abmeldet, + // sobald KVZ Präsenz + Aktiv-Flag gesetzt sind. Admin wird nur zum Aktivieren benötigt. const isKvzActiveForSlot = - kvzPresence?.[slotIndex] === 1 && - kvzActive?.[slotIndex] === 1 && - isAdminLoggedIn; + kvzPresence?.[slotIndex] === 1 && kvzActive?.[slotIndex] === 1; // Removed useChartData(loopMeasurementCurveChartData) as the state was unused diff --git a/mocks/device-cgi-simulator/kvz/kvzData.json b/mocks/device-cgi-simulator/kvz/kvzData.json index c80c4cb..335c709 100644 --- a/mocks/device-cgi-simulator/kvz/kvzData.json +++ b/mocks/device-cgi-simulator/kvz/kvzData.json @@ -1,24 +1,206 @@ { "kvzPresence": [ - 1, 1, 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 + 1, + 1, + 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 ], "kvzActive": [ - 1, 1, 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 + 1, + 1, + 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 ], "kvzStatus": [ - 1, 0, 2, 1, 2, 0, 1, 0, 2, 1, 0, 2, 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, 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, 0, 0 + 1, + 0, + 2, + 1, + 2, + 0, + 1, + 0, + 2, + 1, + 0, + 2, + 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, + 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, + 0, + 0 ], - "timestamp": "2025-07-31T11:39:22.951Z", + "timestamp": "2025-09-10T06:37:13.443Z", "description": { "kvzPresence": "32 Slots: 1=KVZ Gerät vorhanden, 0=nicht vorhanden. Slots 0,2 haben KVZ-Geräte", "kvzActive": "32 Slots: 1=KVZ aktiviert, 0=deaktiviert. Nur Slot 0 ist aktiviert", "kvzStatus": "128 LEDs: 4 LEDs pro Slot. Slot 0: [1,0,1,0], Slot 2: [1,1,0,1] (aber Slot 2 ist deaktiviert)" } -} +} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 234166c..84707b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.888", + "version": "1.6.889", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.888", + "version": "1.6.889", "dependencies": { "@emotion/react": "^11.13.0", "@emotion/styled": "^11.13.0", diff --git a/package.json b/package.json index e2a662c..75030dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.888", + "version": "1.6.889", "private": true, "scripts": { "dev": "next dev -p 3000",