From f666523881540a225b05372c7397e69ba5d14c5a Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 8 Aug 2024 12:42:48 +0300 Subject: [PATCH] UI: Add default behaviors configuration to SCADA symbols. --- .../scada_symbols/bottom-flow-meter.svg | 289 +++++++++-- .../scada_symbols/bottom-right-elbow-pipe.svg | 144 +++++- .../system/scada_symbols/bottom-tee-pipe.svg | 362 ++++++++++++-- .../system/scada_symbols/centrifugal-pump.svg | 150 +++++- .../json/system/scada_symbols/cross-pipe.svg | 473 +++++++++++++++--- .../scada_symbols/horizontal-ball-valve.svg | 82 ++- .../horizontal-inline-flow-meter.svg | 295 +++++++++-- .../scada_symbols/horizontal-wheel-valve.svg | 82 ++- .../scada_symbols/left-bottom-elbow-pipe.svg | 144 +++++- .../system/scada_symbols/left-flow-meter.svg | 295 +++++++++-- .../system/scada_symbols/left-motor-pump.svg | 196 ++++---- .../system/scada_symbols/left-tee-pipe.svg | 362 ++++++++++++-- .../scada_symbols/left-top-elbow-pipe.svg | 144 +++++- .../scada_symbols/long-bottom-filter.svg | 11 +- .../system/scada_symbols/long-top-filter.svg | 11 +- .../system/scada_symbols/right-flow-meter.svg | 289 +++++++++-- .../system/scada_symbols/right-motor-pump.svg | 196 ++++---- .../system/scada_symbols/right-tee-pipe.svg | 362 ++++++++++++-- .../scada_symbols/short-bottom-filter.svg | 11 +- .../system/scada_symbols/short-top-filter.svg | 11 +- .../scada_symbols/small-left-motor-pump.svg | 174 ++++--- .../scada_symbols/small-right-motor-pump.svg | 123 ++++- .../system/scada_symbols/top-flow-meter.svg | 289 +++++++++-- .../scada_symbols/top-right-elbow-pipe.svg | 144 +++++- .../system/scada_symbols/top-tee-pipe.svg | 362 ++++++++++++-- .../scada_symbols/vertical-ball-valve.svg | 82 ++- .../vertical-inline-flow-meter.svg | 295 +++++++++-- .../scada_symbols/vertical-wheel-valve.svg | 112 +++-- 28 files changed, 4481 insertions(+), 1009 deletions(-) diff --git a/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg index 9f85ccdb73..13ccbf8d82 100644 --- a/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/bottom-flow-meter.svg @@ -78,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -93,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -108,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -123,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -138,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -153,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -168,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -183,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -198,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -213,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -228,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-pipe.svg b/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-pipe.svg index e27c2deee9..736abfb40b 100644 --- a/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/bottom-right-elbow-pipe.svg @@ -41,71 +41,175 @@ "id": "fluid", "name": "{i18n:scada.symbol.fluid-presence}", "hint": "{i18n:scada.symbol.fluid-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", "name": "{i18n:scada.symbol.flow-presence}", "hint": "{i18n:scada.symbol.flow-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", "name": "{i18n:scada.symbol.flow-direction}", "hint": "{i18n:scada.symbol.flow-direction-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", "name": "{i18n:scada.symbol.flow-animation-speed}", "hint": "{i18n:scada.symbol.flow-animation-speed-hint}", + "group": null, "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/bottom-tee-pipe.svg b/application/src/main/data/json/system/scada_symbols/bottom-tee-pipe.svg index 5fdc3fc3a2..fa6d58e8ca 100644 --- a/application/src/main/data/json/system/scada_symbols/bottom-tee-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/bottom-tee-pipe.svg @@ -59,13 +59,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlow", @@ -74,13 +94,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowDirection", @@ -89,13 +129,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowAnimationSpeed", @@ -104,13 +164,32 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFluid", @@ -119,13 +198,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlow", @@ -134,13 +233,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowDirection", @@ -149,13 +268,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowAnimationSpeed", @@ -164,13 +303,32 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFluid", @@ -179,13 +337,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlow", @@ -194,13 +372,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowDirection", @@ -209,13 +407,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowAnimationSpeed", @@ -224,27 +442,67 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/centrifugal-pump.svg b/application/src/main/data/json/system/scada_symbols/centrifugal-pump.svg index 8b136687a0..c1bef78aa5 100644 --- a/application/src/main/data/json/system/scada_symbols/centrifugal-pump.svg +++ b/application/src/main/data/json/system/scada_symbols/centrifugal-pump.svg @@ -67,13 +67,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.running}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "running" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -82,13 +102,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -97,13 +137,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -112,13 +172,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rotationAnimationSpeed", @@ -127,13 +207,32 @@ "group": null, "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "click", @@ -142,13 +241,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/cross-pipe.svg b/application/src/main/data/json/system/scada_symbols/cross-pipe.svg index b36b70b865..2defc446e4 100644 --- a/application/src/main/data/json/system/scada_symbols/cross-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/cross-pipe.svg @@ -69,13 +69,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlow", @@ -84,13 +104,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowDirection", @@ -99,13 +139,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowAnimationSpeed", @@ -114,13 +174,32 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFluid", @@ -129,13 +208,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlow", @@ -144,13 +243,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowDirection", @@ -159,13 +278,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowAnimationSpeed", @@ -174,13 +313,32 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFluid", @@ -189,13 +347,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlow", @@ -204,13 +382,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowDirection", @@ -219,13 +417,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowAnimationSpeed", @@ -234,13 +452,32 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFluid", @@ -249,13 +486,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlow", @@ -264,13 +521,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowDirection", @@ -279,13 +556,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowAnimationSpeed", @@ -294,27 +591,67 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-ball-valve.svg b/application/src/main/data/json/system/scada_symbols/horizontal-ball-valve.svg index faad4a5ba5..da140b4383 100644 --- a/application/src/main/data/json/system/scada_symbols/horizontal-ball-valve.svg +++ b/application/src/main/data/json/system/scada_symbols/horizontal-ball-valve.svg @@ -37,13 +37,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.opened}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "open", @@ -52,13 +72,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": true, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": true, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null }, { "id": "close", @@ -67,13 +106,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": false, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg index 30caf224e5..4133db1084 100644 --- a/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/horizontal-inline-flow-meter.svg @@ -1,4 +1,5 @@ -{ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="200" fill="none" version="1.1" viewBox="0 0 400 200"> +<tb:metadata xmlns=""><![CDATA[{ "title": "Horizontal inline flow meter", "description": "Horizontal inline flow meter component used to display flow related value and render various states. Includes pipe fluid and leak visualizations.", "searchTags": [ @@ -77,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -92,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -107,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -122,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -137,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -152,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -167,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -182,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -197,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -212,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -227,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ @@ -510,8 +712,7 @@ "step": null } ] -} - +}]]> diff --git a/application/src/main/data/json/system/scada_symbols/horizontal-wheel-valve.svg b/application/src/main/data/json/system/scada_symbols/horizontal-wheel-valve.svg index 9fc03dd69a..a96f61781d 100644 --- a/application/src/main/data/json/system/scada_symbols/horizontal-wheel-valve.svg +++ b/application/src/main/data/json/system/scada_symbols/horizontal-wheel-valve.svg @@ -37,13 +37,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.opened}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "open", @@ -52,13 +72,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": true, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": true, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null }, { "id": "close", @@ -67,13 +106,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": false, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-pipe.svg b/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-pipe.svg index 1109a8a54c..f29d904e3a 100644 --- a/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/left-bottom-elbow-pipe.svg @@ -40,71 +40,175 @@ "id": "fluid", "name": "{i18n:scada.symbol.fluid-presence}", "hint": "{i18n:scada.symbol.fluid-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", "name": "{i18n:scada.symbol.flow-presence}", "hint": "{i18n:scada.symbol.flow-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", "name": "{i18n:scada.symbol.flow-direction}", "hint": "{i18n:scada.symbol.flow-direction-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", "name": "{i18n:scada.symbol.flow-animation-speed}", "hint": "{i18n:scada.symbol.flow-animation-speed-hint}", + "group": null, "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg index 16551bf2e9..2ee093ef30 100644 --- a/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/left-flow-meter.svg @@ -1,4 +1,5 @@ -{ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="400" height="400" fill="none" version="1.1" viewBox="0 0 400 400"> +<tb:metadata xmlns=""><![CDATA[{ "title": "Left flow meter", "description": "Left flow meter component used to display flow related value and render various states. Includes pipe fluid and leak visualizations.", "searchTags": [ @@ -77,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -92,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -107,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -122,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -137,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -152,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -167,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -182,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -197,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -212,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -227,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ @@ -510,8 +712,7 @@ "step": null } ] -} - +}]]> diff --git a/application/src/main/data/json/system/scada_symbols/left-motor-pump.svg b/application/src/main/data/json/system/scada_symbols/left-motor-pump.svg index 271a4a27c2..5be0a454e5 100644 --- a/application/src/main/data/json/system/scada_symbols/left-motor-pump.svg +++ b/application/src/main/data/json/system/scada_symbols/left-motor-pump.svg @@ -1,5 +1,4 @@ - - { +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="800" height="600" fill="none" version="1.1" viewBox="0 0 800 600"><tb:metadata xmlns=""><![CDATA[{ "title": "Left motor pump", "description": "Left motor pump with configurable states.", "searchTags": [ @@ -32,13 +31,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.running}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "running" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -47,13 +66,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -62,13 +101,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -77,13 +136,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "click", @@ -92,13 +171,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [ @@ -168,8 +250,7 @@ } ] } - - + @@ -441,70 +522,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/application/src/main/data/json/system/scada_symbols/left-tee-pipe.svg b/application/src/main/data/json/system/scada_symbols/left-tee-pipe.svg index 43106f9791..89536f8539 100644 --- a/application/src/main/data/json/system/scada_symbols/left-tee-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/left-tee-pipe.svg @@ -59,13 +59,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlow", @@ -74,13 +94,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowDirection", @@ -89,13 +129,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowAnimationSpeed", @@ -104,13 +164,32 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFluid", @@ -119,13 +198,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlow", @@ -134,13 +233,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowDirection", @@ -149,13 +268,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowAnimationSpeed", @@ -164,13 +303,32 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFluid", @@ -179,13 +337,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlow", @@ -194,13 +372,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowDirection", @@ -209,13 +407,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowAnimationSpeed", @@ -224,27 +442,67 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/left-top-elbow-pipe.svg b/application/src/main/data/json/system/scada_symbols/left-top-elbow-pipe.svg index 1b795935e1..4bc92f1de7 100644 --- a/application/src/main/data/json/system/scada_symbols/left-top-elbow-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/left-top-elbow-pipe.svg @@ -40,71 +40,175 @@ "id": "fluid", "name": "{i18n:scada.symbol.fluid-presence}", "hint": "{i18n:scada.symbol.fluid-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", "name": "{i18n:scada.symbol.flow-presence}", "hint": "{i18n:scada.symbol.flow-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", "name": "{i18n:scada.symbol.flow-direction}", "hint": "{i18n:scada.symbol.flow-direction-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", "name": "{i18n:scada.symbol.flow-animation-speed}", "hint": "{i18n:scada.symbol.flow-animation-speed-hint}", + "group": null, "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg b/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg index f368fdbc4d..d9defd33d9 100644 --- a/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg +++ b/application/src/main/data/json/system/scada_symbols/long-bottom-filter.svg @@ -26,13 +26,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [] diff --git a/application/src/main/data/json/system/scada_symbols/long-top-filter.svg b/application/src/main/data/json/system/scada_symbols/long-top-filter.svg index 676102f5a9..a63b679f0a 100644 --- a/application/src/main/data/json/system/scada_symbols/long-top-filter.svg +++ b/application/src/main/data/json/system/scada_symbols/long-top-filter.svg @@ -26,13 +26,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [] diff --git a/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg index d850e7b2c3..f1a823b663 100644 --- a/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/right-flow-meter.svg @@ -78,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -93,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -108,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -123,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -138,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -153,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -168,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -183,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -198,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -213,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -228,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/right-motor-pump.svg b/application/src/main/data/json/system/scada_symbols/right-motor-pump.svg index c8e47a9fcc..7ada9a91e3 100644 --- a/application/src/main/data/json/system/scada_symbols/right-motor-pump.svg +++ b/application/src/main/data/json/system/scada_symbols/right-motor-pump.svg @@ -1,5 +1,4 @@ - - { +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="800" height="600" fill="none" version="1.1" viewBox="0 0 800 600"><tb:metadata xmlns=""><![CDATA[{ "title": "Right motor pump", "description": "Right motor pump with configurable states.", "searchTags": [ @@ -32,13 +31,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.running}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "running" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -47,13 +66,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -62,13 +101,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -77,13 +136,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "click", @@ -92,13 +171,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [ @@ -168,8 +250,7 @@ } ] } - - + @@ -441,70 +522,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/application/src/main/data/json/system/scada_symbols/right-tee-pipe.svg b/application/src/main/data/json/system/scada_symbols/right-tee-pipe.svg index 05a8c3cc67..fec379d6e3 100644 --- a/application/src/main/data/json/system/scada_symbols/right-tee-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/right-tee-pipe.svg @@ -59,13 +59,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlow", @@ -74,13 +94,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowDirection", @@ -89,13 +129,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowAnimationSpeed", @@ -104,13 +164,32 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFluid", @@ -119,13 +198,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlow", @@ -134,13 +233,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowDirection", @@ -149,13 +268,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowAnimationSpeed", @@ -164,13 +303,32 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFluid", @@ -179,13 +337,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlow", @@ -194,13 +372,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowDirection", @@ -209,13 +407,33 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "bottomFlowAnimationSpeed", @@ -224,27 +442,67 @@ "group": "{i18n:scada.symbol.bottom-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg b/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg index 7a111ca5ac..b3235c5906 100644 --- a/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg +++ b/application/src/main/data/json/system/scada_symbols/short-bottom-filter.svg @@ -26,13 +26,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [] diff --git a/application/src/main/data/json/system/scada_symbols/short-top-filter.svg b/application/src/main/data/json/system/scada_symbols/short-top-filter.svg index e0847134ea..d50eada2aa 100644 --- a/application/src/main/data/json/system/scada_symbols/short-top-filter.svg +++ b/application/src/main/data/json/system/scada_symbols/short-top-filter.svg @@ -26,13 +26,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [] diff --git a/application/src/main/data/json/system/scada_symbols/small-left-motor-pump.svg b/application/src/main/data/json/system/scada_symbols/small-left-motor-pump.svg index a0d9d937ae..85e617ff22 100644 --- a/application/src/main/data/json/system/scada_symbols/small-left-motor-pump.svg +++ b/application/src/main/data/json/system/scada_symbols/small-left-motor-pump.svg @@ -1,5 +1,4 @@ - - { +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="600" height="400" fill="none" version="1.1" viewBox="0 0 600 400"><tb:metadata xmlns=""><![CDATA[{ "title": "Small left motor pump", "description": "Small left motor pump with configurable states.", "searchTags": [ @@ -32,13 +31,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.running}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "running" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -47,13 +66,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -62,13 +101,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -77,13 +136,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "click", @@ -92,13 +171,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [ @@ -168,50 +250,7 @@ } ] } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -385,6 +424,5 @@ - - + \ No newline at end of file diff --git a/application/src/main/data/json/system/scada_symbols/small-right-motor-pump.svg b/application/src/main/data/json/system/scada_symbols/small-right-motor-pump.svg index 742e1d7e6b..7b9b1c260d 100644 --- a/application/src/main/data/json/system/scada_symbols/small-right-motor-pump.svg +++ b/application/src/main/data/json/system/scada_symbols/small-right-motor-pump.svg @@ -32,13 +32,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.running}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "running" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -47,13 +67,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -62,13 +102,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -77,13 +137,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "click", @@ -92,13 +172,16 @@ "group": null, "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg index f9bf64210f..2e5dc69ba7 100644 --- a/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/top-flow-meter.svg @@ -78,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -93,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -108,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -123,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -138,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -153,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -168,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -183,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -198,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -213,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -228,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/top-right-elbow-pipe.svg b/application/src/main/data/json/system/scada_symbols/top-right-elbow-pipe.svg index 9513ee7fc2..4b42727b2e 100644 --- a/application/src/main/data/json/system/scada_symbols/top-right-elbow-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/top-right-elbow-pipe.svg @@ -40,71 +40,175 @@ "id": "fluid", "name": "{i18n:scada.symbol.fluid-presence}", "hint": "{i18n:scada.symbol.fluid-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", "name": "{i18n:scada.symbol.flow-presence}", "hint": "{i18n:scada.symbol.flow-presence-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", "name": "{i18n:scada.symbol.flow-direction}", "hint": "{i18n:scada.symbol.flow-direction-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", "name": "{i18n:scada.symbol.flow-animation-speed}", "hint": "{i18n:scada.symbol.flow-animation-speed-hint}", + "group": null, "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/top-tee-pipe.svg b/application/src/main/data/json/system/scada_symbols/top-tee-pipe.svg index f14bc5e6c0..11e6595e5c 100644 --- a/application/src/main/data/json/system/scada_symbols/top-tee-pipe.svg +++ b/application/src/main/data/json/system/scada_symbols/top-tee-pipe.svg @@ -59,13 +59,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlow", @@ -74,13 +94,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowDirection", @@ -89,13 +129,33 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leftFlowAnimationSpeed", @@ -104,13 +164,32 @@ "group": "{i18n:scada.symbol.left-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFluid", @@ -119,13 +198,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlow", @@ -134,13 +233,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowDirection", @@ -149,13 +268,33 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "rightFlowAnimationSpeed", @@ -164,13 +303,32 @@ "group": "{i18n:scada.symbol.right-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFluid", @@ -179,13 +337,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlow", @@ -194,13 +372,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowDirection", @@ -209,13 +407,33 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "topFlowAnimationSpeed", @@ -224,27 +442,67 @@ "group": "{i18n:scada.symbol.top-pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", "name": "{i18n:scada.symbol.leak}", "hint": "{i18n:scada.symbol.leak-hint}", + "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/vertical-ball-valve.svg b/application/src/main/data/json/system/scada_symbols/vertical-ball-valve.svg index 9aa3fcdefa..3aee266486 100644 --- a/application/src/main/data/json/system/scada_symbols/vertical-ball-valve.svg +++ b/application/src/main/data/json/system/scada_symbols/vertical-ball-valve.svg @@ -37,13 +37,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.opened}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "open", @@ -52,13 +72,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": true, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": false, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null }, { "id": "close", @@ -67,13 +106,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": true, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null } ], "properties": [ diff --git a/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg b/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg index 45b8d1ef2c..01d4e9611d 100644 --- a/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg +++ b/application/src/main/data/json/system/scada_symbols/vertical-inline-flow-meter.svg @@ -1,4 +1,5 @@ -{ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"> +<tb:metadata xmlns=""><![CDATA[{ "title": "Vertical inline flow meter", "description": "Vertical inline flow meter component used to display flow related value and render various states. Includes pipe fluid and leak visualizations.", "searchTags": [ @@ -77,13 +78,32 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 0, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_TIME_SERIES", + "defaultValue": 0, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "flowRate" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "warning", @@ -92,13 +112,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.warning}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "critical", @@ -107,13 +147,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.critical}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "criticalAnimation", @@ -122,13 +182,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.animation}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "broken", @@ -137,13 +217,33 @@ "group": "{i18n:scada.symbol.display}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.broken}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "displayClick", @@ -152,13 +252,16 @@ "group": "{i18n:scada.symbol.display}", "type": "widgetAction", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": { + "type": "doNothing", + "openInSeparateDialog": false, + "openInPopover": false + } }, { "id": "fluid", @@ -167,13 +270,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.fluid-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flow", @@ -182,13 +305,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": "{i18n:scada.symbol.present}", "falseLabel": "{i18n:scada.symbol.absent}", "stateLabel": "{i18n:scada.symbol.flow-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowDirection", @@ -197,13 +340,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": true, "trueLabel": "{i18n:scada.symbol.forward}", "falseLabel": "{i18n:scada.symbol.reverse}", "stateLabel": "{i18n:scada.symbol.forward}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": true, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "flowAnimationSpeed", @@ -212,13 +375,32 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "DOUBLE", - "defaultValue": 1, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": 1, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;" + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "leak", @@ -227,13 +409,33 @@ "group": "{i18n:scada.symbol.pipe}", "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.leak-present}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "DO_NOTHING", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": null, + "key": "state" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null } ], "properties": [ @@ -510,8 +712,7 @@ "step": null } ] -} - +}]]> diff --git a/application/src/main/data/json/system/scada_symbols/vertical-wheel-valve.svg b/application/src/main/data/json/system/scada_symbols/vertical-wheel-valve.svg index e304b52f4f..d43083040f 100644 --- a/application/src/main/data/json/system/scada_symbols/vertical-wheel-valve.svg +++ b/application/src/main/data/json/system/scada_symbols/vertical-wheel-valve.svg @@ -1,5 +1,4 @@ - - { +<svg xmlns="http://www.w3.org/2000/svg" xmlns:tb="https://thingsboard.io/svg" width="200" height="400" fill="none" version="1.1" viewBox="0 0 200 400"><tb:metadata xmlns=""><![CDATA[{ "title": "Vertical wheel valve", "description": "Vertical wheel valve with open/close animation and state colors.", "searchTags": [ @@ -37,13 +36,33 @@ "group": null, "type": "value", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": "{i18n:scada.symbol.opened}", - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": { + "action": "GET_ATTRIBUTE", + "defaultValue": false, + "executeRpc": { + "method": "getState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "getAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "getTimeSeries": { + "key": "state" + }, + "dataToValue": { + "type": "NONE", + "dataToValueFunction": "/* Should return boolean value */\nreturn data;", + "compareToValue": true + } + }, + "defaultSetValueSettings": null, + "defaultWidgetActionSettings": null }, { "id": "open", @@ -52,13 +71,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": true, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": true, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null }, { "id": "close", @@ -67,13 +105,32 @@ "group": null, "type": "action", "valueType": "BOOLEAN", - "defaultValue": false, "trueLabel": null, "falseLabel": null, "stateLabel": null, - "valueToDataType": "CONSTANT", - "constantValue": false, - "valueToDataFunction": "" + "defaultGetValueSettings": null, + "defaultSetValueSettings": { + "action": "SET_ATTRIBUTE", + "executeRpc": { + "method": "setState", + "requestTimeout": 5000, + "requestPersistent": false, + "persistentPollingInterval": 1000 + }, + "setAttribute": { + "scope": "SHARED_SCOPE", + "key": "open" + }, + "putTimeSeries": { + "key": "state" + }, + "valueToData": { + "type": "CONSTANT", + "constantValue": false, + "valueToDataFunction": "/* Convert input boolean value to RPC parameters or attribute/time-series value */\nreturn value;" + } + }, + "defaultWidgetActionSettings": null } ], "properties": [ @@ -143,16 +200,7 @@ } ] } - - - - - - - - - - + @@ -237,24 +285,16 @@ - - + - - + - - - + - - - - - + \ No newline at end of file