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
Added continue on error on RulesList in Manager UI
Michael Rademakerbadd1260ecc7
diff --git a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesList.java b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesList.javaindex a7c36dd3d..b414fb98d 100644--- a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesList.java+++ b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesList.java@@ -174,6 +174,7 @@ public abstract class AbstractRulesList<P extends RulesList.Presenter<R>, R extematchFound = true;existingRuleset.setName(ruleset.getName());existingRuleset.setEnabled(ruleset.isEnabled());+ existingRuleset.setContinueOnError(ruleset.isContinueOnError());existingRuleset.setLang(ruleset.getLang());existingRuleset.setLastModified(ruleset.getLastModified());existingRuleset.setStatus(ruleset.getStatus());diff --git a/client/src/main/java/org/openremote/app/client/rules/RulesetTable.java b/client/src/main/java/org/openremote/app/client/rules/RulesetTable.javaindex bb43ceac9..2d092a5f0 100644--- a/client/src/main/java/org/openremote/app/client/rules/RulesetTable.java+++ b/client/src/main/java/org/openremote/app/client/rules/RulesetTable.java@@ -106,6 +106,13 @@ public class RulesetTable<R extends Ruleset> extends FormTable<R> {}};+ final protected Column<R, String> continueOnErrorColumn = new Column<R, String>(new IconCell()) {+ @Override+ public String getValue(R ruleset) {+ return ruleset.isContinueOnError() ? "check-circle" : "circle-thin";+ }+ };+final protected TextColumn<R> statusColumn = new TextColumn<R>() {@Overridepublic String getValue(R ruleset) {@@ -154,6 +161,10 @@ public class RulesetTable<R extends Ruleset> extends FormTable<R> {addColumn(enabledColumn, createHeader(managerMessages.enabled()));addColumnStyleName(i++, style.enabledColumn());enabledColumn.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);++ addColumn(continueOnErrorColumn, createHeader(managerMessages.continueOnError()));+ addColumnStyleName(i++, style.createOnColumn());+ continueOnErrorColumn.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);}@Overridediff --git a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xmlindex bdf3535e2..588c0335f 100644--- a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml+++ b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml@@ -28,6 +28,9 @@.enabledColumn {}+ .continueOnErrorColumn{+ }+.statusColumn {}</ui:style>diff --git a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xmlindex c88461030..00f0c15d6 100644--- a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml+++ b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml@@ -32,6 +32,9 @@.enabledColumn {}+ .continueOnErrorColumn{+ }+.statusColumn {}</ui:style>diff --git a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xmlindex 1d2915f9a..b6ca98da4 100644--- a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml+++ b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml@@ -32,6 +32,9 @@.enabledColumn {}+ .continueOnErrorColumn{+ }+.statusColumn {}</ui:style>