From cd28e5085c600ec95d09318b81343870cbc16329 Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 20 Feb 2025 10:37:56 +0100 Subject: [PATCH] mockChartData inCPLmockData verschoben --- .../LoopMeasurementChart/LoopChartActionBar.tsx | 2 +- .../LoopMeasurementChart/LoopMeasurementChart.tsx | 6 +++--- config/webVersion.ts | 2 +- pages/analogeEingaenge.tsx | 4 +++- public/CPLmockData/mockChartData.json | 12 ++++++++++++ public/mockData.json | 12 ------------ 6 files changed, 20 insertions(+), 18 deletions(-) create mode 100644 public/CPLmockData/mockChartData.json delete mode 100644 public/mockData.json diff --git a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx index db1abf3..ee9e9a3 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopChartActionBar.tsx @@ -13,7 +13,7 @@ const LoopChartActionBar: React.FC = () => { try { const apiUrl = process.env.NODE_ENV === "development" - ? "/mockData.json" + ? "/CPLmockData/mockChartData.json" : `/CPL?seite.ACP&DIA1=2025;01;01;2025;07;31;${slotIndex};${schleifenwiderstand}`; const response = await fetch(apiUrl); diff --git a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx index 9e0f4bb..472a5d2 100644 --- a/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx +++ b/components/main/kabelueberwachung/kue705FO/Charts/LoopMeasurementChart/LoopMeasurementChart.tsx @@ -34,7 +34,7 @@ const LoopMeasurementChart = () => { data: { datasets: [ { - label: "Messwert i (kOhm)", + label: "Messwert Minimum (kOhm)", // Messwert i (kOhm) data: processedData.map((entry) => ({ x: entry.timestampMs, y: entry.i, @@ -44,7 +44,7 @@ const LoopMeasurementChart = () => { fill: true, }, { - label: "Messwert a (kOhm)", + label: "Messwert Maximum (kOhm)", // Messwert a (kOhm) data: processedData.map((entry) => ({ x: entry.timestampMs, y: entry.a, @@ -54,7 +54,7 @@ const LoopMeasurementChart = () => { fill: true, }, { - label: "Messwert g (kOhm)", + label: "Messwert Durchschnitt (kOhm)", // Messwert g (kOhm) data: processedData.map((entry) => ({ x: entry.timestampMs, y: entry.g, diff --git a/config/webVersion.ts b/config/webVersion.ts index 92e5d4b..e27702f 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.63"; +const webVersion = "1.6.64"; export default webVersion; diff --git a/pages/analogeEingaenge.tsx b/pages/analogeEingaenge.tsx index 04cf2fd..04a102f 100644 --- a/pages/analogeEingaenge.tsx +++ b/pages/analogeEingaenge.tsx @@ -18,7 +18,8 @@ function AnalogeEingaenge() {

Diagramm

Diagramm wird hier eingefügt

- + {/* + setActiveConfig(id)} /> + */} ); diff --git a/public/CPLmockData/mockChartData.json b/public/CPLmockData/mockChartData.json new file mode 100644 index 0000000..9065e09 --- /dev/null +++ b/public/CPLmockData/mockChartData.json @@ -0,0 +1,12 @@ +[ + { "t": "14-02-2025 10:00:00", "i": 10.116, "a": 50.116, "g": 23.116 }, + { "t": "14-02-2025 09:00:00", "i": 12.116, "a": 36.116, "g": 24.116 }, + { "t": "14-02-2025 08:00:00", "i": 8.116, "a": 24.116, "g": 12.116 }, + { "t": "13-02-2025 15:00:00", "i": 4.0, "a": 26.0, "g": 15.0 }, + { "t": "13-02-2025 14:00:00", "i": 10.0, "a": 36.0, "g": 21.0 }, + { "t": "13-02-2025 13:00:00", "i": 15.0, "a": 30.0, "g": 20.0 }, + { "t": "13-02-2025 12:00:00", "i": 12.0, "a": 50.0, "g": 25.0 }, + { "t": "13-02-2025 11:00:00", "i": 15.0, "a": 40.0, "g": 20.0 }, + { "t": "13-02-2025 10:00:00", "i": 10.0, "a": 35.0, "g": 26.0 }, + { "t": "13-02-2025 09:00:00", "i": 13.0, "a": 43.0, "g": 24.0 } +] diff --git a/public/mockData.json b/public/mockData.json deleted file mode 100644 index 46ca41a..0000000 --- a/public/mockData.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { "t": "14-02-2025 10:00:00", "i": 10.116, "a": 3.116, "g": 3.116 }, - { "t": "14-02-2025 09:00:00", "i": 3.116, "a": 8.116, "g": 3.116 }, - { "t": "14-02-2025 08:00:00", "i": 3.116, "a": 3.116, "g": 25.116 }, - { "t": "13-02-2025 15:00:00", "i": 5.0, "a": 65.0, "g": 65.0 }, - { "t": "13-02-2025 14:00:00", "i": 65.0, "a": 6.0, "g": 65.0 }, - { "t": "13-02-2025 13:00:00", "i": 65.0, "a": 65.0, "g": 70.0 }, - { "t": "13-02-2025 12:00:00", "i": 65.0, "a": 65.0, "g": 65.0 }, - { "t": "13-02-2025 11:00:00", "i": 65.0, "a": 65.0, "g": 65.0 }, - { "t": "13-02-2025 10:00:00", "i": 65.0, "a": 65.0, "g": 65.0 }, - { "t": "13-02-2025 09:00:00", "i": 65.0, "a": 65.0, "g": 65.0 } -]