Ismail/CPLv4.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: Messwertkurven Legende und Liniern style angepasst

Browse Source
This commit is contained in:
ISA
2025-08-15 13:59:19 +02:00
parent 7d6263b6fb
commit 04b9a0dc1d
9 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
NEXT_PUBLIC_EXPORT_STATIC=false NEXT_PUBLIC_EXPORT_STATIC=false
NEXT_PUBLIC_USE_CGI=false NEXT_PUBLIC_USE_CGI=false
# App-Versionsnummer # 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) NEXT_PUBLIC_CPL_MODE=json # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)

2
.env.production
View File

@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
NEXT_PUBLIC_EXPORT_STATIC=true NEXT_PUBLIC_EXPORT_STATIC=true
NEXT_PUBLIC_USE_CGI=true NEXT_PUBLIC_USE_CGI=true
# App-Versionsnummer # App-Versionsnummer
NEXT_PUBLIC_APP_VERSION=1.6.731 NEXT_PUBLIC_APP_VERSION=1.6.732
NEXT_PUBLIC_CPL_MODE=production NEXT_PUBLIC_CPL_MODE=production

5
CHANGELOG.md
View File

@@ -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 ## [1.6.731] – 2025-08-15
- Fix: Messkurven-Modal (ISO/RSL) lädt Kurve automatisch, setzt Dropdown & DateRangePicker korrekt zurück - Fix: Messkurven-Modal (ISO/RSL) lädt Kurve automatisch, setzt Dropdown & DateRangePicker korrekt zurück

18
components/main/analogInputs/AnalogInputsChart.tsx
View File

@@ -199,15 +199,15 @@ export default function AnalogInputsChart({
? zeitraum === "DIA0" ? zeitraum === "DIA0"
? [ ? [
{ {
label: "Minimum ", // (i) label: "Messwert Minimum ", // (i)
data: filteredData data: filteredData
.filter((p) => typeof p.i === "number") .filter((p) => typeof p.i === "number")
.map((p) => ({ x: new Date(p.t), y: p.i })), .map((p) => ({ x: new Date(p.t), y: p.i })),
borderColor: "gray", borderColor: "gray",
borderDash: [4, 2],
borderWidth: 1, borderWidth: 1,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 1,
}, },
{ {
label: selectedAnalogInput?.label label: selectedAnalogInput?.label
@@ -222,30 +222,31 @@ export default function AnalogInputsChart({
borderWidth: 2, borderWidth: 2,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 2,
}, },
{ {
label: "Maximum ", // (a) label: "Messwert Maximum ", // (a)
data: filteredData data: filteredData
.filter((p) => typeof p.a === "number") .filter((p) => typeof p.a === "number")
.map((p) => ({ x: new Date(p.t), y: p.a })), .map((p) => ({ x: new Date(p.t), y: p.a })),
borderColor: "gray", borderColor: "gray",
borderDash: [4, 2],
borderWidth: 1, borderWidth: 1,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 3,
}, },
] ]
: [ : [
{ {
label: "Minimum", // (i) label: "Messwert Minimum", // (i)
data: filteredData data: filteredData
.filter((p) => typeof p.i === "number") .filter((p) => typeof p.i === "number")
.map((p) => ({ x: new Date(p.t), y: p.i })), .map((p) => ({ x: new Date(p.t), y: p.i })),
borderColor: "gray", borderColor: "gray",
borderDash: [4, 2],
borderWidth: 1, borderWidth: 1,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 1,
}, },
{ {
label: "Durchschnitt", // (g) label: "Durchschnitt", // (g)
@@ -257,17 +258,18 @@ export default function AnalogInputsChart({
borderWidth: 2, borderWidth: 2,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 2,
}, },
{ {
label: "Maximum", // (a) label: "Messwert Maximum", // (a)
data: filteredData data: filteredData
.filter((p) => typeof p.a === "number") .filter((p) => typeof p.a === "number")
.map((p) => ({ x: new Date(p.t), y: p.a })), .map((p) => ({ x: new Date(p.t), y: p.a })),
borderColor: "gray", borderColor: "gray",
borderDash: [4, 2],
borderWidth: 1, borderWidth: 1,
pointRadius: 0, pointRadius: 0,
tension: 0.1, tension: 0.1,
order: 3,
}, },
] ]
: [], : [],

13
components/main/kabelueberwachung/kue705FO/Charts/IsoMeasurementChart/IsoMeasurementChart.tsx
View File

@@ -119,7 +119,6 @@ const IsoMeasurementChart = () => {
label: "Messwert Minimum", label: "Messwert Minimum",
data: isoMeasurementCurveChartData.map((e) => e.i).reverse(), data: isoMeasurementCurveChartData.map((e) => e.i).reverse(),
borderColor: "lightgrey", borderColor: "lightgrey",
backgroundColor: "rgba(211,211,211,0.5)",
borderWidth: 2, borderWidth: 2,
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10, pointHoverRadius: 10,
@@ -129,13 +128,11 @@ const IsoMeasurementChart = () => {
{ {
label: "Messwert Maximum", label: "Messwert Maximum",
data: isoMeasurementCurveChartData.map((e) => e.a).reverse(), data: isoMeasurementCurveChartData.map((e) => e.a).reverse(),
borderColor: "lightgrey", borderColor: "gray",
backgroundColor: "rgba(211,211,211,0.5)", borderWidth: 1,
borderWidth: 2,
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 1, order: 3,
}, },
selectedMode === "DIA0" selectedMode === "DIA0"
? { ? {
@@ -147,7 +144,7 @@ const IsoMeasurementChart = () => {
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10, pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 3, order: 2,
} }
: { : {
label: "Messwert Durchschnitt", label: "Messwert Durchschnitt",
@@ -158,7 +155,7 @@ const IsoMeasurementChart = () => {
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10, pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 3, order: 2,
}, },
], ],
}; };

18
components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx
View File

@@ -118,24 +118,20 @@ const LoopMeasurementChart = () => {
{ {
label: "Messwert Minimum", label: "Messwert Minimum",
data: loopMeasurementCurveChartData.map((e) => e.i).reverse(), data: loopMeasurementCurveChartData.map((e) => e.i).reverse(),
borderColor: "lightgrey", borderColor: "gray",
backgroundColor: "rgba(211,211,211,0.5)", borderWidth: 1,
borderWidth: 2,
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 1, order: 1,
}, },
{ {
label: "Messwert Maximum", label: "Messwert Maximum",
data: loopMeasurementCurveChartData.map((e) => e.a).reverse(), data: loopMeasurementCurveChartData.map((e) => e.a).reverse(),
borderColor: "lightgrey", borderColor: "gray",
backgroundColor: "rgba(211,211,211,0.5)", borderWidth: 1,
borderWidth: 2,
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 1, order: 3,
}, },
selectedMode === "DIA0" selectedMode === "DIA0"
? { ? {
@@ -147,7 +143,7 @@ const LoopMeasurementChart = () => {
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10, pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 3, order: 2,
} }
: { : {
label: "Messwert Durchschnitt", label: "Messwert Durchschnitt",
@@ -158,7 +154,7 @@ const LoopMeasurementChart = () => {
pointRadius: 0, pointRadius: 0,
pointHoverRadius: 10, pointHoverRadius: 10,
tension: 0.1, tension: 0.1,
order: 3, order: 2,
}, },
], ],
}; };

20
components/main/system/DetailModal.tsx
View File

@@ -332,29 +332,31 @@ export const DetailModal = ({
// Zuerst Hintergrund-Linien (Minimum/Maximum) - grau // Zuerst Hintergrund-Linien (Minimum/Maximum) - grau
if (hasMinimum) { if (hasMinimum) {
datasets.push({ datasets.push({
label: "Minimum", label: "Messwert Minimum",
data: reduxData.map((entry) => ({ data: reduxData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.i || 0, y: entry.i || 0,
})), })),
borderColor: chartColors.gray.line, borderColor: "gray",
backgroundColor: chartColors.gray.background, borderWidth: 1,
pointRadius: 0,
tension: 0.1, tension: 0.1,
fill: false, order: 1,
}); });
} }
if (hasMaximum) { if (hasMaximum) {
datasets.push({ datasets.push({
label: "Maximum", label: "Messwert Maximum",
data: reduxData.map((entry) => ({ data: reduxData.map((entry) => ({
x: new Date(entry.t).getTime(), x: new Date(entry.t).getTime(),
y: entry.a || 0, y: entry.a || 0,
})), })),
borderColor: chartColors.gray.line, borderColor: "gray",
backgroundColor: chartColors.gray.background, borderWidth: 1,
pointRadius: 0,
tension: 0.1, tension: 0.1,
fill: false, order: 3,
}); });
} }
@@ -370,6 +372,7 @@ export const DetailModal = ({
backgroundColor: chartColors.littwinBlue.background, backgroundColor: chartColors.littwinBlue.background,
tension: 0.1, tension: 0.1,
fill: false, fill: false,
order: 2,
}); });
} }
@@ -384,6 +387,7 @@ export const DetailModal = ({
backgroundColor: chartColors.littwinBlue.background, backgroundColor: chartColors.littwinBlue.background,
tension: 0.1, tension: 0.1,
fill: false, fill: false,
order: 2,
}); });
} }

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.731", "version": "1.6.732",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.731", "version": "1.6.732",
"dependencies": { "dependencies": {
"@fontsource/roboto": "^5.1.0", "@fontsource/roboto": "^5.1.0",
"@headlessui/react": "^2.2.4", "@headlessui/react": "^2.2.4",

2
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.731", "version": "1.6.732",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev", "dev": "next dev",