diff --git a/custom_templates/time.jinja b/custom_templates/time.jinja index f4822c7..3b6f891 100644 --- a/custom_templates/time.jinja +++ b/custom_templates/time.jinja @@ -24,4 +24,8 @@ {% macro read_time_from_calendar(calendar,start_or_end) %} {{ as_timestamp(strptime(state_attr(calendar,start_or_end), '%Y-%m-%d %H:%M:%S')) | timestamp_custom("%I:%M %p") }} +{% endmacro %} + +{% macro ct() %} +{{ ((now().hour * 60 + now().minute) * 60 ) }} {% endmacro %} \ No newline at end of file diff --git a/packages/kallen.yaml b/packages/kallen.yaml index 1650ede..1159fdf 100644 --- a/packages/kallen.yaml +++ b/packages/kallen.yaml @@ -183,7 +183,8 @@ script: - if: - condition: template value_template: > - {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} + {% from 'time.jinja' import ct %} + {% set ct = ct() | int %} {{ ct >= state_attr('input_datetime.kallen_bedtime','timestamp') }} then: - service: script.speech_engine @@ -209,7 +210,8 @@ script: - if: - condition: template value_template: > - {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} + {% from 'time.jinja' import ct %} + {% set ct = ct() | int %} {{ ct >= state_attr('input_datetime.kallen_bedtime','timestamp') }} then: - service: script.speech_engine @@ -229,7 +231,8 @@ script: - if: - condition: template value_template: > - {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} + {% from 'time.jinja' import ct %} + {% set ct = ct() | int %} {{ ct >= state_attr('input_datetime.kallen_bedtime','timestamp') }} then: - service: script.speech_engine diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index 17921b1..5b408f7 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -621,7 +621,8 @@ script: entity_id: input_datetime.morning_alarm_disarm data: time: > - {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} + {% from 'time.jinja' import ct %} + {% set ct = ct() | int %} {% 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) }} @@ -643,7 +644,8 @@ script: entity_id: input_datetime.morning_alarm_rearm data: time: > - {% set ct = ((now().hour * 60 + now().minute) * 60 ) %} + {% from 'time.jinja' import ct %} + {% set ct = ct() | int %} {% 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.kallen_school_today','on') and is_state('input_boolean.work_today','off') %}