diff --git a/.env.development b/.env.development index f06c0e306..612a2856f 100644 --- a/.env.development +++ b/.env.development @@ -23,4 +23,4 @@ NEXT_PUBLIC_USE_MOCKS=true # z.B. http://10.10.0.13/xyz/index.aspx -> basePath in config.json auf /xyz setzen # basePath wird jetzt in public/config.json gepflegt # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.382 +NEXT_PUBLIC_APP_VERSION=1.1.383 diff --git a/.env.production b/.env.production index 6dddac385..cfebed246 100644 --- a/.env.production +++ b/.env.production @@ -24,4 +24,4 @@ NEXT_PUBLIC_USE_MOCKS=false # basePath wird jetzt in public/config.json gepflegt # App-Versionsnummer -NEXT_PUBLIC_APP_VERSION=1.1.382 +NEXT_PUBLIC_APP_VERSION=1.1.383 diff --git a/package-lock.json b/package-lock.json index b0d065ba2..0c86f7ce0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nodemap", - "version": "1.1.382", + "version": "1.1.383", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "nodemap", - "version": "1.1.382", + "version": "1.1.383", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/package.json b/package.json index 9b6c2eed1..357ac59a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodemap", - "version": "1.1.382", + "version": "1.1.383", "dependencies": { "@emotion/react": "^11.13.3", "@emotion/styled": "^11.13.0", diff --git a/playwright/tests/mapcomponent.spec.js b/playwright/tests/mapcomponent.spec.js index 633b2bd16..3d2969220 100644 --- a/playwright/tests/mapcomponent.spec.js +++ b/playwright/tests/mapcomponent.spec.js @@ -98,7 +98,17 @@ test("MapComponent", async ({ page }) => { // 7) Marker setzen und Stationen wählen await page.getByLabel("Marker").click(); - await expect(page.getByText("Station wählenBitte wählen…")).toBeVisible(); + // ...existing code... + // ...existing code... + await expect(page.getByText("Station wählen")).toBeVisible(); + const select = page.locator("select"); + await expect(select).toBeVisible(); + await expect(select).toBeEnabled(); + // Prüfe, ob die gewünschten Optionen existieren (attached) + await expect(select.locator('option[value="50977"]')).toBeAttached(); + await expect(select.locator('option[value="50986"]')).toBeAttached(); + + // ---------------------------------------------- await selectStation(page, "50977"); await page.getByLabel("Marker").click(); await selectStation(page, "50986"); diff --git a/websocketDump/GisStationsStatusDistrict.json b/websocketDump/GisStationsStatusDistrict.json index e56b41c44..09d9ed343 100644 --- a/websocketDump/GisStationsStatusDistrict.json +++ b/websocketDump/GisStationsStatusDistrict.json @@ -7,7 +7,8 @@ "Me": "Eingang DE 01 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -17,7 +18,8 @@ "Me": "Eingang DE 31 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -27,7 +29,8 @@ "Me": "Eingang DE 17 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -37,7 +40,8 @@ "Me": "Eingang DE 05 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -47,7 +51,8 @@ "Me": "Eingang DE 20 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -57,7 +62,8 @@ "Me": "Eingang DE 32 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -67,7 +73,8 @@ "Me": "Eingang DE 01 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -77,7 +84,8 @@ "Me": "Station offline", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -87,7 +95,8 @@ "Me": "Eingang DE 01 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -97,7 +106,8 @@ "Me": "Station offline", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50066, @@ -107,7 +117,8 @@ "Me": "CPL offline", "Feld": 5, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50011, @@ -117,7 +128,8 @@ "Me": "CPL offline", "Feld": 16, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50011, @@ -127,7 +139,8 @@ "Me": "Wasserdruck aus", "Feld": 16, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50011, @@ -137,7 +150,8 @@ "Me": "Ein", "Feld": 16, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50011, @@ -147,7 +161,8 @@ "Me": "Digitaleingang 1 ON", "Feld": 16, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50000, @@ -157,7 +172,8 @@ "Me": "Ein", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -167,7 +183,8 @@ "Me": "Station offline", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -177,7 +194,8 @@ "Me": "Eingang DE 32 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -187,7 +205,8 @@ "Me": "KÜG 07: Überspannung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -197,7 +216,8 @@ "Me": "KÜG 08: Überspannung gehend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -207,7 +227,8 @@ "Me": "KÜG 08: Überspannung gehend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -217,7 +238,8 @@ "Me": "KÜG 08: Überspannung gehend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -227,7 +249,8 @@ "Me": "Eingang DE 02 kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -237,7 +260,8 @@ "Me": "KÜG 08: Überspannung gehend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -247,7 +271,8 @@ "Me": "Eingang DE 03 Test Karte kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -257,7 +282,8 @@ "Me": "KÜG 01: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 1, + "AlarmLink": "http://10.10.0.13/talas5/devices/cpl.aspx?ver=35&kue=24&id=50977" }, { "IdLD": 50922, @@ -267,7 +293,8 @@ "Me": "KÜG 02: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50922, @@ -277,7 +304,8 @@ "Me": "KÜG 03: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50000, @@ -287,7 +315,8 @@ "Me": "über 8V kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -297,7 +326,8 @@ "Me": "KÜG 05: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -307,7 +337,8 @@ "Me": "KÜG 02: Isolationsminderung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50984, @@ -317,7 +348,8 @@ "Me": "KÜG 06: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -327,7 +359,8 @@ "Me": "KÜG 01: Isolationsminderung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -337,7 +370,8 @@ "Me": "KÜG 06: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50977, @@ -347,7 +381,8 @@ "Me": "KÜG 05: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50976, @@ -357,7 +392,8 @@ "Me": "CPL offline", "Feld": 3, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50976, @@ -367,7 +403,8 @@ "Me": "KÜG 03: Isolationsminderung kommend", "Feld": 3, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -377,7 +414,8 @@ "Me": "KÜG 04: Isolationsminderung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -387,7 +425,8 @@ "Me": "KÜG 02: Isolationsminderung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -397,7 +436,8 @@ "Me": "KÜG 01: Isolationsminderung kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50001, @@ -407,7 +447,8 @@ "Me": "Sammelstörung kommend", "Feld": 5, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -417,7 +458,8 @@ "Me": "KÜG 06: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50975, @@ -427,7 +469,8 @@ "Me": "KÜG 05: Aderbruch kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50963, @@ -437,7 +480,8 @@ "Me": "CPL offline", "Feld": 3, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50063, @@ -447,7 +491,8 @@ "Me": "Digitaleingang 1 EIN", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" }, { "IdLD": 50000, @@ -457,6 +502,7 @@ "Me": "über 10V kommend", "Feld": 4, "Icon": 0, - "Alarm": 0 + "Alarm": 0, + "AlarmLink": "" } ] \ No newline at end of file