diff --git a/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts b/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts index c159493..756dffd 100644 --- a/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts +++ b/components/main/kabelueberwachung/kue705FO/handlers/handleSave.ts @@ -8,6 +8,7 @@ export interface OriginalValues { untereSchleifenGrenzwerte: number[]; obereSchleifenGrenzwerte: number[]; schleifenintervall: number[]; + speicherintervall: number[]; } interface HandleSaveParams { @@ -17,6 +18,7 @@ interface HandleSaveParams { untereSchleifenGrenzwerte: number[]; obereSchleifenGrenzwerte: number[]; schleifenintervall: number[]; + speicherintervall: number[]; // ✅ NEU hinzugefügt originalValues: OriginalValues; slot: number; dispatch: (action: any) => void; @@ -41,6 +43,7 @@ const handleSave = async ({ untereSchleifenGrenzwerte, obereSchleifenGrenzwerte, schleifenintervall, + speicherintervall, originalValues, slot, dispatch, @@ -84,7 +87,17 @@ const handleSave = async ({ schleifenintervall[slot], originalValues.schleifenintervall[slot] ) - ) { + ) + if ( + isDifferent( + speicherintervall[slot], + originalValues.speicherintervall[slot] + ) + ) { + changesForFile.KME = speicherintervall[slot]; + } + + { changesForFile.KRI = schleifenintervall[slot]; } diff --git a/components/main/kabelueberwachung/kue705FO/modals/KueEinstellung.tsx b/components/main/kabelueberwachung/kue705FO/modals/KueEinstellung.tsx index cd6457e..3928c06 100644 --- a/components/main/kabelueberwachung/kue705FO/modals/KueEinstellung.tsx +++ b/components/main/kabelueberwachung/kue705FO/modals/KueEinstellung.tsx @@ -8,8 +8,10 @@ declare global { win_kueLimit2Low?: number[]; win_kueLimit2High?: number[]; win_kueLoopInterval?: number[]; + win_memoryInterval?: number[]; } } + import { useDispatch, useSelector } from "react-redux"; import type { RootState } from "../../../../../redux/store"; import { setKueData } from "../../../../../redux/slices/kueDataSlice"; @@ -24,6 +26,18 @@ interface Props { onModulNameChange?: (id: string) => void; } +const memoryIntervalOptions = [ + { value: 0, label: "Kein" }, + { value: 1, label: "1 Minute" }, + { value: 5, label: "5 Minuten" }, + { value: 10, label: "10 Minuten" }, + { value: 15, label: "15 Minuten" }, + { value: 30, label: "30 Minuten" }, + { value: 60, label: "60 Minuten" }, + { value: 360, label: "6 Stunden" }, + { value: 720, label: "12 Stunden" }, +]; + export default function KueEinstellung({ slot, onClose = () => {}, @@ -35,8 +49,9 @@ export default function KueEinstellung({ kueLimit1, kueDelay1, kueLimit2Low, - kueLoopInterval, kueLimit2High, + kueLoopInterval, + memoryInterval, } = useSelector((state: RootState) => state.kueDataSlice); const { isAdminLoggedIn } = useAdminAuth(true); @@ -49,6 +64,7 @@ export default function KueEinstellung({ untereSchleifenGrenzwerte: [...(window.win_kueLimit2Low ?? [])], obereSchleifenGrenzwerte: [...(window.win_kueLimit2High ?? [])], schleifenintervall: [...(window.win_kueLoopInterval ?? [])], + speicherintervall: [...(window.win_memoryInterval ?? [])], }; handleSave({ @@ -58,6 +74,7 @@ export default function KueEinstellung({ untereSchleifenGrenzwerte: [...kueLimit2Low], obereSchleifenGrenzwerte: [...kueLimit2High], schleifenintervall: [...kueLoopInterval], + speicherintervall: [...memoryInterval], originalValues, slot, dispatch, @@ -140,7 +157,7 @@ export default function KueEinstellung({

Schleifenmessung

- +
@@ -182,6 +199,27 @@ export default function KueEinstellung({
Grenzwert (kOhm)
+ +
+ + +
diff --git a/config/webVersion.ts b/config/webVersion.ts index 52676a6..55d936a 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.272"; +const webVersion = "1.6.273"; export default webVersion; diff --git a/public/CPL/SERVICE/kueData.js b/public/CPL/SERVICE/kueData.js index 21c1b75..2be5ae4 100644 --- a/public/CPL/SERVICE/kueData.js +++ b/public/CPL/SERVICE/kueData.js @@ -30,3 +30,5 @@ var win_tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>];//TDR-Funktion a var win_tdrLast=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>];//Zeitpunkt der letzten TDR Messung //--------------------------------------------------- + +var win_memoryInterval=[<%=KIL80%>,<%=KIL81%>,<%=KIL82%>,<%=KIL83%>];//Speicherintervall (Kein, 1 MInute, 5 Minuten, 10 Minuten, 15 Minuten, 30 Minuten, 60 Minuten, 360 Minuten (6h), 720 Minuten (12h) diff --git a/redux/slices/kueDataSlice.ts b/redux/slices/kueDataSlice.ts index 65ac6c1..c030385 100644 --- a/redux/slices/kueDataSlice.ts +++ b/redux/slices/kueDataSlice.ts @@ -40,6 +40,7 @@ interface KueDataState { tdrLast: string[]; tdrOverflow: number[]; kueLimit2High: number[]; + memoryInterval: number[]; } const initialState: KueDataState = { @@ -81,6 +82,7 @@ const initialState: KueDataState = { tdrLast: [], tdrOverflow: [], kueLimit2High: [], + memoryInterval: [], }; const kueDataSlice = createSlice({ diff --git a/services/fetchKueDataService.ts b/services/fetchKueDataService.ts index 19ffadb..543e8b2 100644 --- a/services/fetchKueDataService.ts +++ b/services/fetchKueDataService.ts @@ -50,7 +50,9 @@ export const fetchKueDataService = async () => { tdrLocation: win.win_tdrLocation || [], tdrActive: win.win_tdrActive || [], tdrLast: win.win_tdrLast || [], - tdrOverflow: win.win_kueOverflow || [], // ggf. abgleichen, ob tdrOverflow separat existiert + tdrOverflow: win.win_kueOverflow || [], + // + memoryInterval: win.win_memoryInterval || [], }; } catch (error) { console.error("❌ Fehler beim Laden der KÜE-Daten:", error);