From c72909e7adb900700c1b3c19dc760eeb19b35afe Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Fri, 5 May 2023 13:56:01 -0400
Subject: [PATCH] Fix for 'none' triggers not being caught #87

---
 packages/emmalynn.yaml       | 8 ++++----
 packages/kallen.yaml         | 4 ++--
 packages/master_bedroom.yaml | 2 +-
 packages/tony.yaml           | 4 ++--
 scripts.yaml                 | 3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/emmalynn.yaml b/packages/emmalynn.yaml
index df95393..8b1db95 100644
--- a/packages/emmalynn.yaml
+++ b/packages/emmalynn.yaml
@@ -369,7 +369,7 @@ script:
         - service: input_boolean.turn_on
           target:
             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:
         - service: input_boolean.turn_off
           target:
@@ -452,7 +452,7 @@ script:
             datetime: >
               {% from 'time.jinja' import set_datetime %}
               {{ 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:
         - service: input_datetime.set_datetime
           target:
@@ -539,7 +539,7 @@ script:
             datetime: >
               {% from 'time.jinja' import set_datetime %}
               {{ 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:
         - service: input_datetime.set_datetime
           target:
@@ -731,7 +731,7 @@ script:
               5
             {% endif %}
       - choose:
-        - conditions: "{{ wait.trigger == none }}"
+        - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
           sequence:
           - service: input_select.select_option
             target:
diff --git a/packages/kallen.yaml b/packages/kallen.yaml
index f3e348c..b2ee359 100644
--- a/packages/kallen.yaml
+++ b/packages/kallen.yaml
@@ -319,7 +319,7 @@ script:
             message: Delayed for 5 minutes
             entity_id: input_boolean.kallen_morning_meds_taken
             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:
         - if:
           - condition: state
@@ -445,7 +445,7 @@ script:
             message: Delayed for 15 minutes
             entity_id: input_boolean.kallen_night_meds_taken
             domain: input_boolean
-      - conditions: "{{ wait.trigger == 'none' }}"
+      - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
         sequence:
         - service: input_datetime.set_datetime
           target:
diff --git a/packages/master_bedroom.yaml b/packages/master_bedroom.yaml
index e1525ec..6bbcfd1 100644
--- a/packages/master_bedroom.yaml
+++ b/packages/master_bedroom.yaml
@@ -127,7 +127,7 @@ script:
             {{ states('input_number.wakeup_lights_fade_day') }}
           {% endif %}
     - choose:
-      - conditions: "{{ wait.trigger == none }}"
+      - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
         sequence:
         - service: input_select.select_option
           target:
diff --git a/packages/tony.yaml b/packages/tony.yaml
index 04f6225..26e8928 100644
--- a/packages/tony.yaml
+++ b/packages/tony.yaml
@@ -220,7 +220,7 @@ script:
             type: critical
             title: HEY DUMBASS
             message: YOU FORGOT TO TAKE YOUR MORNING MEDS!!!!!
-      - conditions: "{{ wait.trigger == 'none' }}"
+      - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
         sequence:
         - service: input_datetime.set_datetime
           target:
@@ -328,7 +328,7 @@ script:
             message: delayed for 30 minutes
             entity_id: input_boolean.tony_night_meds_taken
             domain: input_boolean
-      - conditions: "{{ wait.trigger == 'none' }}"
+      - conditions: "{{ wait.trigger == 'none' or wait.trigger.idx is undefined }}"
         sequence:
         - if:
           - condition: and
diff --git a/scripts.yaml b/scripts.yaml
index 1535292..3db1cf8 100644
--- a/scripts.yaml
+++ b/scripts.yaml
@@ -304,7 +304,8 @@ going_upstairs:
     alias: Turn off the lights
   - service: input_datetime.set_datetime
     data:
-      time: '{% from ''time.jinja'' import set_datetime %} {{ set_datetime(0,2) }}
+      datetime: '{% from ''time.jinja'' import set_datetime %} {{ set_datetime(0,2)
+        }}
 
         '
     target: