From 7459005500d90d05be5332cdd6651057fcdb9232 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Thu, 14 Nov 2024 16:25:39 -0500
Subject: [PATCH] Add morning announcements for K

---
 custom_templates/status.jinja          | 12 ++++++++++++
 packages/announcements.yaml            |  7 +++++++
 packages/scheduling.yaml               |  6 +-----
 templates/speech/morning_briefing.yaml |  6 +++++-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/custom_templates/status.jinja b/custom_templates/status.jinja
index 43f5b34..57c9637 100644
--- a/custom_templates/status.jinja
+++ b/custom_templates/status.jinja
@@ -13,9 +13,21 @@
 {% set houseEveningRan = is_state('input_boolean.house_scheduling_evening_ran','on') %}
 {% set masterBedroomEveningRan = is_state('input_boolean.master_bedroom_scheduling_evening_ran','on') %}
 {% set emmaEveningRan = is_state('input_boolean.emma_scheduling_evening_ran','on') %}
+{% set kallenMorningAnnc = is_state('input_boolean.kallen_morning_announcements','on') %}
 {% set kallenText = 'Kallen' %}
 {% set kallenTTS = 'Collin' %}
 
+{% macro morning_annc(type,method) %}
+{% if method == 'text' %}
+  {% set identKallen = kallenText %}
+{% elif method == 'tts' %}
+  {% set identKallen = kallenTTS %}
+{% endif %}
+{% if kallenMorningAnnc %}
+  First things first, we have some announcements for {{ identKallen }}. {{ states('input_text.kallen_morning_announcements') }}
+{% endif %}
+{% endmacro %}
+
 {% macro laundry_report(type,method) %}
   {% macro data() %}
   {% set washerTimer = states('timer.washer_timer') %}
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 7c3ed82..fb781d7 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -61,6 +61,10 @@ input_text:
     name: Kallen Briefing Extras
     icon: mdi:plus
     max: 255
+  kallen_morning_announcements:
+    name: Kallen Morning Announcements
+    icon: mdi:bullhorn
+    max: 255
 
 input_boolean:
   briefing_extras:
@@ -69,6 +73,9 @@ input_boolean:
   kallen_briefing_extras:
     name: Kallen Briefing Extras
     icon: mdi:plus
+  kallen_morning_announcements:
+    name: Kallen Morning Announcements
+    icon: mdi:bullhorn
   good_morning:
     name: Good Morning Ran
     icon: mdi:home-analytics
diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml
index 509214f..2fc7cdb 100644
--- a/packages/scheduling.yaml
+++ b/packages/scheduling.yaml
@@ -394,11 +394,7 @@ script:
               {% set kallenbriefing = state_attr('input_datetime.kallen_morning_briefing','timestamp') %}
               {% set kallenloc = states('input_select.kallen_morning_briefing_location') %}
               {% if is_state('input_boolean.kallen_school_today','on') %}
-                {% if is_state('input_boolean.two_hour_delay','on') %}
-                  9:20
-                {% else %}
-                  {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 2400) | timestamp_custom('%H:%M', false) }}
-                {% endif %}
+                {{ (state_attr('input_datetime.kallen_school_day_start','timestamp') - 3300) | timestamp_custom('%H:%M', false) }}
               {% 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 %}
                   {% if kallenloc == 'Common Areas' and kallenbriefing == 43200 %}
diff --git a/templates/speech/morning_briefing.yaml b/templates/speech/morning_briefing.yaml
index 7d00a59..a54f14f 100644
--- a/templates/speech/morning_briefing.yaml
+++ b/templates/speech/morning_briefing.yaml
@@ -3,7 +3,7 @@
   {% from 'formatting.jinja' import cleanup %}
   {%- macro getReport() -%}
   {% from 'speech.jinja' import greeting, dadjoke, inspirational_quote, today_is %}
-  {% from 'status.jinja' import tony_status_report, tina_status_report, kallen_status_report, emma_status_report %}
+  {% from 'status.jinja' import tony_status_report, tina_status_report, kallen_status_report, emma_status_report, morning_annc %}
   {% from 'easy_time.jinja' import count_the_days %}
   {% from 'weather.jinja' import weatherReport %}
   {% from 'sports.jinja' import sports_updates %}
@@ -14,6 +14,10 @@
       {{ today_is() }}
     </p>
 
+    <p>
+      {{ morning_annc('full','tts') }}
+    </p>
+
     <p>
       {{ weatherReport('full','tts','morning') }}
     </p>