TimeFrame repetition fix
This commit is contained in:
parent
5a09962cc9
commit
c688a4c460
@ -331,6 +331,15 @@ public class Rule implements Comparable<Rule>
|
|||||||
{
|
{
|
||||||
if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution())
|
if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Workaround for repetition in TimeFrame triggers
|
||||||
|
*/
|
||||||
|
if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame))
|
||||||
|
{
|
||||||
|
if(oneTrigger.getTimeFrame().repetition > 0)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -334,6 +334,15 @@ public class Rule implements Comparable<Rule>
|
|||||||
{
|
{
|
||||||
if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution())
|
if (oneTrigger.hasStateNotAppliedSinceLastRuleExecution())
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Workaround for repetition in TimeFrame triggers
|
||||||
|
*/
|
||||||
|
if(oneTrigger.getTriggerType().equals(Trigger.Trigger_Enum.timeFrame))
|
||||||
|
{
|
||||||
|
if(oneTrigger.getTimeFrame().repetition > 0)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user