diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index b3806d5..4a2363e 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -167,7 +167,7 @@ script: entity_id: input_datetime.kallen_school_day_start data: time: > - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 11:00 {% else %} {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%H:%M") }} @@ -179,7 +179,7 @@ script: data: time: > {% if is_state('input_boolean.kallen_school_today', 'on') %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 09:30 {% else %} {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} @@ -193,7 +193,7 @@ script: data: option: > {% if is_state('input_boolean.kallen_school_today','on') %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} Common Areas {% else %} Kallen Bedroom @@ -206,7 +206,7 @@ script: data: time: > {% if is_state('input_boolean.kallen_school_today', 'on') %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 09:40 {% else %} {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 4800) | timestamp_custom('%H:%M', false) }} @@ -218,7 +218,7 @@ script: entity_id: input_datetime.kallen_school_day_start_reminder data: time: > - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 10:00 {% else %} {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 3600) | timestamp_custom('%H:%M', false) }} @@ -296,7 +296,7 @@ script: data: time: > {% if is_state('input_boolean.kallen_school_today','on') %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 10:20 {% else %} {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2400) | timestamp_custom('%H:%M', false) }} diff --git a/packages/school.yaml b/packages/school.yaml index 5ff6b01..83ce397 100644 --- a/packages/school.yaml +++ b/packages/school.yaml @@ -14,10 +14,10 @@ input_boolean: kallen_school_today_extended: name: Kallen School Today Extended icon: mdi:bus-school - kallen_two_hour_delay: + two_hour_delay: name: Kallen Two Hour Delay icon: mdi:bus-clock - kallen_school_cancelled: + school_cancelled: name: Kallen School Cancelled icon: mdi:calendar-remove kallen_band_practice: @@ -316,7 +316,7 @@ automation: initial_state: true trigger: - platform: state - entity_id: input_boolean.kallen_two_hour_delay + entity_id: input_boolean.two_hour_delay from: 'off' to: 'on' action: @@ -348,14 +348,14 @@ automation: initial_state: true trigger: - platform: state - entity_id: input_boolean.kallen_school_cancelled + entity_id: input_boolean.school_cancelled from: 'off' to: 'on' action: - service: input_boolean.turn_off target: entity_id: - - input_boolean.kallen_two_hour_delay + - input_boolean.two_hour_delay - input_boolean.kallen_school_today - input_boolean.kallen_school_early_release - input_boolean.kallen_school_today_extended @@ -432,8 +432,8 @@ script: - service: input_boolean.turn_off entity_id: - input_boolean.kallen_school_today - - input_boolean.kallen_two_hour_delay - - input_boolean.kallen_school_cancelled + - input_boolean.two_hour_delay + - input_boolean.school_cancelled kallen_school_reset_late: alias: 'Kallen School Reset Late' diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml index fb105b4..6e04feb 100644 --- a/templates/speech/daily_briefing.yaml +++ b/templates/speech/daily_briefing.yaml @@ -322,7 +322,7 @@ 'Collin has school today.', 'It is a school day. ' ] | random }} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} 'But there was a two hour delay. ' {% endif %} {% endif %} @@ -331,7 +331,7 @@ And It is early release! {% endif %} {% endif %} - {% if is_state('input_boolean.kallen_school_cancelled','on') %} + {% if is_state('input_boolean.school_cancelled','on') %} 'School has been cancelled for today. ' {% endif %} {% if states.sensor.thanksgiving_break_days2go.state | int <= 14 and states.sensor.thanksgiving_break_days2go.state | int > 0 %} diff --git a/templates/speech/kallen_morning_briefing.yaml b/templates/speech/kallen_morning_briefing.yaml index 2310bf1..71a0a36 100644 --- a/templates/speech/kallen_morning_briefing.yaml +++ b/templates/speech/kallen_morning_briefing.yaml @@ -55,7 +55,7 @@ 'Today, you get to attend your favorite place. Just kidding. It is a school day. ', ] | random }} {% endif %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} {{ [ 'School will be starting two hours late today, as you are likely already aware. ', 'Your school superintendant has decided to sleep in this morning. He also decided to let you do the same. What a guy! ', @@ -99,7 +99,7 @@ ] | random }} {{ states('sensor.kallen_lunch_menu_items') }}. {% endif %} {% if is_state('input_boolean.kallen_school_today', 'off') %} - {% if is_state('input_boolean.kallen_school_cancelled','on') %} + {% if is_state('input_boolean.school_cancelled','on') %} {{ [ "It turns out you will not be attending school today after all. ", "The school has decided not to open today. ", diff --git a/templates/speech/kallen_school_status.yaml b/templates/speech/kallen_school_status.yaml index 5015d05..e902f12 100644 --- a/templates/speech/kallen_school_status.yaml +++ b/templates/speech/kallen_school_status.yaml @@ -5,12 +5,12 @@ "Hello Collin, " {% if is_state('input_boolean.kallen_school_today','on') %} - {% if is_state('input_boolean.kallen_two_hour_delay','on') %} + {% if is_state('input_boolean.two_hour_delay','on') %} "You have school today, but there is currently a two hour delay. " {% else %} "You have school today, and it is running on time. " {% endif %} - {% elif is_state('input_boolean.kallen_school_cancelled','on') %} + {% elif is_state('input_boolean.school_cancelled','on') %} "School has been cancelled for today! Enjoy the unexpected day off! " {% else %} "You do not have school today. Enjoy your day off! " diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml index 2f6d3f8..075ecdc 100644 --- a/templates/speech/welcome_home.yaml +++ b/templates/speech/welcome_home.yaml @@ -43,7 +43,7 @@ 'You did not achieve eighth position this morning, did you? ', ] | random }} {% endif %} - {% elif is_state('input_boolean.kallen_school_cancelled','on') and is_state('person.kallen_stork','home') %} + {% elif is_state('input_boolean.school_cancelled','on') and is_state('person.kallen_stork','home') %} "I hope you are enjoying your free day off from school, Collin. " {% endif %}