ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix time based rules not being initialized directly after creation

pull/429/head
Michael Zanetti 2021-05-29 00:26:57 +02:00
parent 1acd8ca808
commit 4290e01b1f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libnymea-core/ruleengine/ruleengine.cpp
View File

@ -201,7 +201,7 @@ QList<Rule> RuleEngine::evaluateEvent(const Event &event)
} else {
// Event based rule
if (containsEvent(rule, event, thing->thingClassId())) {
qCDebug(dcRuleEngineDebug()).nospace().noquote() << "Rule " << rule.name() << " (" << rule.id().toString() << ") contains event";
qCDebug(dcRuleEngineDebug()).nospace().noquote() << "Rule " << rule.name() << " (" << rule.id().toString() << ") contains event. States active:" << rule.statesActive() << "Time active:" << rule.timeActive();
if (rule.statesActive() && rule.timeActive()) {
qCDebug(dcRuleEngine).nospace().noquote() << "Rule " << rule.name() << " (" + rule.id().toString() << ") contains event and all states match.";
rules.append(rule);
@ -1103,6 +1103,7 @@ void RuleEngine::appendRule(const Rule &rule)
{
Rule newRule = rule;
newRule.setStatesActive(newRule.stateEvaluator().evaluate());
newRule.setTimeActive(newRule.timeDescriptor().evaluate(QDateTime(), QDateTime::currentDateTime()));
qCDebug(dcRuleEngine()) << "Adding Rule:" << newRule;
m_rules.insert(rule.id(), newRule);
m_ruleIds.append(rule.id());