diff --git a/config/webVersion.ts b/config/webVersion.ts index 479b67a..5b92307 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.207"; +const webVersion = "1.6.208"; export default webVersion; diff --git a/docsForDev/DECISIONS.md b/docsForDev/DECISIONS.md new file mode 100644 index 0000000..795b44b --- /dev/null +++ b/docsForDev/DECISIONS.md @@ -0,0 +1,12 @@ +## Entscheidung: Digitale Ausgänge (da.js) + +**Datum:** 03.04.2025 +**Gesprächspartner:** Kai + +**Inhalt:** +Digitale Ausgänge (da.js) sind aktuell **nicht erforderlich**. Diese Funktion wird in einer späteren Version umgesetzt, weil sie derzeit nicht im Fokus der Deadline steht. + +**Notiz für spätere Version:** +Digitale Ausgänge können über eine spätere Erweiterung integriert werden, z. B. nach Version 1.0.0. + +--- diff --git a/docs/Diagramme/classDiagram.md b/docsForDev/Diagramme/classDiagram.md similarity index 100% rename from docs/Diagramme/classDiagram.md rename to docsForDev/Diagramme/classDiagram.md diff --git a/docs/Diagramme/erdiagramm.md b/docsForDev/Diagramme/erdiagramm.md similarity index 100% rename from docs/Diagramme/erdiagramm.md rename to docsForDev/Diagramme/erdiagramm.md diff --git a/docs/Diagramme/flowchart-lr.md b/docsForDev/Diagramme/flowchart-lr.md similarity index 100% rename from docs/Diagramme/flowchart-lr.md rename to docsForDev/Diagramme/flowchart-lr.md diff --git a/docs/Diagramme/flowchart-td.md b/docsForDev/Diagramme/flowchart-td.md similarity index 100% rename from docs/Diagramme/flowchart-td.md rename to docsForDev/Diagramme/flowchart-td.md diff --git a/docs/Diagramme/ganttdiagramm.md b/docsForDev/Diagramme/ganttdiagramm.md similarity index 100% rename from docs/Diagramme/ganttdiagramm.md rename to docsForDev/Diagramme/ganttdiagramm.md diff --git a/docs/Diagramme/journeydiagramm.md b/docsForDev/Diagramme/journeydiagramm.md similarity index 100% rename from docs/Diagramme/journeydiagramm.md rename to docsForDev/Diagramme/journeydiagramm.md diff --git a/docs/Diagramme/redux-prozessdiagramm.md b/docsForDev/Diagramme/redux-prozessdiagramm.md similarity index 100% rename from docs/Diagramme/redux-prozessdiagramm.md rename to docsForDev/Diagramme/redux-prozessdiagramm.md diff --git a/docs/Diagramme/redux-sequenzdiagramm.md b/docsForDev/Diagramme/redux-sequenzdiagramm.md similarity index 100% rename from docs/Diagramme/redux-sequenzdiagramm.md rename to docsForDev/Diagramme/redux-sequenzdiagramm.md diff --git a/docs/Diagramme/sequenzdiagramm.md b/docsForDev/Diagramme/sequenzdiagramm.md similarity index 100% rename from docs/Diagramme/sequenzdiagramm.md rename to docsForDev/Diagramme/sequenzdiagramm.md diff --git a/docs/Diagramme/tdr-abhaengigkeit.md b/docsForDev/Diagramme/tdr-abhaengigkeit.md similarity index 100% rename from docs/Diagramme/tdr-abhaengigkeit.md rename to docsForDev/Diagramme/tdr-abhaengigkeit.md diff --git a/docs/Diagramme/zustandsdiagramm.md b/docsForDev/Diagramme/zustandsdiagramm.md similarity index 100% rename from docs/Diagramme/zustandsdiagramm.md rename to docsForDev/Diagramme/zustandsdiagramm.md diff --git a/docs/README.md b/docsForDev/README.md similarity index 100% rename from docs/README.md rename to docsForDev/README.md diff --git a/docs/draw.io/test.drawio b/docsForDev/draw.io/test.drawio similarity index 100% rename from docs/draw.io/test.drawio rename to docsForDev/draw.io/test.drawio diff --git a/pages/einausgaenge.tsx b/pages/einausgaenge.tsx index 614a601..ccd43e1 100644 --- a/pages/einausgaenge.tsx +++ b/pages/einausgaenge.tsx @@ -71,7 +71,10 @@ const EinAusgaenge: React.FC = () => { openInputModal={openInputModal} inputRange={{ start: 16, end: 32 }} /> - + {/* Digitale Ausgänge nicht Erforderlich*/} + {/* + + */} {isInputModalOpen && selectedInput && ( diff --git a/public/CPL/SERVICE/da.js b/public/CPL/SERVICE/da.js index cd4387f..151ce9d 100644 --- a/public/CPL/SERVICE/da.js +++ b/public/CPL/SERVICE/da.js @@ -1,3 +1,10 @@ -// Digitale Ausgänge Ausgang Bezeichnung und Zustand -var win_da=[<%=DES80%>,<%=DES81%>,<%=DES82%>,<%=DES83%>]; + +var win_da_state=[<%=DES80%>,<%=DES81%>,<%=DES82%>,<%=DES83%>]; + +var win_da_bezeichnung=["Augang1","Ausgang2","Ausgang3","Ausgang4"]; // weil es gibt noch kein Platzhalter + + + + + diff --git a/services/fetchDigitalOutputs.ts b/services/fetchDigitalOutputs.ts index 5ff3ae5..eeebb0d 100644 --- a/services/fetchDigitalOutputs.ts +++ b/services/fetchDigitalOutputs.ts @@ -3,7 +3,6 @@ export const fetchDigitalOutputs = async () => { if (typeof window === "undefined") return []; - // ✅ da.js nur bei Bedarf nachladen (Pfad abhängig von Umgebung) const scriptSrc = process.env.NEXT_PUBLIC_NODE_ENV === "production" ? "/CPL?/CPL/SERVICE/da.js" @@ -19,25 +18,24 @@ export const fetchDigitalOutputs = async () => { }); const win = window as any; - const state = win.win_da_state; const labels = win.win_da_bezeichnung; - if ( - Array.isArray(state) && - Array.isArray(labels) && - state.length === labels.length - ) { - return state.map((status: number, index: number) => ({ - id: index + 1, - label: labels[index] || `Ausgang ${index + 1}`, - status: status === 1, - })); - } else { - console.warn("⚠️ Digitale Ausgänge unvollständig oder inkonsistent:", { - state, - labels, - }); + if (!Array.isArray(state)) { + console.warn("⚠️ win_da_state fehlt oder ist ungültig:", state); return []; } + + const outputs = state + .slice(0, 4) // ✅ Nur die 4 Ausgänge verwenden + .map((status: number, index: number) => ({ + id: index + 1, + label: + Array.isArray(labels) && labels[index] + ? labels[index] + : `Ausgang ${index + 1}`, + status: status === 1, + })); + + return outputs; };