Improve K's med report macros

This commit is contained in:
2023-05-11 13:43:38 -04:00
parent 1f638b611e
commit e3b3f0ee80

View File

@ -83,6 +83,9 @@
{% macro kallen_morning_meds() %} {% macro kallen_morning_meds() %}
{% from 'time.jinja' import input_datetime_12hr, input_datetime_12hr_with_date, ct %} {% from 'time.jinja' import input_datetime_12hr, input_datetime_12hr_with_date, ct %}
{% set ct = ct() | int %} {% set ct = ct() | int %}
{% set wakeup = state_attr('input_datetime.kallen_wakeup_time','timestamp') | int %}
{% set bedtime = state_attr('input_datetime.kallen_bedtime','timestamp') | int %}
{% if wakeup <= ct <= bedtime %}
{% if is_state('input_boolean.kallen_morning_meds_taken','on') %} {% if is_state('input_boolean.kallen_morning_meds_taken','on') %}
Kallen took his morning meds at {{ input_datetime_12hr_with_date('input_datetime.kallen_morning_meds_taken') }} today. Kallen took his morning meds at {{ input_datetime_12hr_with_date('input_datetime.kallen_morning_meds_taken') }} today.
{% else %} {% else %}
@ -96,14 +99,19 @@
There are no further notifications scheduled for him today. There are no further notifications scheduled for him today.
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endif %}
{% endmacro %} {% endmacro %}
{% macro kallen_night_meds() %} {% macro kallen_night_meds() %}
{% from 'time.jinja' import input_datetime_12hr, input_datetime_12hr_with_date, ct %} {% from 'time.jinja' import input_datetime_12hr, input_datetime_12hr_with_date, ct %}
{% set ct = ct() | int %} {% set ct = ct() | int %}
{% set diff = state_attr('input_datetime.kallen_bedtime','timestamp') | int - ct %} {% set diff = state_attr('input_datetime.kallen_bedtime','timestamp') | int - ct %}
{% set wakeup = state_attr('input_datetime.kallen_wakeup_time','timestamp') | int %}
{% set bedtime = state_attr('input_datetime.kallen_bedtime','timestamp') | int - 900 %}
{% if is_state('input_boolean.kallen_night_meds_taken','on') %} {% if is_state('input_boolean.kallen_night_meds_taken','on') %}
{% if bedtime <= ct <= wakeup %}
Kallen took his night meds at {{ input_datetime_12hr_with_date('input_datetime.kallen_night_meds_taken') }} today. Kallen took his night meds at {{ input_datetime_12hr_with_date('input_datetime.kallen_night_meds_taken') }} today.
{% endif %}
{% else %} {% else %}
{% if diff <= 3600 %} {% if diff <= 3600 %}
Kallen has not taken his night meds. Kallen has not taken his night meds.