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

fix: Bezeichnung in analoge Eingänge anzeigen

Browse Source
This commit is contained in:
ISA
2025-06-19 13:47:10 +02:00
parent b804fb88c1
commit a62c7d10b9
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -6,5 +6,5 @@ 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.421 NEXT_PUBLIC_APP_VERSION=1.6.422
NEXT_PUBLIC_CPL_MODE=jsmock # json (Entwicklungsumgebung) oder jsmock (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter) NEXT_PUBLIC_CPL_MODE=jsmock # json (Entwicklungsumgebung) oder jsmock (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.421 NEXT_PUBLIC_APP_VERSION=1.6.422
NEXT_PUBLIC_CPL_MODE=production NEXT_PUBLIC_CPL_MODE=production

7
components/main/analogInputs/AnalogInputsTable.tsx
View File

@@ -54,7 +54,10 @@ export default function AnalogInputsTable({
</thead> </thead>
<tbody> <tbody>
{Object.values(analogInputs) {Object.values(analogInputs)
.filter((e) => e?.id !== null && e?.id !== undefined) .filter(
(e) =>
e && typeof e.id === "number" && typeof e.label === "string"
)
.map((e, index) => ( .map((e, index) => (
<tr <tr
key={index} key={index}
@@ -86,7 +89,7 @@ export default function AnalogInputsTable({
className="border p-2" className="border p-2"
onClick={() => handleSelect(e.id!)} onClick={() => handleSelect(e.id!)}
> >
{e.name || "----"} {e.label || "----"}
</td> </td>
<td className="border p-2 text-center"> <td className="border p-2 text-center">

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.421", "version": "1.6.422",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "cpl-v4", "name": "cpl-v4",
"version": "1.6.421", "version": "1.6.422",
"dependencies": { "dependencies": {
"@fontsource/roboto": "^5.1.0", "@fontsource/roboto": "^5.1.0",
"@iconify-icons/ri": "^1.2.10", "@iconify-icons/ri": "^1.2.10",

2
package.json
View File

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

6
redux/slices/analogInputsSlice.ts
View File

@@ -4,7 +4,7 @@ import { createSlice, PayloadAction, createAsyncThunk } from "@reduxjs/toolkit";
export interface AnalogInput { export interface AnalogInput {
id: number | null; id: number | null;
value: number | null; value: number | null;
name: string; label: string;
uW: boolean; uW: boolean;
uG: boolean; uG: boolean;
oW: boolean; oW: boolean;
@@ -19,7 +19,7 @@ export interface AnalogInputsState {
const defaultAnalogInput: AnalogInput = { const defaultAnalogInput: AnalogInput = {
id: null, id: null,
value: null, value: null,
name: "", label: "",
uW: false, uW: false,
uG: false, uG: false,
oW: false, oW: false,
@@ -52,7 +52,7 @@ export const loadFromWindow = createAsyncThunk(
data[key] = { data[key] = {
id: value[0], id: value[0],
value: value[1], value: value[1],
name: value[2], label: value[2],
uW: value[3] === 1, uW: value[3] === 1,
uG: value[4] === 1, uG: value[4] === 1,
oW: value[5] === 1, oW: value[5] === 1,