From a225ffe57b1d5ed686be1dc271df223f8c7951d1 Mon Sep 17 00:00:00 2001
From: Jeffrey Stone <thejeffreystone@gmail.com>
Date: Wed, 17 Jul 2019 22:05:05 -0400
Subject: [PATCH] Moving datetime inputs to associated package

---
 input_datetime.yaml         | 25 +-------------
 packages/announcements.yaml | 68 ++++++++++++++-----------------------
 packages/reminders.yaml     | 10 ++++++
 3 files changed, 36 insertions(+), 67 deletions(-)

diff --git a/input_datetime.yaml b/input_datetime.yaml
index b321c05..c66e02f 100755
--- a/input_datetime.yaml
+++ b/input_datetime.yaml
@@ -6,22 +6,6 @@ only_date:
   name: Input with only date
   has_date: true
   has_time: false
-morning_report:
-  name: Morning Report
-  has_date: false
-  has_time: true
-nightly_report:
-  name: Nightly Report
-  has_date: false
-  has_time: true
-skylar_morning_report:
-  name: Skylar Dressed Announcement
-  has_date: false
-  has_time: true
-skylar_nightly_report:
-  name: Skylar Bedtime Announcement
-  has_date: false
-  has_time: true
 outisde_light_delay:
   name: Outside Light Delay
   has_date: false
@@ -30,16 +14,9 @@ announcement_delay:
   name: Announcement Delay
   has_date: false
   has_time: true
-kat_pill_reminder:
-  name: Kat Pill Reminder
-  has_date: false
-  has_time: true
 coffee_time:
   name: Coffee Time
   has_date: false
   has_time: true
-heartworm_reminder:
-  name: Heartworm Reminder
-  has_date: true
-  has_time: false
+
 
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 0954043..dc981ed 100755
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -2,52 +2,34 @@
 #   @author         :   Jeffrey Stone 
 #   @date           :   02/19/2019
 #   @package        :   Announcements
-#   @description    :   Just Normal Announcements. 
+#   @description    :   Daily Announcements. 
 ###############################################################################
 
-#script:
-  
-  # annc_storm_statement:
-  #   sequence:
-  #   - condition: state
-  #     entity_id: input_boolean.vacation_mode
-  #     state: 'off'
-  #   - service: script.text_notify
-  #     data:
-  #       message: Severe Storm Statement Issued for Anchorage House
-  # annc_tstorm_watch:
-  #   sequence:
-  #   - condition: state
-  #     entity_id: input_boolean.vacation_mode
-  #     state: 'off'
-  #   - service: script.text_notify
-  #     data:
-  #       message: Severe Thunderstorm Watch Issued for Anchorage House
-  # annc_tstorm_warning:
-  #   sequence:
-  #   - condition: state
-  #     entity_id: input_boolean.vacation_mode
-  #     state: 'off'
-  #   - service: script.text_notify
-  #     data:
-  #       message: Severe Thunderstorm Warning Issued for Anchorage House
-  # annc_tornado_watch:
-  #   sequence:
-  #   - condition: state
-  #     entity_id: input_boolean.vacation_mode
-  #     state: 'off'
-  #   - service: script.text_notify
-  #     data:
-  #       message: Tornado Watch Issued for Anchorage House
-  # annc_tornado_warning:
-  #   sequence:
-  #   - condition: state
-  #     entity_id: sensor.family_status
-  #     state: Home
-  #   - service: script.alert_notify
-  #     data_template:
-  #       message: "Tornado Warning has been Issued"
 
+###############################
+# input_datetime - So the time report automation fires can be set in the UI
+###############################
+input_datetime:
+  morning_report:
+    name: Morning Report
+    has_date: false
+    has_time: true
+  nightly_report:
+    name: Nightly Report
+    has_date: false
+    has_time: true
+  skylar_morning_report:
+    name: Skylar Dressed Announcement
+    has_date: false
+    has_time: true
+  skylar_nightly_report:
+    name: Skylar Bedtime Announcement
+    has_date: false
+    has_time: true
+
+################################
+# Announcment Automation - fires at the time of the above input_datetimes
+################################
 automation:
   - id: prebed_routine
     initial_state: true
diff --git a/packages/reminders.yaml b/packages/reminders.yaml
index 38c3959..b69c941 100755
--- a/packages/reminders.yaml
+++ b/packages/reminders.yaml
@@ -5,6 +5,16 @@
 #   @description    :   Autoamtions to set reminders
 ###############################################################################
 
+input_datetime:
+  kat_pill_reminder:
+    name: Kat Pill Reminder
+    has_date: false
+    has_time: true
+  heartworm_reminder:
+    name: Heartworm Reminder
+    has_date: true
+    has_time: false
+
 automation:
 
   # Massive automation to call all the reminder scripts.