Various briefing tweaks and fixes

This commit is contained in:
2023-05-08 16:12:49 -04:00
parent 1d77b557ad
commit 772d3ae3e6
7 changed files with 22 additions and 25 deletions

View File

@ -3,7 +3,7 @@
{%- macro getReport() -%}
{% from 'time.jinja' import current_time_12hr, current_date_readout, input_datetime_12hr %}
{% from 'speech.jinja' import dadjoke, inspirational_quote %}
{% from 'easy_time.jinja' import count_the_days, speak_the_days %}
{% from 'easy_time.jinja' import count_the_day, custom_time %}
<p>
Good morning, Collin.
@ -138,7 +138,7 @@
'In case you were wondering.',
'Also, did you know.'
] | random }}
'Thanksgiving break starts {{ speak_the_days('input_datetime.thanksgiving_break_start') }}!'
'Thanksgiving break starts in {{ custom_time('input_datetime.thanksgiving_break_start','week,day') }}!'
{% endif %}
{% if (count_the_days('input_datetime.christmas_break_start') | int <= 14) and (count_the_days('input_datetime.christmas_break_start') | int > 0) %}
{{ [ 'Oh, and look at that.',
@ -146,7 +146,7 @@
'In case you were wondering.',
'Also, did you know.'
] | random }}
'Christmas break starts {{ speak_the_days('input_datetime.christmas_break_start') }}!'
'Christmas break starts in {{ custom_time('input_datetime.christmas_break_start','week,day') }}!'
{% endif %}
{% if (count_the_days('input_datetime.spring_break_start') | int <= 14) and (count_the_days('input_datetime.spring_break_start') | int > 0) %}
{{ [ 'Oh, and look at that.',
@ -154,7 +154,7 @@
'In case you were wondering.',
'Also, did you know.'
] | random }}
'Spring break starts in {{ speak_the_days('input_datetime.spring_break_start') }}!'
'Spring break starts in {{ custom_time('input_datetime.spring_break_start','week,day') }}!'
{% endif %}
{% if (count_the_days('input_datetime.school_last_day') | int < 35) and (count_the_days('input_datetime.school_last_day') | int > 0) -%}