diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index e1c849d..7cd914e 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit e1c849d2ee42d50e593aa909f954c5dbe2e50a9c +Subproject commit 7cd914eb225efa69ae4f41f00eff8d1166bc500d diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 983c692..416b879 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -197,7 +197,7 @@ automation: to: 'on' condition: - condition: state - entity_id: input_boolean.school_today + entity_id: input_boolean.kallen_school_today state: 'on' - condition: state entity_id: input_boolean.kallen_overnight diff --git a/packages/presence.yaml b/packages/presence.yaml index 4b63d43..e15082e 100644 --- a/packages/presence.yaml +++ b/packages/presence.yaml @@ -234,7 +234,7 @@ automation: entity_id: input_boolean.kallen_at_school state: "off" - condition: state - entity_id: input_boolean.school_today + entity_id: input_boolean.kallen_school_today state: "on" action: - service: input_boolean.turn_on diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index 69ede62..55f624d 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -159,7 +159,7 @@ script: alias: 'Kallen Scheduling Morning' sequence: - service: input_datetime.set_datetime - entity_id: input_datetime.school_day_start + entity_id: input_datetime.kallen_school_day_start data_template: time: > {% if is_state('input_boolean.kallen_two_hour_delay','on') %} @@ -173,11 +173,11 @@ script: entity_id: input_datetime.kallen_wakeup_time data_template: time: > - {% if is_state('input_boolean.school_today', 'on') %} + {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 09:30 {% else %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} {% endif %} {% else %} 10:00 @@ -187,7 +187,7 @@ script: entity_id: input_select.kallen_morning_briefing_location data_template: option: > - {% if is_state('input_boolean.school_today','on') %} + {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} Common Areas {% else %} @@ -200,29 +200,29 @@ script: entity_id: input_datetime.kallen_morning_briefing data_template: time: > - {% if is_state('input_boolean.school_today', 'on') %} + {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 09:40 {% else %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 4800) | timestamp_custom('%H:%M', false) }} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 4800) | timestamp_custom('%H:%M', false) }} {% endif %} {% else %} 10:00 {% endif %} - service: input_datetime.set_datetime - entity_id: input_datetime.school_day_start_reminder + entity_id: input_datetime.kallen_school_day_start_reminder data_template: time: > {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 10:00 {% else %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 3600) | timestamp_custom('%H:%M', false) }} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 3600) | timestamp_custom('%H:%M', false) }} {% endif %} - service: input_datetime.set_datetime - entity_id: input_datetime.school_day_end_reminder + entity_id: input_datetime.kallen_school_day_end_reminder data_template: time: > - {% if is_state('input_boolean.school_early_release','on') %} + {% if is_state('input_boolean.kallen_school_early_release','on') %} 13:30 {% else %} 14:00 @@ -269,8 +269,8 @@ script: entity_id: input_datetime.audible_notification_on data_template: time: > - {% if is_state('input_boolean.school_today','on') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} + {% if is_state('input_boolean.kallen_school_today','on') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 5400) | timestamp_custom('%H:%M', false) }} {% else %} 09:00 {% endif %} @@ -278,13 +278,13 @@ script: entity_id: input_datetime.morning_report data_template: time: > - {% if is_state('input_boolean.school_today','on') %} + {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} 10:20 {% else %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 2400) | timestamp_custom('%H:%M', false) }} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2400) | timestamp_custom('%H:%M', false) }} {% endif %} - {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.school_today','off') %} + {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','off') %} {% if (state_attr('input_datetime.tina_workday_start','timestamp')) > 43200 %} 12:00 {% elif (state_attr('input_datetime.tina_workday_start','timestamp') - 1500 ) > (state_attr('input_datetime.audible_notification_on','timestamp')) %} @@ -299,13 +299,13 @@ script: entity_id: input_datetime.daily_report data_template: time: > - {% if is_state('input_boolean.school_today','on') %} - {% if is_state('input_boolean.school_early_release','on') %} + {% if is_state('input_boolean.kallen_school_today','on') %} + {% if is_state('input_boolean.kallen_school_early_release','on') %} 13:15 {% else %} 14:15 {% endif %} - {% elif is_state('input_boolean.school_today','off') and is_state('input_boolean.work_today','off') %} + {% elif is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','off') %} 15:00 {% else %} {% if (state_attr('input_datetime.tina_workday_end','timestamp')) > 61200 %} @@ -372,8 +372,8 @@ script: entity_id: input_datetime.master_bedroom_wakeup data_template: time: > - {% if is_state('input_boolean.school_today','on') %} - {% if is_state('input_boolean.school_early_release','on') %} + {% if is_state('input_boolean.kallen_school_today','on') %} + {% if is_state('input_boolean.kallen_school_early_release','on') %} 12:30 {% else %} 13:30 @@ -486,20 +486,20 @@ script: data_template: time: > {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} - {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.school_today','on') %} - {% if ct > state_attr('input_datetime.school_day_start','timestamp') %} + {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','on') %} + {% if ct > state_attr('input_datetime.kallen_school_day_start','timestamp') %} {{ (state_attr('input_datetime.tina_workday_start','timestamp') - 1800) | timestamp_custom('%H:%M', false) }} - {% elif ct > state_attr('input_datetime.tina_workday_start','timestamp') and ct < state_attr('input_datetime.school_day_start','timestamp') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} - {% elif state_attr('input_datetime.tina_workday_start','timestamp') < (state_attr('input_datetime.school_day_start','timestamp')) %} + {% elif ct > state_attr('input_datetime.tina_workday_start','timestamp') and ct < state_attr('input_datetime.kallen_school_day_start','timestamp') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} + {% elif state_attr('input_datetime.tina_workday_start','timestamp') < (state_attr('input_datetime.kallen_school_day_start','timestamp')) %} {{ (state_attr('input_datetime.tina_workday_start','timestamp') - 1800) | timestamp_custom('%H:%M', false) }} {% else %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} {% endif %} - {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.school_today','off') %} + {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','off') %} {{ (state_attr('input_datetime.tina_workday_start', 'timestamp') - 1800) | timestamp_custom('%H:%M', false) }} - {% elif is_state('input_boolean.school_today','on') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} + {% elif is_state('input_boolean.kallen_school_today','on') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} {% else %} 11:00 {% endif %} @@ -508,20 +508,20 @@ script: data_template: time: > {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} - {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.school_today','off') %} + {% if is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','off') %} {{ (state_attr('input_datetime.tina_workday_start','timestamp') + 900) | timestamp_custom('%H:%M', false) }} - {% elif is_state('input_boolean.school_today','on') and is_state('input_boolean.work_today','off') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') + 3600) | timestamp_custom('%H:%M', false) }} - {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.school_today','on') %} - {% if ct > state_attr('input_datetime.school_day_start','timestamp') %} + {% elif is_state('input_boolean.kallen_school_today','on') and is_state('input_boolean.work_today','off') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') + 3600) | timestamp_custom('%H:%M', false) }} + {% elif is_state('input_boolean.work_today','on') and is_state('input_boolean.kallen_school_today','on') %} + {% if ct > state_attr('input_datetime.kallen_school_day_start','timestamp') %} {{ (state_attr('input_datetime.tina_workday_start','timestamp') + 900) | timestamp_custom('%H:%M', false) }} - {% elif ct > state_attr('input_datetime.tina_workday_start','timestamp') and ct < state_attr('input_datetime.school_day_start','timestamp') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} - {% elif state_attr('input_datetime.tina_workday_start','timestamp') < state_attr('input_datetime.school_day_start','timestamp') %} - {{ (state_attr('input_datetime.school_day_start','timestamp') + 1800) | timestamp_custom('%H:%M', false) }} + {% elif ct > state_attr('input_datetime.tina_workday_start','timestamp') and ct < state_attr('input_datetime.kallen_school_day_start','timestamp') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2700) | timestamp_custom('%H:%M', false) }} + {% elif state_attr('input_datetime.tina_workday_start','timestamp') < state_attr('input_datetime.kallen_school_day_start','timestamp') %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') + 1800) | timestamp_custom('%H:%M', false) }} {% else %} - {% if (state_attr('input_datetime.tina_workday_start','timestamp') - state_attr('input_datetime.school_day_start','timestamp')) > 5400 %} - {{ (state_attr('input_datetime.school_day_start','timestamp') + 1800) | timestamp_custom('%H:%M', false) }} + {% if (state_attr('input_datetime.tina_workday_start','timestamp') - state_attr('input_datetime.kallen_school_day_start','timestamp')) > 5400 %} + {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') + 1800) | timestamp_custom('%H:%M', false) }} {% else %} {{ (state_attr('input_datetime.tina_workday_start','timestamp') + 900) | timestamp_custom('%H:%M', false) }} {% endif %} diff --git a/packages/school.yaml b/packages/school.yaml index 3e9b638..a63ff2e 100644 --- a/packages/school.yaml +++ b/packages/school.yaml @@ -2,14 +2,14 @@ input_boolean: school_in_session: name: School In Session icon: mdi:bus-school - school_today: - name: School Today + kallen_school_today: + name: Kallen School Today icon: mdi:bus-school - school_early_release: - name: School Early Release + kallen_school_early_release: + name: Kallen School Early Release icon: mdi:bus-school - school_today_extended: - name: School Today Extended + kallen_school_today_extended: + name: Kallen School Today Extended icon: mdi:bus-school kallen_two_hour_delay: name: Kallen Two Hour Delay @@ -32,12 +32,12 @@ input_datetime: has_date: true has_time: false icon: mdi:calendar - school_day_start: + kallen_school_day_start: name: School Day Start has_date: false has_time: true icon: mdi:clock-start - school_day_end: + kallen_school_day_end: name: School Day End has_date: false has_time: true @@ -57,12 +57,12 @@ input_datetime: has_date: true has_time: false icon: mdi:calendar-start - school_day_start_reminder: + kallen_school_day_start_reminder: name: School Day Start Reminder has_date: false has_time: true icon: mdi:clock-alert - school_day_end_reminder: + kallen_school_day_end_reminder: name: School Day End Reminder has_date: false has_time: true @@ -245,7 +245,7 @@ automation: initial_state: true trigger: - platform: time - at: input_datetime.school_day_end + at: input_datetime.kallen_school_day_end id: day_end - platform: time at: 00:00 @@ -321,9 +321,9 @@ automation: target: entity_id: - input_boolean.kallen_two_hour_delay - - input_boolean.school_today - - input_boolean.school_early_release - - input_boolean.school_today_extended + - 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_band_practice - delay: @@ -356,29 +356,29 @@ script: state: "on" then: - service: input_boolean.turn_on - entity_id: input_boolean.school_early_release + entity_id: input_boolean.kallen_school_early_release - service: input_datetime.set_datetime target: - entity_id: input_datetime.school_day_end + entity_id: input_datetime.kallen_school_day_end data: time: "14:30:00" else: - service: input_datetime.set_datetime target: - entity_id: input_datetime.school_day_end + entity_id: input_datetime.kallen_school_day_end data: time: > {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','end_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%H:%M") }} - service: input_datetime.set_datetime target: - entity_id: input_datetime.school_day_start + entity_id: input_datetime.kallen_school_day_start data: time: > {{ as_timestamp(strptime(state_attr('calendar.kallen_school_days','start_time'), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%H:%M") }} - service: input_boolean.turn_on entity_id: - - input_boolean.school_today - - input_boolean.school_today_extended + - input_boolean.kallen_school_today + - input_boolean.kallen_school_today_extended - service: script.turn_on entity_id: script.school_in_session - delay: @@ -386,7 +386,7 @@ script: - if: - condition: template value_template: > - {{ state_attr('input_datetime.school_day_start','timestamp') == 28800 }} + {{ state_attr('input_datetime.kallen_school_day_start','timestamp') == 28800 }} then: - service: input_boolean.turn_on entity_id: input_boolean.kallen_band_practice @@ -396,7 +396,7 @@ script: sequence: - service: input_boolean.turn_off entity_id: - - input_boolean.school_today + - input_boolean.kallen_school_today - input_boolean.kallen_two_hour_delay - input_boolean.kallen_school_cancelled @@ -405,9 +405,9 @@ script: sequence: - service: input_boolean.turn_off entity_id: - - input_boolean.school_today_extended + - input_boolean.kallen_school_today_extended - input_boolean.kallen_band_practice - - input_boolean.school_early_release + - input_boolean.kallen_school_early_release school_in_session: alias: 'School In Session' diff --git a/packages/security.yaml b/packages/security.yaml index a742208..bd5a2b8 100644 --- a/packages/security.yaml +++ b/packages/security.yaml @@ -135,7 +135,7 @@ automation: entity_id: input_boolean.work_today state: 'on' - condition: state - entity_id: input_boolean.school_today + entity_id: input_boolean.kallen_school_today state: 'on' action: - service: script.security_disarm @@ -164,7 +164,7 @@ automation: entity_id: input_boolean.work_today state: 'on' - condition: state - entity_id: input_boolean.school_today + entity_id: input_boolean.kallen_school_today state: 'on' action: - if: @@ -186,7 +186,7 @@ automation: - thu - fri - condition: state - entity_id: input_boolean.school_early_release + entity_id: input_boolean.kallen_school_early_release state: "on" then: - stop: School early release diff --git a/scripts.yaml b/scripts.yaml index 9f7d8d9..0b9b04f 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -506,23 +506,23 @@ freeze_cleanup: entity_id: calendar.kallen_school_days state: 'on' - condition: time - before: input_datetime.school_day_end - after: input_datetime.school_day_start + before: input_datetime.kallen_school_day_end + after: input_datetime.kallen_school_day_start then: - service: input_boolean.turn_on data: {} target: entity_id: - - input_boolean.school_today - - input_boolean.school_today_extended + - input_boolean.kallen_school_today + - input_boolean.kallen_school_today_extended - input_boolean.kallen_at_school else: - service: input_boolean.turn_off data: {} target: entity_id: - - input_boolean.school_today - - input_boolean.school_today_extended + - input_boolean.kallen_school_today + - input_boolean.kallen_school_today_extended - input_boolean.kallen_at_school - if: - condition: time diff --git a/templates/speech/daily_briefing.yaml b/templates/speech/daily_briefing.yaml index db9a00b..aa1d4d2 100644 --- a/templates/speech/daily_briefing.yaml +++ b/templates/speech/daily_briefing.yaml @@ -291,7 +291,7 @@ "Tony will be streaming today. The studio is scheduled to go online at {{ (state_attr('input_datetime.tony_streaming_start_time','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% endif %} - {% if is_state('input_boolean.school_today', 'on') %} + {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('sensor.school_start_days2go', '0') %} Today is the first day of school! There are {{ states('sensor.school_end_days2go') }} to go until the last day. {% else %} @@ -303,7 +303,7 @@ 'But there was a two hour delay. ' {% endif %} {% endif %} - Pickup today will be at {{(state_attr('input_datetime.school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }} + Pickup today will be at {{(state_attr('input_datetime.kallen_school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }} {% if 'Early Release' in states('sensor.school_event') %} And It is early release! {% endif %} diff --git a/templates/speech/kallen_morning_briefing.yaml b/templates/speech/kallen_morning_briefing.yaml index 1825b78..e5bd3f5 100644 --- a/templates/speech/kallen_morning_briefing.yaml +++ b/templates/speech/kallen_morning_briefing.yaml @@ -25,7 +25,7 @@

- {% if is_state('input_boolean.school_today', 'on') %} + {% if is_state('input_boolean.kallen_school_today', 'on') %} {% if is_state('sensor.school_start_days2go', '0') %} Today is the first day of school! {% else %} @@ -41,8 +41,8 @@ {% if is_state('input_boolean.kallen_band_practice','on') %} 'You have band practice this morning before school. ' {% endif %} - School today starts at {{ (state_attr('input_datetime.school_day_start','timestamp') | int | timestamp_custom('%I:%M %p' , False)) }} - Pickup today will be at {{(state_attr('input_datetime.school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }} + School today starts at {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') | int | timestamp_custom('%I:%M %p' , False)) }} + Pickup today will be at {{(state_attr('input_datetime.kallen_school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }} {% if 'Early Release' in states('sensor.school_event') %} And It is early dismissal today! {% endif %} @@ -51,7 +51,7 @@ {%- endif %} The lunch menu for today is {{ states('sensor.lunch_menu_items') }} {% endif %} - {% if is_state('input_boolean.school_today', 'off') %} + {% if is_state('input_boolean.kallen_school_today', 'off') %} {% if is_state('input_boolean.kallen_school_cancelled','on') %} "School is cancelled for today. " {% else %} @@ -91,7 +91,7 @@ There are only {{ states.sensor.spring_break_days2go.state }} days until Spring Break! {% endif %} - {% if is_state ('input_boolean.school_today', 'off') and is_state('sensor.pirateweather_icon', 'snow') %} + {% if is_state ('input_boolean.kallen_school_today', 'off') and is_state('sensor.pirateweather_icon', 'snow') %} Do you wanna build a snowman? It is snowing! {% endif %} diff --git a/templates/speech/kallen_school_status.yaml b/templates/speech/kallen_school_status.yaml index dd5ec38..5015d05 100644 --- a/templates/speech/kallen_school_status.yaml +++ b/templates/speech/kallen_school_status.yaml @@ -4,7 +4,7 @@

"Hello Collin, " - {% if is_state('input_boolean.school_today','on') %} + {% if is_state('input_boolean.kallen_school_today','on') %} {% if is_state('input_boolean.kallen_two_hour_delay','on') %} "You have school today, but there is currently a two hour delay. " {% else %} @@ -16,15 +16,15 @@ "You do not have school today. Enjoy your day off! " {% endif %} - {% if is_state('input_boolean.school_today','on') %} + {% 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 {{ (state_attr('input_datetime.school_day_start','timestamp') | int | timestamp_custom('%I:%M %p' , False)) }}. " - {% if is_state('input_boolean.school_early_release','on') %} + "Your school day will start at {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') | int | timestamp_custom('%I:%M %p' , False)) }}. " + {% if is_state('input_boolean.kallen_school_early_release','on') %} "There will be early dismissal today. " {% endif %} - "Your school day will end at {{(state_attr('input_datetime.school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + "Your school day will end at {{(state_attr('input_datetime.kallen_school_day_end', 'timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% endif %}

diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml index bfcef55..c6d9fa4 100644 --- a/templates/speech/morning_briefing.yaml +++ b/templates/speech/morning_briefing.yaml @@ -107,8 +107,8 @@

- {% if is_state('input_boolean.school_today','on') and is_state('input_boolean.work_today','on') %} - {% set diff = (state_attr('input_datetime.tina_workday_start','timestamp') - state_attr('input_datetime.school_day_start','timestamp')) %} + {% if is_state('input_boolean.kallen_school_today','on') and is_state('input_boolean.work_today','on') %} + {% set diff = (state_attr('input_datetime.tina_workday_start','timestamp') - state_attr('input_datetime.kallen_school_day_start','timestamp')) %} {%- if states.sensor.home_to_school.state|round > 12 %} Traffic to the school appears heavier than normal. {% else %} @@ -130,7 +130,7 @@ Traffic to Bob Evans is normal. {% endif %} Currently it will take {{states.sensor.home_to_bob_evans.state|round}} minutes to get to Bob Evans. - {% elif is_state('input_boolean.school_today','on') %} + {% elif is_state('input_boolean.kallen_school_today','on') %} {%- if states.sensor.home_to_school.state|round > 12 %} Traffic to the school appears heavier than normal. {% else %} diff --git a/templates/speech/welcome_home.yaml b/templates/speech/welcome_home.yaml index 7213fd5..a23cac3 100644 --- a/templates/speech/welcome_home.yaml +++ b/templates/speech/welcome_home.yaml @@ -22,10 +22,10 @@

- {% set endbefore = state_attr('input_datetime.school_day_end','timestamp') - 3600 %} - {% set endafter = state_attr('input_datetime.school_day_end','timestamp') + 3600 %} + {% set endbefore = state_attr('input_datetime.kallen_school_day_end','timestamp') - 3600 %} + {% set endafter = state_attr('input_datetime.kallen_school_day_end','timestamp') + 3600 %} {% set current = ((now().hour * 60 + now().minute) * 60 ) %} - {% if is_state('input_boolean.school_today_extended','on') and current > endbefore and current < endafter %} + {% if is_state('input_boolean.kallen_school_today_extended','on') and current > endbefore and current < endafter %} "Welcome home Collin as well, " {{ [ 'I hope you had a great day at school! ', @@ -151,8 +151,8 @@ "Tina has work today. " {% endif %} {% if is_state('input_boolean.kallen_at_school','on') %} - "Kallen is at school right now. His pickup time will be at {{ (state_attr('input_datetime.school_day_end','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_boolean.school_today','on') %} + "Kallen is at school right now. His pickup time will be at {{ (state_attr('input_datetime.kallen_school_day_end','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + {% elif is_state('input_boolean.kallen_school_today','on') %} "Kallen has school today. " {% endif %}