Fix for 'none' triggers not being caught #87

This commit is contained in:
2023-05-05 13:56:01 -04:00
parent b3be3f3346
commit c72909e7ad
5 changed files with 11 additions and 10 deletions

View File

@ -369,7 +369,7 @@ script:
- service: input_boolean.turn_on - service: input_boolean.turn_on
target: target:
entity_id: input_boolean.emma_tylenol entity_id: input_boolean.emma_tylenol
- conditions: "{{ wait.trigger.id == 'cancel' or wait.trigger == 'none' }}" - conditions: "{{ wait.trigger.id == 'cancel' or wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_boolean.turn_off - service: input_boolean.turn_off
target: target:
@ -452,7 +452,7 @@ script:
datetime: > datetime: >
{% from 'time.jinja' import set_datetime %} {% from 'time.jinja' import set_datetime %}
{{ set_datetime(8) }} {{ set_datetime(8) }}
- conditions: "{{ wait.trigger.id == 'ibuprofen-ask-later' or wait.trigger == 'none' }}" - conditions: "{{ wait.trigger.id == 'ibuprofen-ask-later' or wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_datetime.set_datetime - service: input_datetime.set_datetime
target: target:
@ -539,7 +539,7 @@ script:
datetime: > datetime: >
{% from 'time.jinja' import set_datetime %} {% from 'time.jinja' import set_datetime %}
{{ set_datetime(8) }} {{ set_datetime(8) }}
- conditions: "{{ wait.trigger.id == 'tylenol-ask-later' or wait.trigger == 'none' }}" - conditions: "{{ wait.trigger.id == 'tylenol-ask-later' or wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_datetime.set_datetime - service: input_datetime.set_datetime
target: target:
@ -731,7 +731,7 @@ script:
5 5
{% endif %} {% endif %}
- choose: - choose:
- conditions: "{{ wait.trigger == none }}" - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_select.select_option - service: input_select.select_option
target: target:

View File

@ -319,7 +319,7 @@ script:
message: Delayed for 5 minutes message: Delayed for 5 minutes
entity_id: input_boolean.kallen_morning_meds_taken entity_id: input_boolean.kallen_morning_meds_taken
domain: input_boolean domain: input_boolean
- conditions: "{{ wait.trigger.id == 'left' or wait.trigger == 'none' }}" - conditions: "{{ wait.trigger.id == 'left' or wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- if: - if:
- condition: state - condition: state
@ -445,7 +445,7 @@ script:
message: Delayed for 15 minutes message: Delayed for 15 minutes
entity_id: input_boolean.kallen_night_meds_taken entity_id: input_boolean.kallen_night_meds_taken
domain: input_boolean domain: input_boolean
- conditions: "{{ wait.trigger == 'none' }}" - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_datetime.set_datetime - service: input_datetime.set_datetime
target: target:

View File

@ -127,7 +127,7 @@ script:
{{ states('input_number.wakeup_lights_fade_day') }} {{ states('input_number.wakeup_lights_fade_day') }}
{% endif %} {% endif %}
- choose: - choose:
- conditions: "{{ wait.trigger == none }}" - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_select.select_option - service: input_select.select_option
target: target:

View File

@ -220,7 +220,7 @@ script:
type: critical type: critical
title: HEY DUMBASS title: HEY DUMBASS
message: YOU FORGOT TO TAKE YOUR MORNING MEDS!!!!! message: YOU FORGOT TO TAKE YOUR MORNING MEDS!!!!!
- conditions: "{{ wait.trigger == 'none' }}" - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- service: input_datetime.set_datetime - service: input_datetime.set_datetime
target: target:
@ -328,7 +328,7 @@ script:
message: delayed for 30 minutes message: delayed for 30 minutes
entity_id: input_boolean.tony_night_meds_taken entity_id: input_boolean.tony_night_meds_taken
domain: input_boolean domain: input_boolean
- conditions: "{{ wait.trigger == 'none' }}" - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
sequence: sequence:
- if: - if:
- condition: and - condition: and

View File

@ -304,7 +304,8 @@ going_upstairs:
alias: Turn off the lights alias: Turn off the lights
- service: input_datetime.set_datetime - service: input_datetime.set_datetime
data: data:
time: '{% from ''time.jinja'' import set_datetime %} {{ set_datetime(0,2) }} datetime: '{% from ''time.jinja'' import set_datetime %} {{ set_datetime(0,2)
}}
' '
target: target: