Skip to content

Commit

Permalink
🔧 clean up of code in macros.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
@kernehed
kernehed committed Jan 30, 2020
1 parent 2f99c46 commit fabe500
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 34 deletions.
3 changes: 2 additions & 1 deletion automations/tts/lillhagsskolan_matsedel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,5 @@ action:
{% elif now().weekday() == 4 %}
{{ states('sensor.lillhagsskolan_lunch_fredag') }}
{% endif %}
call_inspirational_quote: 1
call_inspirational_quote: 1
call_evenice_skola: 1
7 changes: 4 additions & 3 deletions automations/tts/welcome_home.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ trigger:
- platform: state
entity_id:
- device_tracker.oskarstelefon
- device_tracker.iphone_7
- device_tracker.devices_bella
- group.devices_evenice
from: 'not_home'
to: 'home'
Expand All @@ -17,7 +17,7 @@ action:
- service: script.speech_engine
data_template:
personarriving: >-
{%- if trigger.entity_id == 'device_tracker.iphone_7' -%}
{%- if trigger.entity_id == 'device_tracker.devices_bella' -%}
{%- set person = "Bella" -%}
{%- elif trigger.entity_id == 'device_tracker.oskarstelefon' -%}
{%- set person = "Oskar" -%}
Expand Down Expand Up @@ -46,4 +46,5 @@ action:
{%- endmacro -%}
{{greeting_sentence(person)}}
call_responsibilities: 1
call_inspirational_quote: 1
call_inspirational_quote: 1
call_evenice_skola: 1
2 changes: 1 addition & 1 deletion lovelace/floorplan_entreplan.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ elements:
service: input_select.select_option
service_data:
entity_id: input_select.floorplan_floor
option: Övervåning
option: Källarplan
style:
top: 20%
left: 50%
Expand Down
2 changes: 1 addition & 1 deletion lovelace/floorplan_källarplan.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ elements:
service: input_select.select_option
service_data:
entity_id: input_select.floorplan_floor
option: Övervåning
option: Entréplan
style:
top: 20%
left: 56%
Expand Down
1 change: 0 additions & 1 deletion resources/bwalarm/bwalarm.json
View file

This file was deleted.

2 changes: 1 addition & 1 deletion resources/bwalarm/bwalarm_log.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[[1580221697.039766, "HA", 3, null], [1580223786.321581, "HA", 0, null], [1580279733.965339, "HA", 4, null], [1580314691.5783591, "HA", 1, null], [1580314718.7828116, "HA", 5, "binary_sensor.front_door_sensor"], [1580314744.0074632, "HA", 5, "binary_sensor.front_door_sensor"], [1580314756.543232, "HA", 1, null], [1580314759.6046984, "HA", 1, null], [1580314762.7775564, "HA", 0, null], [1580363162.663428, "HA", 4, null]]
[[1580223786.321581, "HA", 0, null], [1580279733.965339, "HA", 4, null], [1580314691.5783591, "HA", 1, null], [1580314718.7828116, "HA", 5, "binary_sensor.front_door_sensor"], [1580314744.0074632, "HA", 5, "binary_sensor.front_door_sensor"], [1580314756.543232, "HA", 1, null], [1580314759.6046984, "HA", 1, null], [1580314762.7775564, "HA", 0, null], [1580363162.663428, "HA", 4, null], [1580398985.658589, "HA", 0, null]]
67 changes: 41 additions & 26 deletions templates/speech/macros.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,68 +192,79 @@

{% if states.sensor.evenice_fodelsedag.state | int == 1 %}
Imorgon fyller Evenice {{ states.sensor.evenice_fodelsedag.attributes.years_at_next_anniversary }} år! Blir det någon tårta tror ni?
{% endif %}
{% if states.sensor.evenice_fodelsedag.state | int == 1 %}
{% elif states.sensor.evenice_fodelsedag.state | int < 20 %}
Se där, det är bara {{ states.sensor.evenice_fodelsedag.state }} dagar tills Evenice fyller {{ states.sensor.evenice_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.theus_fodelsedag.state | int == 1 %}
Imorgon fyller Theus {{ states.sensor.theus_fodelsedag.attributes.years_at_next_anniversary }} år! Blir det någon tårta tror ni?
{% endif %}
{% if states.sensor.evenice_fodelsedag.state | int == 1 %}
{% elif states.sensor.theus_fodelsedag.state | int < 20 %}
Se där, det är bara {{ states.sensor.theus_fodelsedag.state }} dagar tills Theus fyller {{ states.sensor.theus_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.bellas_fodelsedag.state | int == 1 %}
Imorgon fyller Bella {{ states.sensor.bellas_fodelsedag.attributes.years_at_next_anniversary }} år! Blir det någon tårta tror ni?
{% elif states.sensor.bellas_fodelsedag.state | int < 20 %}
Se där, det är bara {{ states.sensor.bellas_fodelsedag.state }} dagar tills Bella fyller {{ states.sensor.bellas_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.millas_fodelsedag.state | int == 1 %}
Imorgon fyller Milla {{ states.sensor.millas_fodelsedag.attributes.years_at_next_anniversary }} år! Blir det någon tårta tror ni?
{% endif %}
{% elif states.sensor.millas_fodelsedag.state | int < 20 %}
Se där, det är bara {{ states.sensor.millas_fodelsedag.state }} dagar tills Milla fyller {{ states.sensor.millas_fodelsedag.attributes.years_at_next_anniversary }} år! Voff Voff!
{% endif %}
{% if states.sensor.oskars_fodelsedag.state | int == 1 %}
Imorgon fyller Oskar {{ states.sensor.oskars_fodelsedag.attributes.years_at_next_anniversary }} år! Blir det någon tårta tror ni?
{% elif states.sensor.oskars_fodelsedag.state | int < 20 %}
Se där, det är bara {{ states.sensor.oskars_fodelsedag.state }} dagar tills Oskar fyller {{ states.sensor.oskar_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}

{% if states.sensor.evenice_fodelsedag.state | int == 120 %}
Det är bara hundra tjugo dagar kvar tills Evenice fyller {{ states.sensor.evenice_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.evenice_fodelsedag.state | int ==60 %}
{% if states.sensor.evenice_fodelsedag.state | int == 60 %}
Det är bara sextio dagar kvar tills Evenice fyller {{ states.sensor.evenice_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.evenice_fodelsedag.state | int ==20 %}
Det är bara tjugo dagar kvar tills Evenice fyller {{ states.sensor.evenice_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.theus_fodelsedag.state | int == 120 %}
Det är bara hundra tjugo dagar kvar tills Theus fyller {{ states.sensor.theus_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.theus_fodelsedag.state | int ==60 %}
{% if states.sensor.theus_fodelsedag.state | int == 60 %}
Det är bara sextio dagar kvar tills Theus fyller {{ states.sensor.theus_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.theus_fodelsedag.state | int ==20 %}
Det är bara tjugo dagar kvar tills Theus fyller {{ states.sensor.theus_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.millas_fodelsedag.state | int == 120 %}
Det är bara hundra tjugo dagar kvar tills Milla fyller {{ states.sensor.millas_fodelsedag.attributes.years_at_next_anniversary }} år! Voff Voff!
{% endif %}
{% if states.sensor.millas_fodelsedag.state | int ==60 %}
{% if states.sensor.millas_fodelsedag.state | int == 60 %}
Det är bara sextio dagar kvar tills Milla fyller {{ states.sensor.millas_fodelsedag.attributes.years_at_next_anniversary }} år! Voff Voff!
{% endif %}
{% if states.sensor.millas_fodelsedag.state | int ==20 %}
Det är bara tjugo dagar kvar tills Milla fyller {{ states.sensor.millas_fodelsedag.attributes.years_at_next_anniversary }} år! Voff Voff!
{% endif %}
{% if states.sensor.oskars_fodelsedag.state | int == 120 %}
Det är bara hundra tjugo dagar kvar tills Oskar fyller {{ states.sensor.oskars_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.oskars_fodelsedag.state | int ==60 %}
{% if states.sensor.oskars_fodelsedag.state | int == 60 %}
Det är bara sextio dagar kvar tills Oskar fyller {{ states.sensor.oskars_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.oskars_fodelsedag.state | int ==20 %}
Det är bara tjugo dagar kvar tills Oskar fyller {{ states.sensor.oskars_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.bellas_fodelsedag.state | int == 120 %}
Det är bara hundra tjugo dagar kvar tills Bella fyller {{ states.sensor.bellas_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.bellas_fodelsedag.state | int ==60 %}
{% if states.sensor.bellas_fodelsedag.state | int == 60 %}
Det är bara sextio dagar kvar tills Bella fyller {{ states.sensor.bellas_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{% if states.sensor.bellas_fodelsedag.state | int ==20 %}
Det är bara tjugo dagar kvar tills Bella fyller {{ states.sensor.bellas_fodelsedag.attributes.years_at_next_anniversary }} år! Woop Woop!
{% endif %}
{%- endmacro -%}


{%- macro evenice_skola() -%}
{% set weekday = ["Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"] %}
{% set day_of_the_week = weekday[now().isoweekday() ] %}
{% if day_of_the_week == 'Söndag' or day_of_the_week == 'Torsdag' %}
Imorgon skall Evenice ha gymnastik på skolan.
Glöm inte Handduk, t-shirt, gympabyxor, trosor, strumpor, gymnastikskor och vattenflaska.
{% endif %}
{% if day_of_the_week == 'Måndag' %}
Glöm inte att läsa i böckerna som Evenice fått i läxa.
{% endif %}
{% if day_of_the_week == 'Tisdag' %}
Glöm inte att läsa i böckerna som Evenice fått i läxa.
{% endif %}
{% if day_of_the_week == 'Onsdag' %}
Imorgon ska Evenice läsläxa in. Glöm inte att ta med boken.
{% endif %}
{%- endmacro -%}



Expand Down Expand Up @@ -315,6 +326,10 @@
{{ responsibilities() }}
{% endif %}

{% if call_evenice_skola == 1 %}
{{ evenice_skola() }}
{% endif %}

{% if call_time_with_screen == 1 %}
{{ time_with_screen() }}
{% endif %}
Expand Down

0 comments on commit fabe500

Please sign in to comment.