fix: speicherintervall im Parameterobjekt von handleSave ergänzt und Fehler behoben
This commit is contained in:
@@ -8,6 +8,7 @@ export interface OriginalValues {
|
|||||||
untereSchleifenGrenzwerte: number[];
|
untereSchleifenGrenzwerte: number[];
|
||||||
obereSchleifenGrenzwerte: number[];
|
obereSchleifenGrenzwerte: number[];
|
||||||
schleifenintervall: number[];
|
schleifenintervall: number[];
|
||||||
|
speicherintervall: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
interface HandleSaveParams {
|
interface HandleSaveParams {
|
||||||
@@ -17,6 +18,7 @@ interface HandleSaveParams {
|
|||||||
untereSchleifenGrenzwerte: number[];
|
untereSchleifenGrenzwerte: number[];
|
||||||
obereSchleifenGrenzwerte: number[];
|
obereSchleifenGrenzwerte: number[];
|
||||||
schleifenintervall: number[];
|
schleifenintervall: number[];
|
||||||
|
speicherintervall: number[]; // ✅ NEU hinzugefügt
|
||||||
originalValues: OriginalValues;
|
originalValues: OriginalValues;
|
||||||
slot: number;
|
slot: number;
|
||||||
dispatch: (action: any) => void;
|
dispatch: (action: any) => void;
|
||||||
@@ -41,6 +43,7 @@ const handleSave = async ({
|
|||||||
untereSchleifenGrenzwerte,
|
untereSchleifenGrenzwerte,
|
||||||
obereSchleifenGrenzwerte,
|
obereSchleifenGrenzwerte,
|
||||||
schleifenintervall,
|
schleifenintervall,
|
||||||
|
speicherintervall,
|
||||||
originalValues,
|
originalValues,
|
||||||
slot,
|
slot,
|
||||||
dispatch,
|
dispatch,
|
||||||
@@ -84,7 +87,17 @@ const handleSave = async ({
|
|||||||
schleifenintervall[slot],
|
schleifenintervall[slot],
|
||||||
originalValues.schleifenintervall[slot]
|
originalValues.schleifenintervall[slot]
|
||||||
)
|
)
|
||||||
) {
|
)
|
||||||
|
if (
|
||||||
|
isDifferent(
|
||||||
|
speicherintervall[slot],
|
||||||
|
originalValues.speicherintervall[slot]
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
changesForFile.KME = speicherintervall[slot];
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
changesForFile.KRI = schleifenintervall[slot];
|
changesForFile.KRI = schleifenintervall[slot];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,8 +8,10 @@ declare global {
|
|||||||
win_kueLimit2Low?: number[];
|
win_kueLimit2Low?: number[];
|
||||||
win_kueLimit2High?: number[];
|
win_kueLimit2High?: number[];
|
||||||
win_kueLoopInterval?: number[];
|
win_kueLoopInterval?: number[];
|
||||||
|
win_memoryInterval?: number[];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
import type { RootState } from "../../../../../redux/store";
|
import type { RootState } from "../../../../../redux/store";
|
||||||
import { setKueData } from "../../../../../redux/slices/kueDataSlice";
|
import { setKueData } from "../../../../../redux/slices/kueDataSlice";
|
||||||
@@ -24,6 +26,18 @@ interface Props {
|
|||||||
onModulNameChange?: (id: string) => void;
|
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({
|
export default function KueEinstellung({
|
||||||
slot,
|
slot,
|
||||||
onClose = () => {},
|
onClose = () => {},
|
||||||
@@ -35,8 +49,9 @@ export default function KueEinstellung({
|
|||||||
kueLimit1,
|
kueLimit1,
|
||||||
kueDelay1,
|
kueDelay1,
|
||||||
kueLimit2Low,
|
kueLimit2Low,
|
||||||
kueLoopInterval,
|
|
||||||
kueLimit2High,
|
kueLimit2High,
|
||||||
|
kueLoopInterval,
|
||||||
|
memoryInterval,
|
||||||
} = useSelector((state: RootState) => state.kueDataSlice);
|
} = useSelector((state: RootState) => state.kueDataSlice);
|
||||||
|
|
||||||
const { isAdminLoggedIn } = useAdminAuth(true);
|
const { isAdminLoggedIn } = useAdminAuth(true);
|
||||||
@@ -49,6 +64,7 @@ export default function KueEinstellung({
|
|||||||
untereSchleifenGrenzwerte: [...(window.win_kueLimit2Low ?? [])],
|
untereSchleifenGrenzwerte: [...(window.win_kueLimit2Low ?? [])],
|
||||||
obereSchleifenGrenzwerte: [...(window.win_kueLimit2High ?? [])],
|
obereSchleifenGrenzwerte: [...(window.win_kueLimit2High ?? [])],
|
||||||
schleifenintervall: [...(window.win_kueLoopInterval ?? [])],
|
schleifenintervall: [...(window.win_kueLoopInterval ?? [])],
|
||||||
|
speicherintervall: [...(window.win_memoryInterval ?? [])],
|
||||||
};
|
};
|
||||||
|
|
||||||
handleSave({
|
handleSave({
|
||||||
@@ -58,6 +74,7 @@ export default function KueEinstellung({
|
|||||||
untereSchleifenGrenzwerte: [...kueLimit2Low],
|
untereSchleifenGrenzwerte: [...kueLimit2Low],
|
||||||
obereSchleifenGrenzwerte: [...kueLimit2High],
|
obereSchleifenGrenzwerte: [...kueLimit2High],
|
||||||
schleifenintervall: [...kueLoopInterval],
|
schleifenintervall: [...kueLoopInterval],
|
||||||
|
speicherintervall: [...memoryInterval],
|
||||||
originalValues,
|
originalValues,
|
||||||
slot,
|
slot,
|
||||||
dispatch,
|
dispatch,
|
||||||
@@ -140,7 +157,7 @@ export default function KueEinstellung({
|
|||||||
|
|
||||||
<div>
|
<div>
|
||||||
<h3 className="font-bold text-center mb-2">Schleifenmessung</h3>
|
<h3 className="font-bold text-center mb-2">Schleifenmessung</h3>
|
||||||
<table className="w-full border-collapse text-sm">
|
<table className="w-full border-collapse text-sm mb-2">
|
||||||
<thead className="bg-gray-100">
|
<thead className="bg-gray-100">
|
||||||
<tr>
|
<tr>
|
||||||
<th className="border p-2 text-center">Grenzwert (kOhm)</th>
|
<th className="border p-2 text-center">Grenzwert (kOhm)</th>
|
||||||
@@ -182,6 +199,27 @@ export default function KueEinstellung({
|
|||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label className="font-bold block mb-1">Speicherintervall</label>
|
||||||
|
<select
|
||||||
|
className="w-full border rounded p-1 text-sm"
|
||||||
|
value={memoryInterval[slot] ?? ""}
|
||||||
|
onChange={(e) =>
|
||||||
|
updateArray(
|
||||||
|
"memoryInterval",
|
||||||
|
memoryInterval,
|
||||||
|
parseInt(e.target.value, 10)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{memoryIntervalOptions.map((opt) => (
|
||||||
|
<option key={opt.value} value={opt.value}>
|
||||||
|
{opt.label}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex justify-end gap-2 bg-gray-100 p-3 rounded">
|
<div className="flex justify-end gap-2 bg-gray-100 p-3 rounded">
|
||||||
|
|||||||
@@ -6,5 +6,5 @@
|
|||||||
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
2: Patch oder Hotfix (Bugfixes oder kleine Änderungen).
|
||||||
|
|
||||||
*/
|
*/
|
||||||
const webVersion = "1.6.272";
|
const webVersion = "1.6.273";
|
||||||
export default webVersion;
|
export default webVersion;
|
||||||
|
|||||||
@@ -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_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)
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ interface KueDataState {
|
|||||||
tdrLast: string[];
|
tdrLast: string[];
|
||||||
tdrOverflow: number[];
|
tdrOverflow: number[];
|
||||||
kueLimit2High: number[];
|
kueLimit2High: number[];
|
||||||
|
memoryInterval: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
const initialState: KueDataState = {
|
const initialState: KueDataState = {
|
||||||
@@ -81,6 +82,7 @@ const initialState: KueDataState = {
|
|||||||
tdrLast: [],
|
tdrLast: [],
|
||||||
tdrOverflow: [],
|
tdrOverflow: [],
|
||||||
kueLimit2High: [],
|
kueLimit2High: [],
|
||||||
|
memoryInterval: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
const kueDataSlice = createSlice({
|
const kueDataSlice = createSlice({
|
||||||
|
|||||||
@@ -50,7 +50,9 @@ export const fetchKueDataService = async () => {
|
|||||||
tdrLocation: win.win_tdrLocation || [],
|
tdrLocation: win.win_tdrLocation || [],
|
||||||
tdrActive: win.win_tdrActive || [],
|
tdrActive: win.win_tdrActive || [],
|
||||||
tdrLast: win.win_tdrLast || [],
|
tdrLast: win.win_tdrLast || [],
|
||||||
tdrOverflow: win.win_kueOverflow || [], // ggf. abgleichen, ob tdrOverflow separat existiert
|
tdrOverflow: win.win_kueOverflow || [],
|
||||||
|
//
|
||||||
|
memoryInterval: win.win_memoryInterval || [],
|
||||||
};
|
};
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error("❌ Fehler beim Laden der KÜE-Daten:", error);
|
console.error("❌ Fehler beim Laden der KÜE-Daten:", error);
|
||||||
|
|||||||
Reference in New Issue
Block a user