From 6febe28aec8ac51ae8bbdde13c29d86ff5549031 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Fri, 22 Sep 2023 13:10:13 -0400
Subject: [PATCH] Improve school day modifications, close #141

---
 packages/scheduling.yaml |  2 +-
 packages/school.yaml     | 80 +++++++++++++++-------------------------
 2 files changed, 31 insertions(+), 51 deletions(-)

diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml
index 0988a0d..23da107 100644
--- a/packages/scheduling.yaml
+++ b/packages/scheduling.yaml
@@ -635,7 +635,7 @@ script:
             time: >
               {% if is_state('input_boolean.kallen_school_today','on') %}
                 {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
-                  14:00
+                  14:30
                 {% elif is_state('input_boolean.kallen_school_early_release','on') %}
                   12:00
                 {% else %}
diff --git a/packages/school.yaml b/packages/school.yaml
index 38c88ab..5eadc60 100644
--- a/packages/school.yaml
+++ b/packages/school.yaml
@@ -287,68 +287,48 @@ automation:
         target:
           entity_id: input_boolean.school_in_session
 
-  - id: 068c20ee-23ba-4cd5-af31-dcfff7bdbfed
-    alias: Kallen Two Hour Delay
-    initial_state: true
+  - id: 31f766d9-be1d-40bb-8c84-6cb2c57aac3c
+    alias: Kallen School Modifications
+    description: Runs when a two hour delay, cancellation, or alternate pickup is issued.
+    mode: restart
     trigger:
       - platform: state
         entity_id: input_boolean.two_hour_delay
         from: 'off'
         to: 'on'
-    action:
-      - service: script.kallen_scheduling_morning
-      - delay:
-          hours: 0
-          minutes: 0
-          seconds: 2
-          milliseconds: 0
-      - service: script.house_scheduling_morning
-      - delay:
-          hours: 0
-          minutes: 0
-          seconds: 2
-          milliseconds: 0
-      - service: script.master_bedroom_scheduling_morning
-    mode: single
-
-  - id: f8ecfc73-cb78-42b6-9b21-e17ef1e72741
-    alias: Kallen School Cancelled
-    initial_state: true
-    trigger:
+        id: two-hour-delay
       - platform: state
         entity_id: input_boolean.school_cancelled
         from: 'off'
         to: 'on'
+        id: cancelled
+      - platform: state
+        entity_id: input_boolean.kallen_alternate_pickup
+        not_from:
+        - unknown
+        - unavailable
+        not_to:
+        - unknown
+        - unavailable
+        id: alternate-pickup
     action:
-      - service: input_boolean.turn_off
-        target:
-          entity_id:
-          - input_boolean.two_hour_delay
-          - input_boolean.kallen_school_today
-          - input_boolean.kallen_school_early_release
-          - input_boolean.kallen_school_today_extended
-          - input_boolean.kallen_at_school
-          - input_boolean.kallen_alternate_pickup
-          - input_boolean.kallen_school_early_release
+      - if:
+        - condition: trigger
+          id: cancelled
+        then:
+        - service: input_boolean.turn_off
+          target:
+            entity_id:
+            - input_boolean.two_hour_delay
+            - input_boolean.kallen_school_today
+            - input_boolean.kallen_school_early_release
+            - input_boolean.kallen_school_today_extended
+            - input_boolean.kallen_at_school
+            - input_boolean.kallen_alternate_pickup
+            - input_boolean.kallen_school_early_release
       - delay:
-          hours: 0
-          minutes: 0
           seconds: 2
-          milliseconds: 0
-      - service: script.kallen_scheduling_morning
-      - delay:
-          hours: 0
-          minutes: 0
-          seconds: 2
-          milliseconds: 0
-      - service: script.house_scheduling_morning
-      - delay:
-          hours: 0
-          minutes: 0
-          seconds: 2
-          milliseconds: 0
-      - service: script.master_bedroom_scheduling_morning
-    mode: single
+      - service: script.rerun_all_scheduling_morning
 
 script:
   kallen_school_today: