feat(iso): DateRangePicker-Zeitraum bei "Daten laden" anwenden
This commit is contained in:
@@ -11,6 +11,7 @@ import {
|
||||
setLoading,
|
||||
} from "@/redux/slices/kabelueberwachungChartSlice";
|
||||
import { setBrushRange } from "@/redux/slices/brushSlice";
|
||||
import { getMessagesThunk } from "@/redux/thunks/getMessagesThunk";
|
||||
import { Listbox } from "@headlessui/react";
|
||||
|
||||
//-----------------------------------------------------------------------------------useIsoChartLoader
|
||||
@@ -174,22 +175,31 @@ const IsoChartActionBar: React.FC = () => {
|
||||
|
||||
const { vonDatum, bisDatum, selectedMode, slotNumber, chartTitle } =
|
||||
useSelector((state: RootState) => state.kabelueberwachungChartSlice);
|
||||
// Aus DateRangePicker-Slice kommen die Werte, die der User im UI wählt
|
||||
const { vonDatum: pickerVonDatum, bisDatum: pickerBisDatum } = useSelector(
|
||||
(state: RootState) => state.dateRangePicker
|
||||
);
|
||||
|
||||
const formatDate = (dateString: string) => {
|
||||
const [year, month, day] = dateString.split("-");
|
||||
return `${year};${month};${day}`;
|
||||
};
|
||||
|
||||
const getApiUrl = (mode: "DIA0" | "DIA1" | "DIA2", slotNumber: number) => {
|
||||
const getApiUrl = (
|
||||
mode: "DIA0" | "DIA1" | "DIA2",
|
||||
slotNumber: number,
|
||||
fromDate: string,
|
||||
toDate: string
|
||||
) => {
|
||||
const type = 3; // Fest auf Isolationswiderstand gesetzt
|
||||
const typeFolder = "isolationswiderstand";
|
||||
|
||||
const baseUrl =
|
||||
process.env.NODE_ENV === "development"
|
||||
? `/api/cpl/slotDataAPIHandler?slot=${slotNumber}&messart=${typeFolder}&dia=${mode}&vonDatum=${vonDatum}&bisDatum=${bisDatum}`
|
||||
? `/api/cpl/slotDataAPIHandler?slot=${slotNumber}&messart=${typeFolder}&dia=${mode}&vonDatum=${fromDate}&bisDatum=${toDate}`
|
||||
: `${window.location.origin}/CPL?seite.ACP&${mode}=${formatDate(
|
||||
vonDatum
|
||||
)};${formatDate(bisDatum)};${slotNumber};${type};`;
|
||||
fromDate
|
||||
)};${formatDate(toDate)};${slotNumber};${type};`;
|
||||
|
||||
console.log("baseUrl", baseUrl);
|
||||
return baseUrl;
|
||||
@@ -200,8 +210,26 @@ const IsoChartActionBar: React.FC = () => {
|
||||
alert("⚠️ Bitte zuerst einen KÜ auswählen!");
|
||||
return;
|
||||
}
|
||||
// Wenn Meldungen-Ansicht aktiv ist, dann Meldungen laden
|
||||
if (chartTitle === "Meldungen") {
|
||||
try {
|
||||
dispatch(setLoading(true));
|
||||
const fromDate = pickerVonDatum ?? vonDatum;
|
||||
const toDate = pickerBisDatum ?? bisDatum;
|
||||
await dispatch(getMessagesThunk({ fromDate, toDate })).unwrap();
|
||||
} catch (err) {
|
||||
console.error("❌ Fehler beim Laden der Meldungen:", err);
|
||||
alert("❌ Fehler beim Laden der Meldungen.");
|
||||
} finally {
|
||||
dispatch(setLoading(false));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const apiUrl = getApiUrl(selectedMode, slotNumber);
|
||||
// Messkurve (ISO) laden
|
||||
const fromDate = pickerVonDatum ?? vonDatum;
|
||||
const toDate = pickerBisDatum ?? bisDatum;
|
||||
const apiUrl = getApiUrl(selectedMode, slotNumber, fromDate, toDate);
|
||||
if (!apiUrl) return;
|
||||
|
||||
dispatch(setLoading(true));
|
||||
@@ -227,8 +255,8 @@ const IsoChartActionBar: React.FC = () => {
|
||||
console.log("▶️ Lade Isolationswiderstand-Daten für:");
|
||||
console.log(" Slot:", slotNumber);
|
||||
console.log(" Modus:", selectedMode);
|
||||
console.log(" Von:", vonDatum);
|
||||
console.log(" Bis:", bisDatum);
|
||||
console.log(" Von:", fromDate);
|
||||
console.log(" Bis:", toDate);
|
||||
console.log(" URL:", apiUrl);
|
||||
console.log(" Daten:", jsonData);
|
||||
|
||||
@@ -257,12 +285,8 @@ const IsoChartActionBar: React.FC = () => {
|
||||
</div>
|
||||
|
||||
<div className="flex items-center space-x-2">
|
||||
{/* DateRangePicker - Platz reservieren, aber ausblenden wenn Meldungen */}
|
||||
<div
|
||||
style={{
|
||||
visibility: chartTitle === "Messkurve" ? "visible" : "hidden",
|
||||
}}
|
||||
>
|
||||
{/* DateRangePicker – für beide Ansichten sichtbar, da Meldungen auch datumsabhängig sind */}
|
||||
<div>
|
||||
<DateRangePicker />
|
||||
</div>
|
||||
|
||||
@@ -334,19 +358,13 @@ const IsoChartActionBar: React.FC = () => {
|
||||
{/* Dropdown für Auswahl zwischen "Messkurve" und "Meldungen" - immer anzeigen */}
|
||||
{/* Dropdown für Auswahl zwischen "Messkurve" und "Meldungen" entfernt */}
|
||||
|
||||
{/* Daten laden Button - Platz reservieren, aber ausblenden wenn Meldungen */}
|
||||
<div
|
||||
style={{
|
||||
visibility: chartTitle === "Messkurve" ? "visible" : "hidden",
|
||||
}}
|
||||
{/* Daten laden Button – lädt je nach Ansicht Messkurve oder Meldungen */}
|
||||
<button
|
||||
onClick={handleFetchData}
|
||||
className="px-4 py-1 bg-littwin-blue text-white rounded text-sm"
|
||||
>
|
||||
<button
|
||||
onClick={handleFetchData}
|
||||
className="px-4 py-1 bg-littwin-blue text-white rounded text-sm"
|
||||
>
|
||||
Daten laden
|
||||
</button>
|
||||
</div>
|
||||
Daten laden
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user