diff --git a/.env.development b/.env.development index 127e8de..aa0975f 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.666 +NEXT_PUBLIC_APP_VERSION=1.6.667 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 88153e6..ec51c37 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.666 +NEXT_PUBLIC_APP_VERSION=1.6.667 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cc1b5a..e23aa4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.667] – 2025-07-31 + +- feat: TDR --> Messkurven TDR anzeigen und dort Schalter Messung aktivieren + +--- ## [1.6.666] – 2025-07-31 - feat: KVZ JSON Daten für mock auf CPL hochgeladen und getestet diff --git a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx index 5a3be62..def321a 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoChartActionBar.tsx @@ -9,9 +9,9 @@ import { setSelectedMode, setChartOpen, setLoading, + setChartTitle, } from "@/redux/slices/kabelueberwachungChartSlice"; import { setBrushRange } from "@/redux/slices/brushSlice"; -import { setChartTitle } from "@/redux/slices/isoChartTypeSlice"; import { Listbox } from "@headlessui/react"; //-----------------------------------------------------------------------------------useIsoChartLoader @@ -92,8 +92,14 @@ export const useIsoChartLoader = () => { const IsoChartActionBar: React.FC = () => { const dispatch = useDispatch(); - const { vonDatum, bisDatum, selectedMode, slotNumber, isLoading } = - useSelector((state: RootState) => state.kabelueberwachungChartSlice); + const { + vonDatum, + bisDatum, + selectedMode, + slotNumber, + isLoading, + chartTitle, + } = useSelector((state: RootState) => state.kabelueberwachungChartSlice); const formatDate = (dateString: string) => { const [year, month, day] = dateString.split("-"); @@ -237,13 +243,47 @@ const IsoChartActionBar: React.FC = () => { - {/* Platzhalter für "ISO starten" Button, nimmt weiterhin Platz ein, aber ist unsichtbar */} - dispatch(setChartTitle(value))} > - ISO starten - +
+ + {chartTitle} + + + + + + {["Messkurve", "Meldungen"].map((option) => ( + + `px-4 py-1 cursor-pointer ${ + selected + ? "bg-littwin-blue text-white" + : active + ? "bg-gray-200" + : "" + }` + } + > + {option} + + ))} + +
+ + + + {filteredMessages.length === 0 ? ( +
+ Keine Meldungen im gewählten Zeitraum gefunden. +
+ ) : ( +
+ + + + + + + + + + + + {filteredMessages.map((msg, index) => ( + + + + + + + + ))} + +
PrioZeitstempelQuelleMeldungStatus
+
+
+ {new Date(msg.t).toLocaleString("de-DE", { + day: "2-digit", + month: "2-digit", + year: "numeric", + hour: "2-digit", + minute: "2-digit", + second: "2-digit", + })} + {msg.i}{msg.m}{msg.v}
+
+ )} + +
+ {filteredMessages.length} Meldung(en) gefunden +
+ + ); +}; + +export default Report; diff --git a/package-lock.json b/package-lock.json index 0192e92..93c3988 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.666", + "version": "1.6.667", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.666", + "version": "1.6.667", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index 8ed69b6..461f853 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.666", + "version": "1.6.667", "private": true, "scripts": { "dev": "next dev", diff --git a/redux/slices/kabelueberwachungChartSlice.ts b/redux/slices/kabelueberwachungChartSlice.ts index f980d52..67257b2 100644 --- a/redux/slices/kabelueberwachungChartSlice.ts +++ b/redux/slices/kabelueberwachungChartSlice.ts @@ -22,6 +22,7 @@ interface KabelueberwachungChartState { isFullScreen: boolean; unit: "kOhm" | "MOhm"; isLoading: boolean; + chartTitle: "Messkurve" | "Meldungen"; } // Dynamische Initialisierung der Datumswerte @@ -43,6 +44,7 @@ const initialState: KabelueberwachungChartState = { tdrChartData: [], isFullScreen: false, unit: "MOhm", + chartTitle: "Messkurve", // Standard: Messkurve ausgewählt }; // Erstellung des Slices @@ -93,6 +95,12 @@ const kabelueberwachungChartSlice = createSlice({ setLoading: (state, action: PayloadAction) => { state.isLoading = action.payload; }, + setChartTitle: ( + state, + action: PayloadAction<"Messkurve" | "Meldungen"> + ) => { + state.chartTitle = action.payload; + }, }, }); @@ -109,6 +117,7 @@ export const { setTDRChartData, setFullScreen, setLoading, + setChartTitle, } = kabelueberwachungChartSlice.actions; // Export des Reducers