Refactored the notifications to use latest IOS. #1367

Updated Holiday json file to 2030. #17
removed time date sensors that I was using for floorplan. closes #404
2023-11-18 22:46:51 +00:00 · 2023-11-18 18:29:27 +00:00 · 2023-11-18 17:40:00 +00:00
7 changed files with 242 additions and 266 deletions
--- a/config/json_data/holidays.json
+++ b/config/json_data/holidays.json
@ -1,119 +1,116 @@
 {
-  "MAJOR_US": {
-    "static": {
-      "1/1": "New Years Day",
-      "2/2": "Groundhog Day",
-      "2/3": "Staceys Birthday",
-      "2/14": "Valentines Day",
-      "3/14": "Pi Day",
-      "3/17": "St. Patricks Day",
-      "3/26": "Justins Birthday",
-      "4/1": "April Fools Day",
-      "4/22": "Earth Day",
-      "5/4": "Star Wars Day",
-      "5/5": "Cinco de Mayo",
-      "7/4": "Independence Day",
-      "8/30": "Paiges Birthday",
-      "9/10": "Mom and Dads Wedding Anniverary",
-      "9/11": "Patriot Day",
-      "10/31": "Halloween",
-      "11/11": "Veterans Day",
-      "11/16": "Carlos Birthday",
-      "12/7": "Pearl Harbor Day",
-      "12/24": "Christmas Eve",
-      "12/25": "Christmas Day",
-      "12/31": "New Years Eve"
-    },
-    "dynamic": {
-      "1/21/2019": "MLK Day",
-      "1/20/2020": "MLK Day",
-      "1/18/2021": "MLK Day",
-      "1/17/2022": "MLK Day",
-      "1/16/2023": "MLK Day",
-      "1/15/2024": "MLK Day",
-      "1/20/2025": "MLK Day",
-      "2/18/2019": "Presidents' Day",
-      "2/17/2020": "Presidents' Day",
-      "2/15/2021": "Presidents' Day",
-      "2/20/2022": "Presidents' Day",
-      "2/19/2023": "Presidents' Day",
-      "2/18/2024": "Presidents' Day",
-      "2/17/2025": "Presidents' Day",
-      "3/6/2019": "Ash Wednesday",
-      "2/26/2020": "Ash Wednesday",
-      "2/17/2021": "Ash Wednesday",
-      "3/2/2022": "Ash Wednesday",
-      "2/22/2023": "Ash Wednesday",
-      "2/14/2024": "Ash Wednesday",
-      "3/5/2025": "Ash Wednesday",
-      "4/14/2019": "Palm Sunday",
-      "4/5/2020": "Palm Sunday",
-      "3/28/2021": "Palm Sunday",
-      "4/10/2022": "Palm Sunday",
-      "4/2/2023": "Palm Sunday",
-      "3/24/2024": "Palm Sunday",
-      "4/13/2025": "Palm Sunday",
-      "4/19/2019": "Good Friday",
-      "4/10/2020": "Good Friday",
-      "4/2/2021": "Good Friday",
-      "4/15/2022": "Good Friday",
-      "4/7/2023": "Good Friday",
-      "3/29/2024": "Good Friday",
-      "4/18/2025": "Good Friday",
-      "4/21/2019": "Easter Sunday",
-      "4/12/2020": "Easter Sunday",
-      "4/4/2021": "Easter Sunday",
-      "4/17/2022": "Easter Sunday",
-      "4/9/2023": "Easter Sunday",
-      "3/31/2024": "Easter Sunday",
-      "4/20/2025": "Easter Sunday",
-      "5/12/2019": "Mother's Day",
-      "5/10/2020": "Mother's Day",
-      "5/9/2021": "Mother's Day",
-      "5/8/2022": "Mother's Day",
-      "5/14/2023": "Mother's Day",
-      "5/12/2024": "Mother's Day",
-      "5/11/2025": "Mother's Day",
-      "5/28/2018": "Memorial Day",
-      "5/27/2019": "Memorial Day",
-      "5/25/2020": "Memorial Day",
-      "5/31/2021": "Memorial Day",
-      "5/30/2022": "Memorial Day",
-      "5/29/2023": "Memorial Day",
-      "5/27/2024": "Memorial Day",
-      "5/26/2025": "Memorial Day",
-      "6/17/2018": "Father's Day",
-      "6/16/2019": "Father's Day",
-      "6/21/2020": "Father's Day",
-      "6/20/2021": "Father's Day",
-      "6/19/2022": "Father's Day",
-      "6/18/2023": "Father's Day",
-      "6/16/2024": "Father's Day",
-      "6/15/2025": "Father's Day",
-      "9/3/2018": "Labor Day",
-      "9/2/2019": "Labor Day",
-      "9/7/2020": "Labor Day",
-      "9/6/2021": "Labor Day",
-      "9/5/2022": "Labor Day",
-      "9/4/2023": "Labor Day",
-      "9/2/2024": "Labor Day",
-      "9/1/2025": "Labor Day",
-      "10/8/2018": "Columbus Day",
-      "10/14/2019": "Columbus Day",
-      "10/12/2020": "Columbus Day",
-      "10/11/2021": "Columbus Day",
-      "10/10/2022": "Columbus Day",
-      "10/9/2023": "Columbus Day",
-      "10/14/2024": "Columbus Day",
-      "10/13/2025": "Columbus Day",
-      "11/22/2018": "Thanksgiving Day",
-      "11/28/2019": "Thanksgiving Day",
-      "11/26/2020": "Thanksgiving Day",
-      "11/25/2021": "Thanksgiving Day",
-      "11/24/2022": "Thanksgiving Day",
-      "11/23/2023": "Thanksgiving Day",
-      "11/28/2024": "Thanksgiving Day",
-      "11/27/2025": "Thanksgiving Day"
+    "MAJOR_US": {
+        "static": {
+            "1/1": "New Years Day",
+            "2/2": "Groundhog Day",
+            "2/3": "Staceys Birthday",
+            "2/14": "Valentines Day",
+            "3/14": "Pi Day",
+            "3/17": "St. Patricks Day",
+            "3/26": "Justins Birthday",
+            "4/1": "April Fools Day",
+            "4/22": "Earth Day",
+            "5/4": "Star Wars Day",
+            "5/5": "Cinco de Mayo",
+            "6/14": "Flag Day",
+            "7/4": "Independence Day",
+            "8/30": "Paiges Birthday",
+            "9/10": "Mom and Dads Wedding Anniversary",
+            "9/11": "Patriot Day",
+            "10/31": "Halloween",
+            "11/11": "Veterans Day",
+            "11/16": "Carlos Birthday",
+            "12/7": "Pearl Harbor Day",
+            "12/24": "Christmas Eve",
+            "12/25": "Christmas Day",
+            "12/31": "New Years Eve"
+        },
+        "dynamic": {
+            "11/23/2023": "Thanksgiving Day",
+            "01/15/2024": "MLK Day",
+            "02/14/2024": "Ash Wednesday",
+            "02/19/2024": "Presidents Day",
+            "03/24/2024": "Palm Sunday",
+            "03/29/2024": "Good Friday",
+            "03/31/2024": "Easter Sunday",
+            "04/22/2024": "Memorial Day",
+            "05/12/2024": "Mothers Day",
+            "06/16/2024": "Fathers Day",
+            "09/02/2024": "Labor Day",
+            "10/14/2024": "Columbus Day",
+            "11/28/2024": "Thanksgiving Day",
+            "01/20/2025": "MLK Day",
+            "02/17/2025": "Presidents Day",
+            "03/05/2025": "Ash Wednesday",
+            "04/13/2025": "Palm Sunday",
+            "04/18/2025": "Good Friday",
+            "04/20/2025": "Easter Sunday",
+            "04/21/2025": "Memorial Day",
+            "05/11/2025": "Mothers Day",
+            "06/15/2025": "Fathers Day",
+            "09/01/2025": "Labor Day",
+            "10/13/2025": "Columbus Day",
+            "11/27/2025": "Thanksgiving Day",
+            "01/19/2026": "MLK Day",
+            "02/16/2026": "Presidents Day",
+            "02/18/2026": "Ash Wednesday",
+            "03/29/2026": "Palm Sunday",
+            "04/03/2026": "Good Friday",
+            "04/05/2026": "Easter Sunday",
+            "04/20/2026": "Memorial Day",
+            "05/10/2026": "Mothers Day",
+            "06/21/2026": "Fathers Day",
+            "09/07/2026": "Labor Day",
+            "10/12/2026": "Columbus Day",
+            "11/26/2026": "Thanksgiving Day",
+            "01/18/2027": "MLK Day",
+            "02/10/2027": "Ash Wednesday",
+            "02/15/2027": "Presidents Day",
+            "03/21/2027": "Palm Sunday",
+            "03/26/2027": "Good Friday",
+            "03/28/2027": "Easter Sunday",
+            "04/19/2027": "Memorial Day",
+            "05/09/2027": "Mothers Day",
+            "06/20/2027": "Fathers Day",
+            "09/06/2027": "Labor Day",
+            "10/11/2027": "Columbus Day",
+            "11/25/2027": "Thanksgiving Day",
+            "01/17/2028": "MLK Day",
+            "02/21/2028": "Presidents Day",
+            "03/01/2028": "Ash Wednesday",
+            "04/09/2028": "Palm Sunday",
+            "04/14/2028": "Good Friday",
+            "04/16/2028": "Easter Sunday",
+            "04/17/2028": "Memorial Day",
+            "05/14/2028": "Mothers Day",
+            "06/18/2028": "Fathers Day",
+            "09/04/2028": "Labor Day",
+            "10/09/2028": "Columbus Day",
+            "11/23/2028": "Thanksgiving Day",
+            "01/15/2029": "MLK Day",
+            "02/14/2029": "Ash Wednesday",
+            "02/19/2029": "Presidents Day",
+            "03/25/2029": "Palm Sunday",
+            "03/30/2029": "Good Friday",
+            "04/01/2029": "Easter Sunday",
+            "04/23/2029": "Memorial Day",
+            "05/13/2029": "Mothers Day",
+            "06/17/2029": "Fathers Day",
+            "09/03/2029": "Labor Day",
+            "10/08/2029": "Columbus Day",
+            "11/22/2029": "Thanksgiving Day",
+            "01/21/2030": "MLK Day",
+            "02/18/2030": "Presidents Day",
+            "03/06/2030": "Ash Wednesday",
+            "04/14/2030": "Palm Sunday",
+            "04/19/2030": "Good Friday",
+            "04/21/2030": "Easter Sunday",
+            "04/22/2030": "Memorial Day",
+            "05/12/2030": "Mothers Day",
+            "06/16/2030": "Fathers Day",
+            "09/02/2030": "Labor Day",
+            "10/14/2030": "Columbus Day",
+            "11/28/2030": "Thanksgiving Day"
+        }
    }
-  }
 }
--- a/config/packages/floorplan.yaml.DISABLED
+++ b/config/packages/floorplan.yaml.DISABLED
@ -46,3 +46,40 @@ binary_sensor:
    name: Bedroom Plugged
    retain: true
    
+#---Sensor for Time and Date.-----------------------------
+sensor:
+  - platform: template
+    scan_interval: 30000
+    sensors:
+      floorplan_date:
+        friendly_name: 'Date'
+        value_template: >-
+          {{now().strftime("%A")}}, {{now().strftime("%B")}} {{now().strftime("%d")}}
+
+  - platform: template
+    scan_interval: 60
+    sensors:
+      floorplan_time:
+        friendly_name: 'Time'
+        value_template: >-
+          {{now().strftime("%-I")}}:{{now().strftime("%M")}} {{now().strftime("%p")}}
+      clock_time:
+        friendly_name: 'Clock Time'
+        value_template: >-
+          {{now().strftime("%-I")}}:{{now().strftime("%M")}}
+
+  - platform: template
+    scan_interval: 30000
+    sensors:
+      clock_am_pm:
+        friendly_name: 'AM/PM'
+        value_template: >-
+          {{now().strftime("%p")}}
+      clock_day:
+        friendly_name: 'Day'
+        value_template: >-
+          {{now().strftime("%A")}}
+      clock_date:
+        friendly_name: 'Clock Date'
+        value_template: >-
+          {{now().strftime("%B")}} {{now().strftime("%d")}} {{now().year}}
--- a/config/packages/holiday.yaml
+++ b/config/packages/holiday.yaml
@ -1,9 +1,4 @@
 ###############################################################################
-#   @author         :   Mahasri Kalavala
-#   @date           :   10/28/2017
-#   @package        :   Holidays
-#   @description    :   Retrieves the holiday
-###############################################################################
 #-------------------------------------------
 # Holiday Package
 # @CCOSTAN
@ -60,7 +55,7 @@ sensor:
      {% endfor -%}

 ################################################################################
-# Countdown Sesor using WolfRam Alpha Natural language queries
+# Countdown Sensor using WolfRam Alpha Natural language queries
 ################################################################################

  - platform: rest
--- a/config/packages/ios.yaml
+++ b/config/packages/ios.yaml
@ -22,80 +22,3 @@ notify:

 mobile_app:

-## - Reminders to take my medicine
-input_boolean:
-  medicine:
-    name: Medicine Reminder
-    initial: off
-    icon: mdi:tablet
-
-automation:
-  - alias: Medicine Reminder
-    id: 78c47087-8242-470c-97d1-3dc5747ed576
-    initial_state: true
-    trigger:
-      - platform: time_pattern
-        minutes: '/45'
-      - platform: time
-        at: '21:30:00'
-      - platform: state
-        entity_id: person.carlo
-        to: 'home'
-
-    condition:
-      - condition: time
-        after: '21:30:00'
-      - condition: state
-        entity_id: person.carlo
-        state: 'home'
-      - condition: state
-        entity_id: input_boolean.medicine
-        state: 'off'
-
-    action:
-      - service: script.notify_engine_two_button
-        data:
-          title: 'Medicine Alert!'
-          value1: 'Please take your Medicine!'
-          title1: 'Took Medicine'
-          action1: 'TABLET_TAKEN'
-          icon1: 'sfsymbols:arrow.up.circle'
-          who: "carlo"
-          group: 'Medicine'
-
-  - alias: Tablet Already taken
-    id: 1f295bb8-8925-4b22-8f75-9fe079b295a8
-    trigger:
-      platform: event
-      event_type: mobile_app_notification_action
-      event_data:
-        action: TABLET_TAKEN
-    action:
-      - service: input_boolean.turn_on
-        entity_id: input_boolean.medicine
-
-  # - alias: Remind Me Later
-  #   id: 79b49c85-f832-47d7-b02d-bff099ef6fbc
-  #   trigger:
-  #     platform: event
-  #     event_type: mobile_app_notification_action
-  #     event_data:
-  #       action: NOT_HOME
-  #   action:
-  #     - service: script.notify_engine_two_button
-  #       data:
-  #         title: 'Medicine Reminder'
-  #         value1: 'Ok. I will remind you when you get home.'
-  #         who: 'carlo'
-  #         group: 'Medicine'
-  #     - wait_template: >-
-  #         {{ states.person.carlo.state == 'home' }}
-  #     - service: script.notify_engine_two_button
-  #       data:
-  #         title: 'Medicine Reminder'
-  #         value1: 'Now that your home, please take your medicine!'
-  #         who: 'carlo'
-  #         group: 'Medicine'
-
-
-## Reminders to take my Medicine! - End.
--- a/config/packages/medicine.yaml
+++ b/config/packages/medicine.yaml
@ -0,0 +1,85 @@
+######################################################################
+#-------------------------------------------
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
+# ## - Reminders to take my medicine
+#-------------------------------------------
+######################################################################
+
+
+input_boolean:
+  medicine:
+    name: Medicine Reminder
+    initial: off
+    icon: mdi:tablet
+
+automation:
+  - alias: Medicine Reminder
+    id: 78c47087-8242-470c-97d1-3dc5747ed576
+    initial_state: true
+    trigger:
+      - platform: time_pattern
+        minutes: '/45'
+      - platform: time
+        at: '21:30:00'
+      - platform: state
+        entity_id: person.carlo
+        to: 'home'
+
+    condition:
+      - condition: time
+        after: '21:30:00'
+      - condition: state
+        entity_id: person.carlo
+        state: 'home'
+      - condition: state
+        entity_id: input_boolean.medicine
+        state: 'off'
+
+    action:
+      - service: script.notify_engine_two_button
+        data:
+          title: 'Medicine Alert!'
+          value1: 'Please take your Medicine!'
+          title1: 'Took Medicine'
+          action1: 'TABLET_TAKEN'
+          icon1: 'sfsymbols:arrow.up.circle'
+          who: "carlo"
+          group: 'Medicine'
+
+  - alias: Tablet Already taken
+    id: 1f295bb8-8925-4b22-8f75-9fe079b295a8
+    trigger:
+      platform: event
+      event_type: mobile_app_notification_action
+      event_data:
+        action: TABLET_TAKEN
+    action:
+      - service: input_boolean.turn_on
+        entity_id: input_boolean.medicine
+
+  # - alias: Remind Me Later
+  #   id: 79b49c85-f832-47d7-b02d-bff099ef6fbc
+  #   trigger:
+  #     platform: event
+  #     event_type: mobile_app_notification_action
+  #     event_data:
+  #       action: NOT_HOME
+  #   action:
+  #     - service: script.notify_engine_two_button
+  #       data:
+  #         title: 'Medicine Reminder'
+  #         value1: 'Ok. I will remind you when you get home.'
+  #         who: 'carlo'
+  #         group: 'Medicine'
+  #     - wait_template: >-
+  #         {{ states.person.carlo.state == 'home' }}
+  #     - service: script.notify_engine_two_button
+  #       data:
+  #         title: 'Medicine Reminder'
+  #         value1: 'Now that your home, please take your medicine!'
+  #         who: 'carlo'
+  #         group: 'Medicine'
+
+
+## Reminders to take my Medicine! - End.
--- a/config/packages/phynplus.yaml
+++ b/config/packages/phynplus.yaml
@ -9,18 +9,6 @@
 ##  Phyn Plus Water ShutOff - https://amzn.to/2Zy3sbJ
 ######################################################################

-ios:
-  push:
-    categories:
-      - name: Phyn
-        identifier: 'phyn'
-        actions:
-          - identifier: 'PHYN_WATER_ON'
-            title: 'Turn Water Back On'
-            activationMode: 'background'
-            authenticationRequired: no
-            destructive: yes
-
 automation:
  ###################################
  ##  From IFTTT - Notifications
@ -37,25 +25,21 @@ automation:
          action: IFTTT_Phyn

    action:
-
-      - wait_template: >-
-         {{ states.sun.sun.state == 'above_horizon' }}
-
      - service: script.notify_engine
        data:
          title: 'Phyn Leak Detection'
          value1: 'Phyn is sensing {{ trigger.event.data.alert_type }} and turned off the water.  Please verify {{ trigger.event.data.where }}.'
          who: 'parents'
-          ios_category: "phyn"
-          group: 'IFTTT_Phyn'
+          group: 'Phyn'
+          level: 'critical'

  - alias: Turn Phyn Water On
    id: 1f295bb8-8925-4b22-PHYN-9fe079b295a8
    trigger:
      platform: event
-      event_type: ios.notification_action_fired
+      event_type: mobile_app_notification_action
      event_data:
-        actionName: PHYN_WATER_ON
+        action: PHYN_WATER_ON
    action:
      - service: ifttt.trigger
        data: {"event":"phyn_water_on"}
@ -65,7 +49,8 @@ automation:
          title: 'Phyn Leak Detection'
          value1: 'Request Recieved. Attempting to Turn the Water back on.'
          who: 'parents'
-          group: 'IFTTT_Phyn'
+          group: 'Phyn'
+          level: 'time-sensitive'

      - service: script.speech_engine
        data:
--- a/config/packages/time_date_sensors.yaml
+++ b/config/packages/time_date_sensors.yaml
@ -1,46 +0,0 @@
-#-------------------------------------------
-# @CCOSTAN
-# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
-# More Info : https://www.vcloudinfo.com/
-#-------------------------------------------
-#-------------------------------------------
-#  Clean data for the Floorplan UI.
-#-------------------------------------------
-
-#---Sensor for Time and Date.-----------------------------
-sensor:
-  - platform: template
-    scan_interval: 30000
-    sensors:
-      floorplan_date:
-        friendly_name: 'Date'
-        value_template: >-
-          {{now().strftime("%A")}}, {{now().strftime("%B")}} {{now().strftime("%d")}}
-
-  - platform: template
-    scan_interval: 60
-    sensors:
-      floorplan_time:
-        friendly_name: 'Time'
-        value_template: >-
-          {{now().strftime("%-I")}}:{{now().strftime("%M")}} {{now().strftime("%p")}}
-      clock_time:
-        friendly_name: 'Clock Time'
-        value_template: >-
-          {{now().strftime("%-I")}}:{{now().strftime("%M")}}
-
-  - platform: template
-    scan_interval: 30000
-    sensors:
-      clock_am_pm:
-        friendly_name: 'AM/PM'
-        value_template: >-
-          {{now().strftime("%p")}}
-      clock_day:
-        friendly_name: 'Day'
-        value_template: >-
-          {{now().strftime("%A")}}
-      clock_date:
-        friendly_name: 'Clock Date'
-        value_template: >-
-          {{now().strftime("%B")}} {{now().strftime("%d")}} {{now().year}}
Author	SHA1	Message	Date
CCOSTAN	db15187bbd	Refactored the notifications to use latest IOS. #1367	2023-11-18 22:46:51 +00:00
CCOSTAN	5e5088ea3a	Updated Holiday json file to 2030. #17	2023-11-18 18:29:27 +00:00
CCOSTAN	0f8431bb58	removed time date sensors that I was using for floorplan. closes #404	2023-11-18 17:40:00 +00:00