From 97e4a826440c1d2a023fe496c3cb7466eda7a5ec Mon Sep 17 00:00:00 2001
From: ccostan <carlo@ipm.com>
Date: Thu, 1 Mar 2018 01:37:29 -0500
Subject: [PATCH] Updated Holiday colors for 2018

---
 config/packages/holiday.yaml           |  2 +-
 config/script/monthly_color_scene.yaml | 52 +++++++++-----------------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/config/packages/holiday.yaml b/config/packages/holiday.yaml
index 198d2af3..9d226b3c 100755
--- a/config/packages/holiday.yaml
+++ b/config/packages/holiday.yaml
@@ -39,7 +39,7 @@ sensor:
       {{ holiday }}
 
   - platform: rest
-    resource: http://www.webcal.fi/cal.php?id=335&format=json&start_year=current_year&end_year=2017&tz=America%2FNew_York
+    resource: http://www.webcal.fi/cal.php?id=335&format=json&start_year=current_year&end_year=2018&tz=America%2FNew_York
     name: Flag
     scan_interval: 14400
     value_template: >-
diff --git a/config/script/monthly_color_scene.yaml b/config/script/monthly_color_scene.yaml
index 2b3040b6..ab2dcc97 100755
--- a/config/script/monthly_color_scene.yaml
+++ b/config/script/monthly_color_scene.yaml
@@ -31,8 +31,8 @@ monthly_color_scene:
           {%- elif now().strftime("%m%d")|int >= 315
           and now().strftime("%m%d")|int <= 317-%}
           st_patty
-          {%- elif now().strftime("%m%d")|int >= 414
-          and now().strftime("%m%d")|int <= 416-%}
+          {%- elif now().strftime("%m%d")|int >= 328
+          and now().strftime("%m%d")|int <= 401-%}
           easter
           {%- elif now().strftime("%m%d")|int == 422 -%}
           st_patty
@@ -42,21 +42,21 @@ monthly_color_scene:
           cinco_de_mayo
           {%- elif now().strftime("%m%d")|int == 514 -%}
           valentine
-          {%- elif now().strftime("%m%d")|int == 618 -%}
+          {%- elif now().strftime("%m%d")|int == 617 -%}
           fathers_day
           {%- elif now().strftime("%m%d")|int >= 1001
           and now().strftime("%m%d")|int <= 1031-%}
           halloween
-          {%- elif now().strftime("%m%d")|int >= 1123
-          and now().strftime("%m%d")|int <= 1124-%}
+          {%- elif now().strftime("%m%d")|int >= 1122
+          and now().strftime("%m%d")|int <= 1123-%}
           thanksgiving
           {%- elif now().strftime("%m%d")|int >= 1125
-          and now().strftime("%m%d")|int <= 1211-%}
+          and now().strftime("%m%d")|int <= 1201-%}
           christmas
-          {%- elif now().strftime("%m%d")|int >= 1212
-          and now().strftime("%m%d")|int <= 1220-%}
+          {%- elif now().strftime("%m%d")|int >= 1202
+          and now().strftime("%m%d")|int <= 1210-%}
           hanukkah
-          {%- elif now().strftime("%m%d")|int >= 1221
+          {%- elif now().strftime("%m%d")|int >= 1211
           and now().strftime("%m%d")|int <= 1230-%}
           christmas
           {%- elif now().strftime("%m%d")|int == 1231 -%}
@@ -66,29 +66,11 @@ monthly_color_scene:
           {%- endif -%}_colors
 
 
-# http://www.calendar-365.com/holidays/2017.html
-# 101 New_years_day (colorloop)
-# RWB 212 Lincoln's Birthday
-# 214 Valentine's Day (pink, red)
-# RWB 220 President's Day
-# 228 Mardi Gras (purple, green, gold )
-# 317 st Patty (green)
-# 414 Good Friday
-# 416 Easter
-# 422 Earth Day
-# 505 Cinco de Mayo (green, white, red)
-# 514 Mother's Day (pink, red) - Same as Valentine
-# RWB 520 Armed Forces Day
-# RWB 529 Memorial Day
-# RWB 614 Flag Day
-# 618 Fathers day (Orange, Blue)
-# RWB 704 July 4th
-# RWB 904 Labor Day
-# RWB 911 Patriots day
-# RWB 1009 columbus day
-# 1005 - 1031 halloween
-# RWB 1111 veterans day
-# 1123 Thanksgiving
-# 1212 Hanukkah start 8 days.
-# 1225 Chrismas
-# 1231 New years eve
+# http://www.calendar-365.com/holidays/2018.html
+# 213 Mardi Gras (purple, green, gold )
+# 330 Good Friday
+# 401 Easter
+# 513 Mother's Day (pink, red) - Same as Valentine
+# 617 Fathers day (Orange, Blue)
+# 1122 Thanksgiving
+# 1202 Hanukkah start 8 days.