100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI updates: minor
Rich Turner7e5f716c93b9
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.jsonindex a016997e9..58adbc591 100644--- a/deployment/manager/shared/locales/en/or.json+++ b/deployment/manager/shared/locales/en/or.json@@ -56,6 +56,8 @@"confirmDelete": "Are you sure you want to delete?","when": "When","then": "Then",+ "and": "and",+ "or": "or","datetime": "Datetime","timer": "Timer","rulesEditorAddCondition": "Add condition",diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.jsonindex 13afb0410..94367bbd4 100644--- a/deployment/manager/shared/locales/nl/or.json+++ b/deployment/manager/shared/locales/nl/or.json@@ -20,8 +20,8 @@"disabled": "Inactief","scene": "Scene","user": "Gebruiker",- "empty": "Niet ingevuld",- "notEmpty": "Ingevuld",+ "empty": "Onbekend",+ "notEmpty": "Bekend","equals": "Gelijk aan","notEquals": "Niet gelijk aan","greaterThan": "Groter dan",@@ -56,6 +56,8 @@"confirmDelete": "Weet je zeker dat je dit wil verwijderen?","when": "als","then": "dan",+ "and": "en",+ "or": "of","datetime": "Datum en tijd","timer": "Timer","rulesEditorAddCondition": "Voorwaarde",diff --git a/ui/component/or-rules-editor/src/or-rule-when.ts b/ui/component/or-rules-editor/src/or-rule-when.tsindex 4e52bb055..c6fcaf757 100644--- a/ui/component/or-rules-editor/src/or-rule-when.ts+++ b/ui/component/or-rules-editor/src/or-rule-when.ts@@ -5,7 +5,6 @@ import {whenStyle} from "./style";import "./or-rule-condition";import i18next from "i18next";-// TODO: Update to properly support LogicGroup<RuleCondition>@customElement("or-rule-when")class OrRuleWhen extends LitElement {@@ -97,6 +96,7 @@ class OrRuleWhen extends LitElement {} else {group.operator = RuleOperator.OR;}+ this.dispatchEvent(new OrRuleChangedEvent());this.requestUpdate();}diff --git a/ui/tslint.json b/ui/tslint.jsonindex ab233401c..91b463c8b 100644--- a/ui/tslint.json+++ b/ui/tslint.json@@ -12,6 +12,7 @@"ordered-imports": false,"object-literal-sort-keys": false,"ban-types": false,+ "array-type": false,"object-literal-shorthand": false}}\ No newline at end of file