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 UI for continue on error bool for ruleset
Michael Rademaker40b53cd21099
diff --git a/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java b/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.javaindex 03588f3d8..e04c51e51 100644--- a/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java+++ b/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java@@ -60,6 +60,8 @@ public interface ManagerMessages extends Messages {String enabled();+ String continueOnError();+String editTenant();String tenantDisplayName();diff --git a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.javaindex 47888bcf9..7b43a3e7b 100644--- a/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java+++ b/client/src/main/java/org/openremote/app/client/rules/AbstractRulesEditorActivity.java@@ -200,6 +200,7 @@ public abstract class AbstractRulesEditorActivity<T extends Ruleset, PLACE extenview.setName(ruleset.getName());view.setLang(ruleset.getLang());view.setRulesetEnabled(ruleset.isEnabled());+ view.setContinueOnError(ruleset.isContinueOnError());view.setRules(ruleset.getRules());view.enableCreate(rulesetId == null);view.enableUpdate(rulesetId != null);@@ -209,6 +210,7 @@ public abstract class AbstractRulesEditorActivity<T extends Ruleset, PLACE extenprotected void readFromView() {ruleset.setName(view.getName());ruleset.setEnabled(view.getRulesetEnabled());+ ruleset.setContinueOnError(view.getContinueOnError());ruleset.setLang(view.getLang());ruleset.setRules(view.getRules());}diff --git a/client/src/main/java/org/openremote/app/client/rules/RulesEditor.java b/client/src/main/java/org/openremote/app/client/rules/RulesEditor.javaindex 4f5bb029b..552044a17 100644--- a/client/src/main/java/org/openremote/app/client/rules/RulesEditor.java+++ b/client/src/main/java/org/openremote/app/client/rules/RulesEditor.java@@ -53,6 +53,10 @@ public interface RulesEditor extends RulesView, FormView {boolean getRulesetEnabled();+ void setContinueOnError(Boolean continueOnError);++ boolean getContinueOnError();+void setRules(String rules);String getRules();diff --git a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.java b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.javaindex 50baa9959..31ba68b0a 100644--- a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.java+++ b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.java@@ -26,13 +26,11 @@ import com.google.gwt.uibinder.client.UiBinder;import com.google.gwt.uibinder.client.UiField;import com.google.gwt.uibinder.client.UiHandler;import com.google.gwt.user.client.ui.HTMLPanel;-import com.google.inject.Provider;import elemental.client.Browser;import elemental.html.AnchorElement;import elemental.html.Blob;import elemental.html.FileReader;import org.openremote.app.client.Environment;-import org.openremote.app.client.app.dialog.Confirmation;import org.openremote.app.client.assets.browser.AssetBrowser;import org.openremote.app.client.widget.*;import org.openremote.model.rules.Ruleset;@@ -66,6 +64,8 @@ public class RulesEditorImpl extends FormViewImpl implements RulesEditor {@UiFieldFormCheckBox enabledCheckBox;@UiField+ FormCheckBox continueOnErrorCheckBox;+ @UiFieldFormButton rulesFileDownload;@UiFieldFileUploadLabelled rulesFileUpload;@@ -158,6 +158,7 @@ public class RulesEditorImpl extends FormViewImpl implements RulesEditor {nameGroup.setError(false);nameInput.setValue(null);enabledCheckBox.setValue(true);+ continueOnErrorCheckBox.setValue(false);rulesTextArea.setValue(null);createButton.setVisible(false);updateButton.setVisible(false);@@ -206,6 +207,16 @@ public class RulesEditorImpl extends FormViewImpl implements RulesEditor {return enabledCheckBox.getValue();}+ @Override+ public void setContinueOnError(Boolean continueOnError) {+ continueOnErrorCheckBox.setValue(continueOnError != null ? continueOnError : false);+ }++ @Override+ public boolean getContinueOnError() {+ return continueOnErrorCheckBox.getValue();+ }+@Overridepublic void setRules(String rules) {rulesTextArea.setText(rules);diff --git a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xmlindex fb234c16b..da2cdc584 100644--- a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml+++ b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml@@ -77,6 +77,10 @@</w:field><w:actions><w:FormGroupActions>+ <w:FormLabel text="{managerMessages.continueOnError}"/>+ <w:FormField>+ <w:FormCheckBox ui:field="continueOnErrorCheckBox"/>+ </w:FormField><w:FormButton ui:field="rulesFileDownload"icon="download"text="{managerMessages.downloadRulesFile}"/>diff --git a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.propertiesindex edee5453e..0240bb663 100644--- a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties+++ b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties@@ -13,6 +13,7 @@ createTenant=Create tenanttenantName=Tenant namerealm=Realmenabled=Enabled+continueOnError=Continue on erroreditTenant=Edit tenanttenantDisplayName=Tenant nameupdateTenant=Save tenant