Needed to import cleanup BEFORE the getReport macro

This commit is contained in:
2023-07-01 17:11:17 -04:00
parent 07b3f00dd1
commit befe962085
9 changed files with 9 additions and 9 deletions

View File

@ -1,7 +1,7 @@
> >
{# Birthdays #} {# Birthdays #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
<p> <p>
{{ [ {{ [
'Attention household, I am told that there is a birthday among us!', 'Attention household, I am told that there is a birthday among us!',

View File

@ -1,7 +1,7 @@
> >
{# Daily Briefing #} {# Daily Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'speech.jinja' import greeting, dadjoke, inspirational_quote %} {% from 'speech.jinja' import greeting, dadjoke, inspirational_quote %}
{% from 'status.jinja' import houseStatusReport, tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %} {% from 'status.jinja' import houseStatusReport, tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}
{% from 'easy_time.jinja' import count_the_days %} {% from 'easy_time.jinja' import count_the_days %}

View File

@ -1,7 +1,7 @@
> >
{# Kallen Morning Briefing #} {# Kallen Morning Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'time.jinja' import current_time, current_date_readout, input_datetime_read %} {% from 'time.jinja' import current_time, current_date_readout, input_datetime_read %}
{% from 'speech.jinja' import dadjoke, inspirational_quote %} {% from 'speech.jinja' import dadjoke, inspirational_quote %}
{% from 'easy_time.jinja' import count_the_days, custom_time %} {% from 'easy_time.jinja' import count_the_days, custom_time %}

View File

@ -1,7 +1,7 @@
> >
{# Kallen Nightly Briefing #} {# Kallen Nightly Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'speech.jinja' import dadjoke %} {% from 'speech.jinja' import dadjoke %}
{% from 'easy_time.jinja' import count_the_days, custom_time %} {% from 'easy_time.jinja' import count_the_days, custom_time %}
<p> <p>

View File

@ -1,7 +1,7 @@
> >
{# Kallen School Status #} {# Kallen School Status #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'time.jinja' import input_datetime_read %} {% from 'time.jinja' import input_datetime_read %}
<p> <p>
"Hello Collin, " "Hello Collin, "

View File

@ -1,7 +1,7 @@
> >
{# Morning Briefing #} {# Morning Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'speech.jinja' import greeting_nodate, dadjoke, inspirational_quote %} {% from 'speech.jinja' import greeting_nodate, dadjoke, inspirational_quote %}
{% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %} {% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}
{% from 'easy_time.jinja' import count_the_days %} {% from 'easy_time.jinja' import count_the_days %}

View File

@ -1,7 +1,7 @@
> >
{# Nightly Briefing #} {# Nightly Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'speech.jinja' import greeting, dadjoke, inspirational_quote %} {% from 'speech.jinja' import greeting, dadjoke, inspirational_quote %}
{% from 'time.jinja' import input_datetime_read, time_from_calendar, next_twitch_stream %} {% from 'time.jinja' import input_datetime_read, time_from_calendar, next_twitch_stream %}
{% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %} {% from 'status.jinja' import tonyStatusReport, tinaStatusReport, kallenStatusReport, emmaStatusReport %}

View File

@ -1,7 +1,7 @@
> >
{# Weather Briefing #} {# Weather Briefing #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
<p> <p>
{% if is_state('input_boolean.tornado_alarm','on') %} {% if is_state('input_boolean.tornado_alarm','on') %}

View File

@ -1,7 +1,7 @@
> >
{# Welcome Home #} {# Welcome Home #}
{%- macro getReport() -%}
{% from 'formatting.jinja' import cleanup %} {% from 'formatting.jinja' import cleanup %}
{%- macro getReport() -%}
{% from 'speech.jinja' import dadjoke %} {% from 'speech.jinja' import dadjoke %}
{% from 'time.jinja' import input_datetime_read %} {% from 'time.jinja' import input_datetime_read %}
{% from 'status.jinja' import emma_sleep %} {% from 'status.jinja' import emma_sleep %}