Skip to content

Add support for conditions #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
volfan6415 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for conditions #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae69842
Update rules.js
volfan6415 Nov 18, 2019
7ad2f73
Update conditions.js
volfan6415 Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions Core/automation/lib/javascript/core/conditions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,13 @@ if(ModuleBuilder == undefined)var ModuleBuilder = Java.type("org.eclipse.smartho

// ### stateCondition ###
var ItemStateCondition = function(itemName, state, condName){
return ModuleBuilder.createCondition().withId(getTrName(condName)).withTypeUID("core.ItemStateCondition").withConfiguration( new Configuration({
"itemName": itemName,
"operator": "=",
"state": state
})).build();
return GenericCompareCondition(itemName,state,"=",condName);
}
var stateCondition = ItemStateCondition;

// ### GenericCompareCondition ###
var GenericCompareCondition = function(itemName, state, operator, condName){
return ModuleBuilder.createCondition().withId(getTrName(condName)).withTypeUID("core.GenericCompareCondition").withConfiguration( new Configuration({
return ModuleBuilder.createCondition().withId(getTrName(condName)).withTypeUID("core.ItemStateCondition").withConfiguration( new Configuration({
"itemName": itemName,
"operator": operator,// matches, ==, <, >, =<, =>
"state": state
Expand Down
4 changes: 4 additions & 0 deletions Core/automation/lib/javascript/core/rules.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ return RuleBuilder.create(ruleDto.uid)
if (obj.name) {
rule.setName(obj.name);
}

if (obj.conditions){
rule.setConditions(obj.conditions);
}

//1. Register rule here
if (triggers && triggers.length > 0) {
Expand Down