From 6027951c351dbc1df1938c6d099aa1b3218a8039 Mon Sep 17 00:00:00 2001 From: Sean Straus Date: Wed, 10 Jun 2020 13:56:00 +0000 Subject: [PATCH] Fixed some notification errors --- automations/appliance_automations.yaml | 15 ++-- automations/location_automations.yaml | 25 ++++--- automations/other_automations.yaml | 100 +++++++++++++++---------- automations/security_automations.yaml | 48 +++++++----- configuration.yaml | 39 +++++----- lovelace/Tab1_Home.yaml | 1 + lovelace/Tab1a_Home_Kiosk.yaml | 2 +- 7 files changed, 134 insertions(+), 96 deletions(-) diff --git a/automations/appliance_automations.yaml b/automations/appliance_automations.yaml index c3689e5..125bfa2 100755 --- a/automations/appliance_automations.yaml +++ b/automations/appliance_automations.yaml @@ -100,8 +100,9 @@ data: title: "Dishwasher Update" message: "Dishes Are Clean" - push: - thread-id: "appliances" + data: + push: + thread-id: "appliances" - id: fire_notify_clean_dishes @@ -376,8 +377,9 @@ data: title: "Miele Washing Machine Update" message: "Laundry is Done" - push: - thread-id: "appliances" + data: + push: + thread-id: "appliances" ################### LG WASHING MACHINE #################### @@ -499,8 +501,9 @@ data: title: "LG Washing Machine Update" message: "Laundry is Done" - push: - thread-id: "appliances" + data: + push: + thread-id: "appliances" diff --git a/automations/location_automations.yaml b/automations/location_automations.yaml index 4ce0eb3..9c0a3e8 100755 --- a/automations/location_automations.yaml +++ b/automations/location_automations.yaml @@ -600,8 +600,9 @@ data: title: "Alena Left Yoga" message: "Alena Left Yoga" - push: - thread-id: "location" + data: + push: + thread-id: "location" - id: alenas_home alias: 'Alena is Home' @@ -623,8 +624,9 @@ data: title: "Alena's Home" message: "Alena's Almost Arrived" - push: - thread-id: "location" + data: + push: + thread-id: "location" - id: traveling alias: 'Traveling' @@ -771,8 +773,9 @@ data: title: "Ferry Notification" message: "It's a good time to grab the ferry to work" - push: - thread-id: "location" + data: + push: + thread-id: "location" - alias: 'Good Time For Ferry from Work' initial_state: 'true' @@ -794,8 +797,9 @@ data: title: "Ferry Notification" message: "It's a good time to grab the ferry from work" - push: - thread-id: "location" + data: + push: + thread-id: "location" - id: alenas_home alias: 'Alena is Heading Home' @@ -815,8 +819,9 @@ data: title: "Alena's Heading Home" message: "Alena is Heading Home and should arrive in about {{ states('sensor.alena_driving_time_to_home') }} minutes if she's driving" - push: - thread-id: "location" + data: + push: + thread-id: "location" - id: traveling_2 alias: 'Traveling 2' diff --git a/automations/other_automations.yaml b/automations/other_automations.yaml index 9bb9be9..d3f8880 100755 --- a/automations/other_automations.yaml +++ b/automations/other_automations.yaml @@ -227,8 +227,9 @@ data: title: "Power is Out at Home" message: "There's been a power cut at home. Electricity is now off" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: power_restored alias: 'Power is restored' @@ -242,8 +243,9 @@ data: title: "Power Restored at Home" message: "Electricity has been powered back on at home" - push: - thread-id: "location" + data: + push: + thread-id: "location" - id: moldy_conditions alias: 'Moldy Conditions' @@ -257,8 +259,9 @@ data: title: "Mold Detector" message: "There are conditions for mold formation under the sink right now" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: internet_upload_limited alias: 'Internet Upload is Limited' @@ -271,8 +274,9 @@ data: title: "Internet is Severely Limited" message: "The upload speed of the internet is below 250kbit" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: internet_upload_normal alias: 'Internet Upload is Normal' @@ -285,8 +289,9 @@ data: title: "Internet is Normal" message: "The upload speed of the internet is above 1 mbit" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: sophie_up_late alias: 'Sophie up late' @@ -321,8 +326,9 @@ data: title: "Sophie is Up Late" message: "Sophie is Up Late" - push: - thread-id: "info" + data: + push: + thread-id: "info" # - condition: time # after: '21:30:00' @@ -389,8 +395,9 @@ data: title: "Bio Odpad Tomorrow" message: "Bio odpad should be taken out tonight or tomorrow for collection on {% if now().weekday() in (5,) %}Monday{% elif now().weekday() in (6,) %}Tuesday{% elif now().weekday() in (0,) %}Wednesday{% elif now().weekday() in (1,) %}Thursday{% elif now().weekday() in (2,) %}Friday{% elif now().weekday() in (3,) %}Saturday{% elif now().weekday() in (4,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: bio_odpad_day_tomorrow_alena alias: 'Bio Odpad Day' @@ -409,8 +416,9 @@ data: title: "Bio Odpad Tomorrow" message: "Bio odpad should be taken out today or tomorrow for collection on {% if now().weekday() in (5,) %}Monday{% elif now().weekday() in (6,) %}Tuesday{% elif now().weekday() in (0,) %}Wednesday{% elif now().weekday() in (1,) %}Thursday{% elif now().weekday() in (2,) %}Friday{% elif now().weekday() in (3,) %}Saturday{% elif now().weekday() in (4,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: trash_day_tomorrow_sean alias: 'Trash Day' @@ -431,8 +439,9 @@ data: title: "Trash Tomorrow" message: "Trash should be taken out tonight or tomorrow for collection on {% if now().weekday() in (5,) %}Monday{% elif now().weekday() in (6,) %}Tuesday{% elif now().weekday() in (0,) %}Wednesday{% elif now().weekday() in (1,) %}Thursday{% elif now().weekday() in (2,) %}Friday{% elif now().weekday() in (3,) %}Saturday{% elif now().weekday() in (4,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: trash_day_tomorrow_alena alias: 'Trash Day' @@ -451,8 +460,9 @@ data: title: "Trash Tomorrow" message: "Trash should be taken out today or tomorrow for collection on {% if now().weekday() in (5,) %}Monday{% elif now().weekday() in (6,) %}Tuesday{% elif now().weekday() in (0,) %}Wednesday{% elif now().weekday() in (1,) %}Thursday{% elif now().weekday() in (2,) %}Friday{% elif now().weekday() in (3,) %}Saturday{% elif now().weekday() in (4,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: bio_odpad_day_today_sean alias: 'Bio Odpad Day' @@ -473,8 +483,9 @@ data: title: "Bio Odpad Today" message: "Bio odpad should be taken out tonight for collection on {% if now().weekday() in (6,) %}Monday{% elif now().weekday() in (0,) %}Tuesday{% elif now().weekday() in (1,) %}Wednesday{% elif now().weekday() in (2,) %}Thursday{% elif now().weekday() in (3,) %}Friday{% elif now().weekday() in (4,) %}Saturday{% elif now().weekday() in (5,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: bio_odpad_day_today_alena alias: 'Bio Odpad Day' @@ -493,8 +504,9 @@ data: title: "Bio Odpad Today" message: "Bio odpad should be taken out today for collection on {% if now().weekday() in (6,) %}Monday{% elif now().weekday() in (0,) %}Tuesday{% elif now().weekday() in (1,) %}Wednesday{% elif now().weekday() in (2,) %}Thursday{% elif now().weekday() in (3,) %}Friday{% elif now().weekday() in (4,) %}Saturday{% elif now().weekday() in (5,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: trash_day_today_sean @@ -520,8 +532,9 @@ data: title: "Trash Day Today" message: "Trash should be taken out tonight for collection on {% if now().weekday() in (6,) %}Monday{% elif now().weekday() in (0,) %}Tuesday{% elif now().weekday() in (1,) %}Wednesday{% elif now().weekday() in (2,) %}Thursday{% elif now().weekday() in (3,) %}Friday{% elif now().weekday() in (4,) %}Saturday{% elif now().weekday() in (5,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: trash_day_today_alena alias: 'Trash Day' @@ -540,8 +553,9 @@ data: title: "Trash Day Today" message: "Trash should be taken out today for collection on {% if now().weekday() in (6,) %}Monday{% elif now().weekday() in (0,) %}Tuesday{% elif now().weekday() in (1,) %}Wednesday{% elif now().weekday() in (2,) %}Thursday{% elif now().weekday() in (3,) %}Friday{% elif now().weekday() in (4,) %}Saturday{% elif now().weekday() in (5,) %}Sunday{% endif %} Morning" - push: - thread-id: "info" + data: + push: + thread-id: "info" - alias: 'update_bio_odpad_sensor' trigger: @@ -593,8 +607,9 @@ data: title: "Basement Flooding" message: "The basement is flooding" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: basement_flooding_2 alias: 'Basement Flooding 2' @@ -611,8 +626,9 @@ data: title: "Basement Flooding" message: "The basement is flooding" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: automatic_theme_change alias: Automatic Theme Change @@ -739,8 +755,9 @@ data: title: "State Holiday Coming Up" message: "In one week, it is {{ states('sensor.czech_holidays_event_0')}}" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: state_holiday_tomorrow alias: 'Notify - 1 Day to State Holiday' @@ -756,8 +773,9 @@ data: title: "State Holiday Coming Up" message: "Tomorrow it is {{ states('sensor.czech_holidays_event_0')}}" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: state_holiday_today alias: 'Notify - Today is State Holiday' @@ -773,8 +791,9 @@ data: title: "State Holiday Today" message: "Today it is {{ states('sensor.czech_holidays_event_0')}}, you don't need to go to work!" - push: - thread-id: "info" + data: + push: + thread-id: "info" - id: mini_countryman_clima_on alias: 'Turn on Car Clima' @@ -902,8 +921,9 @@ data: title: "RAID Warning" message: "The RAID Array on Narnia is Degraded" - push: - thread-id: "error" + data: + push: + thread-id: "error" - id: run_speedtest alias: run_speedtest diff --git a/automations/security_automations.yaml b/automations/security_automations.yaml index 2c84965..de0a794 100755 --- a/automations/security_automations.yaml +++ b/automations/security_automations.yaml @@ -41,6 +41,7 @@ category: camera thread-id: "security" entity_id: camera.front_last_person + clickAction: '/lovelace/4' # - condition: template # value_template: "{{ states.sensor.alarm_state_3_motion_sensors.state in ['armed_away', 'triggered'] }}" @@ -88,8 +89,7 @@ category: camera thread-id: "security" entity_id: camera.back_last_person - - + clickAction: '/lovelace/4' - id: person_on_left alias: Person On Left @@ -133,6 +133,7 @@ category: camera thread-id: "security" entity_id: camera.left_last_person + clickAction: '/lovelace/4' - id: person_on_right alias: Person On Right @@ -176,8 +177,7 @@ category: camera thread-id: "security" entity_id: camera.right_last_person - title: hello - + clickAction: '/lovelace/4' #- id: person_in_front_hassbian # alias: Person In Front @@ -421,8 +421,9 @@ data: title: "Warning: Alarm On" message: "The alarm is turned on. Remember to turn it off before opening the door." - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_is_on_sean_home alias: 'Alarm is on - Sean is home' @@ -440,8 +441,9 @@ data: title: "Warning: Alarm On" message: "The alarm is turned on. Remember to turn it off before opening the door." - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_turned_on_alena alias: 'Alarm turned on notification - Alena' @@ -458,8 +460,9 @@ data: title: "Alarm is On At Home" message: "The alarm has been activated at home" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_turned_off_alena alias: 'Alarm turned off notification - Alena' @@ -478,8 +481,9 @@ data: title: "Alarm is Off At Home" message: "The alarm has been turned off at home" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_turned_on_sean alias: 'Alarm turned on notification - Sean' @@ -499,8 +503,9 @@ data: title: "Alarm is On At Home" message: "The alarm has been activated at home" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_turned_off_sean alias: 'Alarm turned off notification - Sean' @@ -519,8 +524,9 @@ data: title: "Alarm is Off At Home" message: "The alarm has been turned off at home" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: alarm_triggered alias: 'Alarm is triggered' @@ -540,8 +546,9 @@ data: title: "!!Alarm Triggered!!" message: "The alarm at home has been triggered and is now alarming!" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: sensor_notification alias: 'Sensor Notification' @@ -570,8 +577,9 @@ data: title: "Activity Notification" message: "Activity Notification" - push: - thread-id: "security" + data: + push: + thread-id: "security" - id: popup_on_kiosk_back alias: 'Popup on Kiosk Back' diff --git a/configuration.yaml b/configuration.yaml index 2980bc5..4f2984c 100755 --- a/configuration.yaml +++ b/configuration.yaml @@ -1365,7 +1365,7 @@ alert: push: sound: name: "EN-US-Daisy-Garage-Door-Open.wav" -# thread-id: "info" + thread-id: "info" notifiers: - mobile_app_alena_s_iphone @@ -1383,9 +1383,9 @@ alert: skip_first: true data: push: -# thread-id: "info" sound: name: "EN-US-Daisy-Garage-Door-Open.wav" + thread-id: "info" notifiers: - mobile_app_sean_s_iphone_x # entity_id: binary_sensor.garage_door_zone_14 @@ -1405,7 +1405,7 @@ alert: push: sound: name: "EN-US-Daisy-Front-Door-Open.wav" -# thread-id: "info" + thread-id: "info" notifiers: - mobile_app_alena_s_iphone @@ -1424,7 +1424,7 @@ alert: push: sound: name: "EN-US-Daisy-Front-Door-Open.wav" -# thread-id: "info" + thread-id: "info" notifiers: - mobile_app_sean_s_iphone_x @@ -1442,9 +1442,9 @@ alert: skip_first: true notifiers: - mobile_app_alena_s_iphone -# data: -# push: -# thread-id: "weather" + data: + push: + thread-id: "weather" sebastian_window_rain_warning_sean: name: Sebastian's room window is open and it might rain. @@ -1460,9 +1460,9 @@ alert: skip_first: true notifiers: - mobile_app_sean_s_iphone_x -# data: -# push: -# thread-id: "weather" + data: + push: + thread-id: "weather" sophies_window_rain_warning_alena: name: Sophie's room window is open and it might rain. @@ -1478,9 +1478,9 @@ alert: skip_first: true notifiers: - mobile_app_alena_s_iphone -# data: -# push: -# thread-id: "weather" + data: + push: + thread-id: "weather" sophies_window_rain_warning_sean: name: Sophie's room window is open and it might rain. @@ -1496,9 +1496,9 @@ alert: skip_first: true notifiers: - mobile_app_sean_s_iphone_x -# data: -# push: -# thread-id: "weather" + data: + push: + thread-id: "weather" trash_needs_to_be_taken_out: name: "It's trash day and the trash still needs to be taken out!" @@ -1511,11 +1511,12 @@ alert: notifiers: - mobile_app_sean_s_iphone_x data: - title: "The trash Needs to be Taken Out" - message: "It's trash day and the trash still needs to be taken out!" push: category: "trash" -# thread-id: "info" + thread-id: "info" + +# title: "The trash Needs to be Taken Out" +# message: "It's trash day and the trash still needs to be taken out!" input_number: living_room_last_temp: diff --git a/lovelace/Tab1_Home.yaml b/lovelace/Tab1_Home.yaml index daf1efa..fd274df 100755 --- a/lovelace/Tab1_Home.yaml +++ b/lovelace/Tab1_Home.yaml @@ -465,6 +465,7 @@ cards: numberOfDays: 3 hidePastEvents: true hideHeader: true + timeFormat: 'hh:mm a' # type: conditional diff --git a/lovelace/Tab1a_Home_Kiosk.yaml b/lovelace/Tab1a_Home_Kiosk.yaml index bd1b078..822ea88 100755 --- a/lovelace/Tab1a_Home_Kiosk.yaml +++ b/lovelace/Tab1a_Home_Kiosk.yaml @@ -476,7 +476,7 @@ cards: numberOfDays: 3 hidePastEvents: true hideHeader: true - + timeFormat: 'hh:mm a' - type: custom:vertical-stack-in-card cards: