diff --git a/.env.development b/.env.development index c1909f9..234a03d 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.483 +NEXT_PUBLIC_APP_VERSION=1.6.485 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 3ff32c0..fecb297 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.483 +NEXT_PUBLIC_APP_VERSION=1.6.485 NEXT_PUBLIC_CPL_MODE=production \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 3842cd4..e5bef3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## [1.6.485] – 2025-06-27 + +- esLint + +--- +## [1.6.484] – 2025-06-27 + +- esLint + +--- ## [1.6.483] – 2025-06-26 - EsLint diff --git a/components/main/einausgaenge/DigitalInputs.tsx b/components/main/digitalInputs/DigitalInputsWidget.tsx similarity index 98% rename from components/main/einausgaenge/DigitalInputs.tsx rename to components/main/digitalInputs/DigitalInputsWidget.tsx index 8ec8855..ba61756 100644 --- a/components/main/einausgaenge/DigitalInputs.tsx +++ b/components/main/digitalInputs/DigitalInputsWidget.tsx @@ -1,5 +1,5 @@ "use client"; -// /components/main/einausgaenge/DigitalInputs.tsx +// /components/main/digitalOutputs/DigitalInputs.tsx import React from "react"; import { useSelector } from "react-redux"; import { RootState } from "../../../redux/store"; diff --git a/components/main/einausgaenge/modals/InputModal.tsx b/components/main/digitalInputs/digitalInputsModal.tsx similarity index 99% rename from components/main/einausgaenge/modals/InputModal.tsx rename to components/main/digitalInputs/digitalInputsModal.tsx index bdfc078..1d9a3ff 100644 --- a/components/main/einausgaenge/modals/InputModal.tsx +++ b/components/main/digitalInputs/digitalInputsModal.tsx @@ -1,5 +1,5 @@ "use client"; -// /components/main/einausgaenge/modals/InputModal.tsx +// /components/main/digitalInputs/InputModal.tsx import React, { useEffect, useState } from "react"; import { useSelector, useDispatch } from "react-redux"; import { RootState } from "@/redux/store"; diff --git a/components/main/einausgaenge/modals/DigitalOutputsModal.tsx b/components/main/digitalOutputs/DigitalOutputsModal.tsx similarity index 97% rename from components/main/einausgaenge/modals/DigitalOutputsModal.tsx rename to components/main/digitalOutputs/DigitalOutputsModal.tsx index a007f24..4bf6190 100644 --- a/components/main/einausgaenge/modals/DigitalOutputsModal.tsx +++ b/components/main/digitalOutputs/DigitalOutputsModal.tsx @@ -1,7 +1,7 @@ -"use client"; // /components/main/einausgaenge/modals/DigitalOutputsModal.tsx +"use client"; // /components/main/digitalOutputs/DigitalOutputsModal.tsx import React, { useState, useEffect } from "react"; import { useSelector } from "react-redux"; -import { RootState } from "../../../../redux/store"; +import { RootState } from "@/redux/store"; import type { DigitalOutput } from "@/types/digitalOutput"; export default function DigitalOutputsModal({ diff --git a/components/main/einausgaenge/DigitalOutputsWidget.tsx b/components/main/digitalOutputs/DigitalOutputsWidget.tsx similarity index 98% rename from components/main/einausgaenge/DigitalOutputsWidget.tsx rename to components/main/digitalOutputs/DigitalOutputsWidget.tsx index 37d2af8..ae4db1d 100644 --- a/components/main/einausgaenge/DigitalOutputsWidget.tsx +++ b/components/main/digitalOutputs/DigitalOutputsWidget.tsx @@ -1,5 +1,5 @@ "use client"; -// /components/main/einausgaenge/DigitalOutputsWidget.tsx +// /components/main/digitalOutputs/DigitalOutputsWidget.tsx import React from "react"; import { useSelector, useDispatch } from "react-redux"; import { RootState, AppDispatch } from "../../../redux/store"; diff --git a/components/main/einausgaenge/README.md b/components/main/einausgaenge/README.md deleted file mode 100644 index 17bced6..0000000 --- a/components/main/einausgaenge/README.md +++ /dev/null @@ -1,43 +0,0 @@ -### 🧩 Datenfluss CPLv4.0 Digitale Eingänge - -```mermaid -classDiagram - -class EmbeddedServer { - + Generiert de.js per CGI - + Ersetzt Platzhalter wie <%=DES81%> - + Kein Node.js vorhanden -} - -class DeJS { - + JavaScript mit konkreten Werten - + Beispiel: win_de_state, win_de_label -} - -class FrontendLoader { - + Lädt de.js dynamisch mit script-Tag - + Pfad: /CPL?/CPL/SERVICE/de.js -} - -class DatenMapper { - + Wandelt window-Variablen in Objekte - + Wandelt in strukturierte Eingangs-Daten -} - -class ReduxStore { - + digitalInputsSlice - + Speichert die Eingänge im State -} - -class ReactComponent { - + DigitalInputs.tsx - + useSelector: Zugriff auf Redux - + Darstellung mit Tailwind -} - -EmbeddedServer --> DeJS : erstellt per CGI -DeJS --> FrontendLoader : wird per Script geladen -FrontendLoader --> DatenMapper : verarbeitet window-Variablen -DatenMapper --> ReduxStore : dispatch(setInputs) -ReduxStore --> ReactComponent : useSelector() → Anzeige -``` diff --git a/docs/Architektur/README_digitalOutputs.md b/docs/Architektur/README_digitalOutputs.md index 43dfebd..5de3870 100644 --- a/docs/Architektur/README_digitalOutputs.md +++ b/docs/Architektur/README_digitalOutputs.md @@ -78,7 +78,7 @@ flowchart TD /mocks/device-cgi-simulator/SERVICE/→ jsSimulatedProd: digitalOutputsMockData.js /public/CPL/SERVICE/ → production: digitalOutputs.js /pages/api/cpl/ → GET/POST-Handler für json + jsSimulatedProd -/components/main/einausgaenge/ → UI-Komponente: DigitalOutputsWidget.tsx +/components/main/digitalOutputs/ → UI-Komponente: DigitalOutputsWidget.tsx ``` --- diff --git a/docs/Lastenheft/digitaleEingänge/digitaleEingänge.md b/docs/Lastenheft/digitaleEingänge/digitaleEingänge.md index b6bec74..46b0f29 100644 --- a/docs/Lastenheft/digitaleEingänge/digitaleEingänge.md +++ b/docs/Lastenheft/digitaleEingänge/digitaleEingänge.md @@ -11,5 +11,5 @@ --- 📄 **Quelle:** Abschnitt 4.1.2 im Lastenheft -📁 **Komponente:** `/components/einausgaenge.tsx` -🛠️ **API-Route:** `/pages/api/cpl/digitaleEingaenge.ts` +📁 **Komponente:** `/components/digitalInputs.tsx` +🛠️ **API-Route:** `/pages/api/cpl/digitalInputs.ts` diff --git a/mocks/api/SERVICE/digitalInputsMockData.json b/mocks/api/SERVICE/digitalInputsMockData.json index 4f54e22..973f7f4 100644 --- a/mocks/api/SERVICE/digitalInputsMockData.json +++ b/mocks/api/SERVICE/digitalInputsMockData.json @@ -102,7 +102,7 @@ 0 ], "win_de_time_filter": [ - 2, + 1, 0, 1, 0, @@ -136,7 +136,7 @@ 0 ], "win_de_weighting": [ - 4, + 3, 0, 1, 0, @@ -238,7 +238,7 @@ 0 ], "win_de_label": [ - "DE11", + "DE1", "DE2", "DE3", "DE4", diff --git a/mocks/api/SERVICE/digitalOutputsMockData.json b/mocks/api/SERVICE/digitalOutputsMockData.json index 8fd8838..7d43616 100644 --- a/mocks/api/SERVICE/digitalOutputsMockData.json +++ b/mocks/api/SERVICE/digitalOutputsMockData.json @@ -1,12 +1,12 @@ { "win_da_state": [ - 0, + 1, 0, 0, 1 ], "win_da_bezeichnung": [ - "Ausgang11", + "Ausgang1", "Ausgang2", "Ausgang3", "Ausgang4" diff --git a/package-lock.json b/package-lock.json index 10ff162..5f14974 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "cpl-v4", - "version": "1.6.483", + "version": "1.6.485", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "cpl-v4", - "version": "1.6.483", + "version": "1.6.485", "dependencies": { "@fontsource/roboto": "^5.1.0", "@iconify-icons/ri": "^1.2.10", diff --git a/package.json b/package.json index 53192a1..3a691d5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cpl-v4", - "version": "1.6.483", + "version": "1.6.485", "private": true, "scripts": { "dev": "next dev", diff --git a/pages/digitalInputs.tsx b/pages/digitalInputs.tsx index c2b7868..be78729 100644 --- a/pages/digitalInputs.tsx +++ b/pages/digitalInputs.tsx @@ -4,13 +4,13 @@ import React, { useEffect, useState } from "react"; import { useDispatch } from "react-redux"; import { AppDispatch } from "@/redux/store"; -import InputModal from "@/components/main/einausgaenge/modals/InputModal"; +import InputModal from "@/components/main/digitalInputs/digitalInputsModal"; import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk"; -import DigitalInputs from "@/components/main/einausgaenge/DigitalInputs"; +import DigitalInputs from "@/components/main/digitalInputs/DigitalInputsWidget"; -const EinAusgaenge: React.FC = () => { +const digitalInputs: React.FC = () => { const dispatch = useDispatch(); interface DigitalInput { id: number; @@ -70,4 +70,4 @@ const EinAusgaenge: React.FC = () => { ); }; -export default EinAusgaenge; +export default digitalInputs; diff --git a/pages/digitalOutputs.tsx b/pages/digitalOutputs.tsx index 47975c0..c02391f 100644 --- a/pages/digitalOutputs.tsx +++ b/pages/digitalOutputs.tsx @@ -4,15 +4,15 @@ import React, { useEffect, useState } from "react"; import { useDispatch } from "react-redux"; import { AppDispatch } from "@/redux/store"; -import DigitalOutputsModal from "../components/main/einausgaenge/modals/DigitalOutputsModal"; -import DigitalOutputs from "../components/main/einausgaenge/DigitalOutputsWidget"; +import DigitalOutputsModal from "../components/main/digitalOutputs/DigitalOutputsModal"; +import DigitalOutputs from "../components/main/digitalOutputs/DigitalOutputsWidget"; import { getDigitalInputsThunk } from "@/redux/thunks/getDigitalInputsThunk"; import { getDigitalOutputsThunk } from "@/redux/thunks/getDigitalOutputsThunk"; import type { DigitalOutput } from "@/types/digitalOutput"; -const EinAusgaenge: React.FC = () => { +const digitalOutputs: React.FC = () => { const dispatch = useDispatch(); const [selectedOutput, setSelectedOutput] = useState( null @@ -59,4 +59,4 @@ const EinAusgaenge: React.FC = () => { ); }; -export default EinAusgaenge; +export default digitalOutputs;