diff --git a/.env.development b/.env.development index 3cecc55..89e1f45 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.731 +NEXT_PUBLIC_APP_VERSION=1.6.732 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 eea7f30..3308887 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.731 +NEXT_PUBLIC_APP_VERSION=1.6.732 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c36762c..b84e7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.6.732] – 2025-08-15 + +- Das automatische Nachladen im DetailModal.tsx passiert jetzt nur noch alle 4 Sekunden und maximal 2 Mal. Damit wird dein Embedded-System geschont und es gibt keine Überlastung durch zu viele Anfragen. + +--- ## [1.6.731] – 2025-08-15 - Fix: Messkurven-Modal (ISO/RSL) lädt Kurve automatisch, setzt Dropdown & DateRangePicker korrekt zurück diff --git a/components/main/analogInputs/AnalogInputsChart.tsx b/components/main/analogInputs/AnalogInputsChart.tsx index abdc13a..665b81a 100644 --- a/components/main/analogInputs/AnalogInputsChart.tsx +++ b/components/main/analogInputs/AnalogInputsChart.tsx @@ -199,15 +199,15 @@ export default function AnalogInputsChart({ ? zeitraum === "DIA0" ? [ { - label: "Minimum ", // (i) + label: "Messwert Minimum ", // (i) data: filteredData .filter((p) => typeof p.i === "number") .map((p) => ({ x: new Date(p.t), y: p.i })), borderColor: "gray", - borderDash: [4, 2], borderWidth: 1, pointRadius: 0, tension: 0.1, + order: 1, }, { label: selectedAnalogInput?.label @@ -222,30 +222,31 @@ export default function AnalogInputsChart({ borderWidth: 2, pointRadius: 0, tension: 0.1, + order: 2, }, { - label: "Maximum ", // (a) + label: "Messwert Maximum ", // (a) data: filteredData .filter((p) => typeof p.a === "number") .map((p) => ({ x: new Date(p.t), y: p.a })), borderColor: "gray", - borderDash: [4, 2], borderWidth: 1, pointRadius: 0, tension: 0.1, + order: 3, }, ] : [ { - label: "Minimum", // (i) + label: "Messwert Minimum", // (i) data: filteredData .filter((p) => typeof p.i === "number") .map((p) => ({ x: new Date(p.t), y: p.i })), borderColor: "gray", - borderDash: [4, 2], borderWidth: 1, pointRadius: 0, tension: 0.1, + order: 1, }, { label: "Durchschnitt", // (g) @@ -257,17 +258,18 @@ export default function AnalogInputsChart({ borderWidth: 2, pointRadius: 0, tension: 0.1, + order: 2, }, { - label: "Maximum", // (a) + label: "Messwert Maximum", // (a) data: filteredData .filter((p) => typeof p.a === "number") .map((p) => ({ x: new Date(p.t), y: p.a })), borderColor: "gray", - borderDash: [4, 2], borderWidth: 1, pointRadius: 0, tension: 0.1, + order: 3, }, ] : [], diff --git a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoMeasurementChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoMeasurementChart.tsx index 700438a..0249141 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoMeasurementChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoMeasurementChart.tsx @@ -119,7 +119,6 @@ const IsoMeasurementChart = () => { label: "Messwert Minimum", data: isoMeasurementCurveChartData.map((e) => e.i).reverse(), borderColor: "lightgrey", - backgroundColor: "rgba(211,211,211,0.5)", borderWidth: 2, pointRadius: 0, pointHoverRadius: 10, @@ -129,13 +128,11 @@ const IsoMeasurementChart = () => { { label: "Messwert Maximum", data: isoMeasurementCurveChartData.map((e) => e.a).reverse(), - borderColor: "lightgrey", - backgroundColor: "rgba(211,211,211,0.5)", - borderWidth: 2, + borderColor: "gray", + borderWidth: 1, pointRadius: 0, - pointHoverRadius: 10, tension: 0.1, - order: 1, + order: 3, }, selectedMode === "DIA0" ? { @@ -147,7 +144,7 @@ const IsoMeasurementChart = () => { pointRadius: 0, pointHoverRadius: 10, tension: 0.1, - order: 3, + order: 2, } : { label: "Messwert Durchschnitt", @@ -158,7 +155,7 @@ const IsoMeasurementChart = () => { pointRadius: 0, pointHoverRadius: 10, tension: 0.1, - order: 3, + order: 2, }, ], }; diff --git a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx index 5923af5..b787d3d 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx @@ -118,24 +118,20 @@ const LoopMeasurementChart = () => { { label: "Messwert Minimum", data: loopMeasurementCurveChartData.map((e) => e.i).reverse(), - borderColor: "lightgrey", - backgroundColor: "rgba(211,211,211,0.5)", - borderWidth: 2, + borderColor: "gray", + borderWidth: 1, pointRadius: 0, - pointHoverRadius: 10, tension: 0.1, order: 1, }, { label: "Messwert Maximum", data: loopMeasurementCurveChartData.map((e) => e.a).reverse(), - borderColor: "lightgrey", - backgroundColor: "rgba(211,211,211,0.5)", - borderWidth: 2, + borderColor: "gray", + borderWidth: 1, pointRadius: 0, - pointHoverRadius: 10, tension: 0.1, - order: 1, + order: 3, }, selectedMode === "DIA0" ? { @@ -147,7 +143,7 @@ const LoopMeasurementChart = () => { pointRadius: 0, pointHoverRadius: 10, tension: 0.1, - order: 3, + order: 2, } : { label: "Messwert Durchschnitt", @@ -158,7 +154,7 @@ const LoopMeasurementChart = () => { pointRadius: 0, pointHoverRadius: 10, tension: 0.1, - order: 3, + order: 2, }, ], }; diff --git a/components/main/system/DetailModal.tsx b/components/main/system/DetailModal.tsx index f790479..9700314 100644 --- a/components/main/system/DetailModal.tsx +++ b/components/main/system/DetailModal.tsx @@ -332,29 +332,31 @@ export const DetailModal = ({ // Zuerst Hintergrund-Linien (Minimum/Maximum) - grau if (hasMinimum) { datasets.push({ - label: "Minimum", + label: "Messwert Minimum", data: reduxData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.i || 0, })), - borderColor: chartColors.gray.line, - backgroundColor: chartColors.gray.background, + borderColor: "gray", + borderWidth: 1, + pointRadius: 0, tension: 0.1, - fill: false, + order: 1, }); } if (hasMaximum) { datasets.push({ - label: "Maximum", + label: "Messwert Maximum", data: reduxData.map((entry) => ({ x: new Date(entry.t).getTime(), y: entry.a || 0, })), - borderColor: chartColors.gray.line, - backgroundColor: chartColors.gray.background, + borderColor: "gray", + borderWidth: 1, + pointRadius: 0, tension: 0.1, - fill: false, + order: 3, }); } @@ -370,6 +372,7 @@ export const DetailModal = ({ backgroundColor: chartColors.littwinBlue.background, tension: 0.1, fill: false, + order: 2, }); } @@ -384,6 +387,7 @@ export const DetailModal = ({ backgroundColor: chartColors.littwinBlue.background, tension: 0.1, fill: false, + order: 2, }); } diff --git a/package-lock.json b/package-lock.json index d82f40d..145bc42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.731", + "version": "1.6.732", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.731", + "version": "1.6.732", "dependencies": { "@fontsource/roboto": "^5.1.0", "@headlessui/react": "^2.2.4", diff --git a/package.json b/package.json index e6d3cca..a135fb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.731", + "version": "1.6.732", "private": true, "scripts": { "dev": "next dev",