diff --git a/packages/school.yaml b/packages/school.yaml index 81ce683..fe6fc8d 100644 --- a/packages/school.yaml +++ b/packages/school.yaml @@ -20,9 +20,6 @@ input_boolean: school_cancelled: name: Kallen School Cancelled icon: mdi:calendar-remove - kallen_band_practice: - name: Kallen Band Practice - icon: mdi:trumpet kallen_alternate_pickup: name: Kallen Alternate Pickup icon: mdi:car @@ -88,16 +85,6 @@ template: off {% endif %} icon: mdi:school - - name: Kallen Band Tomorrow - unique_id: c57855eb-0499-4585-9081-9b2244ce6845 - state: >- - {%- set test=(as_timestamp(now())+ (86400)) | timestamp_custom("%Y-%m-%d",true) %} - {% if states.calendar.kallen_school_days.attributes.start_time == test + " 08:00:00" %} - on - {% else %} - off - {% endif %} - icon: mdi:trumpet sensor: - platform: template @@ -345,14 +332,6 @@ automation: from: 'off' to: 'on' action: - - service: input_boolean.turn_off - target: - entity_id: input_boolean.kallen_band_practice - - delay: - hours: 0 - minutes: 0 - seconds: 2 - milliseconds: 0 - service: script.kallen_scheduling_morning - delay: hours: 0 @@ -385,7 +364,8 @@ automation: - input_boolean.kallen_school_early_release - input_boolean.kallen_school_today_extended - input_boolean.kallen_at_school - - input_boolean.kallen_band_practice + - input_boolean.kallen_alternate_pickup + - input_boolean.kallen_school_early_release - delay: hours: 0 minutes: 0 @@ -442,15 +422,6 @@ script: - input_boolean.kallen_school_today - input_boolean.kallen_school_today_extended - input_boolean.school_in_session - - delay: - seconds: 1 - - if: - - condition: template - value_template: > - {{ state_attr('input_datetime.kallen_school_day_start','timestamp') == 28800 }} - then: - - service: input_boolean.turn_on - entity_id: input_boolean.kallen_band_practice kallen_school_reset: alias: 'Kallen School Reset' @@ -468,5 +439,4 @@ script: - service: input_boolean.turn_off entity_id: - input_boolean.kallen_school_today_extended - - input_boolean.kallen_band_practice - input_boolean.kallen_school_early_release \ No newline at end of file diff --git a/templates/speech/kallen_morning_briefing.yaml b/templates/speech/kallen_morning_briefing.yaml index a3f6ea9..1227a9d 100644 --- a/templates/speech/kallen_morning_briefing.yaml +++ b/templates/speech/kallen_morning_briefing.yaml @@ -73,14 +73,6 @@ 'Unfortunately, your school has not decided to embrace to power of sleep. They are running on time today. ', ] | random }} {% endif %} - {% if is_state('input_boolean.kallen_band_practice','on') %} - {{ [ - 'You have band practice this morning before school. ', - 'You have a date with a trombone in just a short while. ', - 'You get to practice avoiding eighth position today. ', - 'I know it is early, but you had better pucker up because you have to spit in a metal tube and make music today. ' - ] | random }} - {% endif %} {% if is_state('input_boolean.kallen_school_early_release','on') %} {{ [ "And it is early dismissal today!", diff --git a/templates/speech/kallen_nightly_briefing.yaml b/templates/speech/kallen_nightly_briefing.yaml index dd51f0a..006d18e 100644 --- a/templates/speech/kallen_nightly_briefing.yaml +++ b/templates/speech/kallen_nightly_briefing.yaml @@ -18,14 +18,6 @@ 'Because you have to get up early tomorrow for school.', 'Because you want to be ready for school tomorrow.' ] | random }} - {% if is_state('binary_sensor.kallen_band_tomorrow','on') %} - {{ [ - 'And you have band practice in the morning. ', - 'And you have a date with a trombone first thing in the morning. ', - 'And you want to be nice and energetic for blowing into a large brass tube first thing in the morning. ' - 'Tomorrow is an early morning, because you have to spit in a metal tube and make music. ' - ] | random }} - {% endif %} {% else %} {% set month=states("sensor.date").split('-')[1] | int %} {%- if is_state('input_boolean.school_in_session', 'off') -%} diff --git a/templates/speech/kallen_school_status.yaml b/templates/speech/kallen_school_status.yaml index ba18d90..51d4eb9 100644 --- a/templates/speech/kallen_school_status.yaml +++ b/templates/speech/kallen_school_status.yaml @@ -18,9 +18,6 @@ {% endif %} {% if is_state('input_boolean.kallen_school_today','on') %} - {% if is_state('input_boolean.kallen_band_practice','on') %} - "You have band practice this morning before school. " - {% endif %} "Your school day will start at {{ input_datetime_12hr('input_datetime.kallen_school_day_start') }}. " {% if is_state('input_boolean.kallen_school_early_release','on') %} "There will be early dismissal today. " diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index 9d5b201..62a45dd 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -25,11 +25,7 @@

{{ tonyStatusReport('stream','tts') }} {% if is_state('binary_sensor.kallen_school_tomorrow','on') %} - {% if is_state('binary_sensor.kallen_band_tomorrow','on') %} - "Collin has school tomorrow, and there will be band practice in the morning at {{ read_time_from_calendar('calendar.kallen_school_days','start_time') }}. " - {% else %} - "Collin has school tomorrow at {{ read_time_from_calendar('calendar.kallen_school_days','start_time') }}. " - {% endif %} + "Collin has school tomorrow at {{ read_time_from_calendar('calendar.kallen_school_days','start_time') }}. " {% else %} "Collin does not have school tomorrow. " {% endif %} diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml index 9dc6331..28f6b3f 100644 --- a/templates/speech/welcome_home.yaml +++ b/templates/speech/welcome_home.yaml @@ -39,14 +39,6 @@ 'Do not forget to do your homework! ', 'You must be glad that your school day is over! ' ] | random }} - {% if is_state('input_boolean.kallen_band_practice','on') %} - {{ [ - 'I hope you also enjoyed band practice this morning! ', - 'I hope the trombone treated you well this morning! ', - 'Band geeks are the best geeks! ', - 'You did not achieve eighth position this morning, did you? ', - ] | random }} - {% endif %} {% 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 %}