From c60cfa1b92190d25d720076fbdbb6432cab2125f Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 24 Apr 2025 14:25:49 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20Tooltip=20f=C3=BCr=20Eingangszust=C3=A4?= =?UTF-8?q?nde=20eingebaut=20und=20versetzt=20positioniert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Tooltip-Text erscheint bei Mouseover über Symbol - Unterscheidung: Eingang inaktiv (✖), Eingang Aus (● rot), Eingang Ein (● grün) - Position des Tooltips mit translate-x-4 und translate-y-4 optimiert --- .../SERVICE/digitaleEingaengeMockData.js | 241 ++---------------- .../main/einausgaenge/DigitalInputs.tsx | 23 +- .../main/einausgaenge/modals/InputModal.tsx | 4 +- config/webVersion.ts | 2 +- 4 files changed, 38 insertions(+), 232 deletions(-) diff --git a/apiMockData/SERVICE/digitaleEingaengeMockData.js b/apiMockData/SERVICE/digitaleEingaengeMockData.js index abb3da3..69441ac 100644 --- a/apiMockData/SERVICE/digitaleEingaengeMockData.js +++ b/apiMockData/SERVICE/digitaleEingaengeMockData.js @@ -1,242 +1,31 @@ - // auto-generated from update API var win_de_state = [ - 1, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, ]; var win_de_invert = [ - 0, - 0, - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, ]; var win_de_counter = [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, ]; var win_de_time_filter = [ - 2000, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 2000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, ]; var win_de_weighting = [ - 1000, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, ]; var win_de_counter_active = [ - 1, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, ]; var win_de_offline = [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, ]; var win_de_label = [ "DE1", @@ -270,5 +59,5 @@ var win_de_label = [ "DE29", "DE30", "DE31", - "DE32" + "DE32", ]; diff --git a/components/main/einausgaenge/DigitalInputs.tsx b/components/main/einausgaenge/DigitalInputs.tsx index 90a62cc..265214c 100644 --- a/components/main/einausgaenge/DigitalInputs.tsx +++ b/components/main/einausgaenge/DigitalInputs.tsx @@ -44,10 +44,27 @@ export default function DigitalInputs({ openInputModal, inputRange }: Props) { {input.id} - {input.status ? ( - + {input.eingangOffline ? ( +
+ +
+ Eingang inaktiv +
+
+ ) : input.status ? ( +
+ +
+ Eingang Aus +
+
) : ( - +
+ +
+ Eingang Ein +
+
)} diff --git a/components/main/einausgaenge/modals/InputModal.tsx b/components/main/einausgaenge/modals/InputModal.tsx index 2f27e3a..05827f1 100644 --- a/components/main/einausgaenge/modals/InputModal.tsx +++ b/components/main/einausgaenge/modals/InputModal.tsx @@ -113,12 +113,12 @@ export default function InputModal({ selectedInput, closeInputModal, isOpen }) {
{reduxInput.status ? ( <> - + Aus ) : ( <> - + Ein )} diff --git a/config/webVersion.ts b/config/webVersion.ts index 54146f1..52676a6 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.271"; +const webVersion = "1.6.272"; export default webVersion;