From 6feced5aa8328c38a39aa4e253c2a861c9e23eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Br=C3=A4utigam?= Date: Wed, 1 Mar 2023 18:18:52 +0100 Subject: [PATCH 01/18] add tileAddress to all widgets --- source/resource/manager/worker.js | 5 +++++ source/resource/visu_config_tile.xsd | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/source/resource/manager/worker.js b/source/resource/manager/worker.js index 0c58384325c..48c6d13c403 100644 --- a/source/resource/manager/worker.js +++ b/source/resource/manager/worker.js @@ -443,6 +443,11 @@ function loadSchema(schemaFile) { if (!configSchemas.hasOwnProperty(schemaFile)) { // load scheme file let content = getFileContent(schemaFile); + if (content === null) { + // schema file not found + configSchemas[schemaFile] = content; + return; + } let file; let includedContent; const matches = content.matchAll(//g); diff --git a/source/resource/visu_config_tile.xsd b/source/resource/visu_config_tile.xsd index 1bdb257a0ce..ff6a4a95ee3 100644 --- a/source/resource/visu_config_tile.xsd +++ b/source/resource/visu_config_tile.xsd @@ -1731,7 +1731,8 @@ - + + @@ -2583,12 +2584,16 @@ - + The style element contains style information for a document, or part of a document. Das style-Element enthält Stylesheet-Angaben, die für das gesamte Dokument gelten. - + + + + + From 7a7073e05878db0d4b72345b77dffb0d59aa0c7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20Br=C3=A4utigam?= Date: Wed, 1 Mar 2023 18:19:06 +0100 Subject: [PATCH 02/18] sync name --- source/resource/demo/visu_config_demo-tile.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/resource/demo/visu_config_demo-tile.xml b/source/resource/demo/visu_config_demo-tile.xml index 38036dc5356..65c77dc9972 100644 --- a/source/resource/demo/visu_config_demo-tile.xml +++ b/source/resource/demo/visu_config_demo-tile.xml @@ -236,7 +236,7 @@ 1/4/25 - 1/4/25 + 1/4/25 Power consumption W Date: Wed, 1 Mar 2023 18:19:18 +0100 Subject: [PATCH 03/18] add tileAddress to all widgets --- source/resource/structures/tile/templates.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/resource/structures/tile/templates.xml b/source/resource/structures/tile/templates.xml index 426f16abdc9..51c3e80b720 100644 --- a/source/resource/structures/tile/templates.xml +++ b/source/resource/structures/tile/templates.xml @@ -45,6 +45,7 @@ + NEEDS ADDRESS
@@ -82,6 +83,7 @@ OPTIONAL SUB LABEL + NEEDS ADDRESS
@@ -113,6 +115,7 @@ + NEEDS ADDRESS
@@ -135,6 +138,7 @@ + NEEDS ADDRESS
@@ -177,6 +181,7 @@ RTC + NEEDS ADDRESS
@@ -249,6 +254,7 @@ NEEDS ADDRESS + NEEDS ADDRESS
@@ -259,7 +265,7 @@ - + @@ -282,7 +288,7 @@ show-x-axis="false" slot-y-format="" slot-series="month" slot-refresh="300" colspan="3" rowspan="3" slot-x-format="%d. %b" slot-zero-based="true"> NEEDS DATASET - NEEDS ADDRESS + NEEDS ADDRESS
@@ -295,6 +301,7 @@ NEEDS DATASET + NEEDS ADDRESS