From 06200f41ee7e64dff990a3e1fd0e9c569b3ea356 Mon Sep 17 00:00:00 2001 From: Ming Di Leom <43627182+curbengh@users.noreply.github.com> Date: Fri, 2 Apr 2021 08:29:28 +0000 Subject: [PATCH 1/2] refactor(au-holiday): remove 2020 one-off holidays --- app/src/main/assets/australia.ics | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/app/src/main/assets/australia.ics b/app/src/main/assets/australia.ics index 862df9202..2776a9f00 100644 --- a/app/src/main/assets/australia.ics +++ b/app/src/main/assets/australia.ics @@ -388,27 +388,6 @@ DTEND;VALUE=DATE:20230101 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_56 -SUMMARY:New Year's Eve 7pm - Midnight (NT\, SA) -DTSTART;VALUE=DATE:20201231 -DTEND;VALUE=DATE:20210101 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_57 -SUMMARY:Boxing Day / Proclamation Day (additional day) (SA) -DTSTART;VALUE=DATE:20201228 -DTEND;VALUE=DATE:20201229 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_58 -SUMMARY:Boxing Day (additional day) -DTSTART;VALUE=DATE:20201228 -DTEND;VALUE=DATE:20201229 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_59 SUMMARY:Australia Day RRULE:FREQ=YEARLY;INTERVAL=1 From bc02944ca86d92dcb808d632707befd3dba7e341 Mon Sep 17 00:00:00 2001 From: Ming Di Leom <43627182+curbengh@users.noreply.github.com> Date: Fri, 2 Apr 2021 09:56:09 +0000 Subject: [PATCH 2/2] fix(au-holiday): misc fixes - remove incorrect state holidays - deduplicate holidays - recurring holidays - 2022 holidays --- app/src/main/assets/australia.ics | 215 ++++++------------------------ 1 file changed, 44 insertions(+), 171 deletions(-) diff --git a/app/src/main/assets/australia.ics b/app/src/main/assets/australia.ics index 2776a9f00..f88a1bebd 100644 --- a/app/src/main/assets/australia.ics +++ b/app/src/main/assets/australia.ics @@ -31,6 +31,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_5 SUMMARY:Labour Day (WA) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3;BYDAY=1MO DTSTART;VALUE=DATE:20210301 DTEND;VALUE=DATE:20210302 END:VEVENT @@ -38,6 +39,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_6 SUMMARY:Eight Hours Day (TAS) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3;BYDAY=2MO DTSTART;VALUE=DATE:20210308 DTEND;VALUE=DATE:20210309 END:VEVENT @@ -45,13 +47,15 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_7 SUMMARY:Labour Day (VIC) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3;BYDAY=2MO DTSTART;VALUE=DATE:20210308 DTEND;VALUE=DATE:20210309 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_8 -SUMMARY:Adelaide Cup Day (SA) +SUMMARY:Adelaide Cup (SA) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3;BYDAY=2MO STATUS:CONFIRMED DTSTART;VALUE=DATE:20210308 DTEND;VALUE=DATE:20210309 @@ -60,6 +64,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_9 SUMMARY:Canberra Day (ACT) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=3;BYDAY=2MO DTSTART;VALUE=DATE:20210308 DTEND;VALUE=DATE:20210309 END:VEVENT @@ -73,14 +78,14 @@ END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_11 -SUMMARY:Easter Saturday (ACT\, NT\, NSW\, QLD\, SA\, and VIC) +SUMMARY:Easter Saturday (ACT\, NSW\, NT\, QLD\, SA\, VIC) DTSTART;VALUE=DATE:20210403 DTEND;VALUE=DATE:20210404 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_12 -SUMMARY:Anzac Day (Public Holiday) (ACT\, NT\, QLD\, SA\, WA) +SUMMARY:Anzac Day (additional day) (ACT\, NT\, QLD\, SA\, WA) DTSTART;VALUE=DATE:20210426 DTEND;VALUE=DATE:20210427 END:VEVENT @@ -88,6 +93,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_13 SUMMARY:Labour Day (QLD) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYDAY=1MO DTSTART;VALUE=DATE:20210503 DTEND;VALUE=DATE:20210504 END:VEVENT @@ -95,6 +101,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_14 SUMMARY:May Day (NT) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=5;BYDAY=1MO DTSTART;VALUE=DATE:20210503 DTEND;VALUE=DATE:20210504 END:VEVENT @@ -109,13 +116,15 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_16 SUMMARY:Western Australia Day (WA) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=6;BYDAY=1MO DTSTART;VALUE=DATE:20210607 DTEND;VALUE=DATE:20210608 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_17 -SUMMARY:Queen's Birthday (ACT\, NT\, NSW\, SA\, TAS\, VIC) +SUMMARY:Queen's Birthday (ACT\, NSW\, NT\, SA\, TAS\, VIC) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=6;BYDAY=2MO DTSTART;VALUE=DATE:20210614 DTEND;VALUE=DATE:20210615 END:VEVENT @@ -123,20 +132,22 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_18 SUMMARY:Picnic Day (NT) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=8;BYDAY=1MO DTSTART;VALUE=DATE:20210802 DTEND;VALUE=DATE:20210803 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_19 -SUMMARY:Bank Holiday (NSW banks and financial institutions) +SUMMARY:Bank Holiday (NSW banks) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=8;BYDAY=1MO DTSTART;VALUE=DATE:20210802 DTEND;VALUE=DATE:20210803 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_20 -SUMMARY:Friday before AFL Grand Final (VIC) +SUMMARY:AFL Grand Final Eve (VIC) DTSTART;VALUE=DATE:20210924 DTEND;VALUE=DATE:20210925 END:VEVENT @@ -151,6 +162,7 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_22 SUMMARY:Queen's Birthday (QLD) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10;BYDAY=1MO DTSTART;VALUE=DATE:20211004 DTEND;VALUE=DATE:20211005 END:VEVENT @@ -158,27 +170,14 @@ BEGIN:VEVENT STATUS:CONFIRMED UID:aus_23 SUMMARY:Melbourne Cup (VIC) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=11;BYDAY=1TU DTSTART;VALUE=DATE:20211102 DTEND;VALUE=DATE:20211103 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_24 -SUMMARY:Christmas Eve 6pm - Midnight (QLD) -DTSTART;VALUE=DATE:20211224 -DTEND;VALUE=DATE:20211225 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_25 -SUMMARY:Christmas Eve 7pm - Midnight (NT\, SA) -DTSTART;VALUE=DATE:20211224 -DTEND;VALUE=DATE:20211225 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_26 -SUMMARY:Boxing Day / Proclamation Day (additional day) (SA) +SUMMARY:Boxing Day / Proclamation Day (SA) DTSTART;VALUE=DATE:20211228 DTEND;VALUE=DATE:20211229 END:VEVENT @@ -192,7 +191,8 @@ END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_28 -SUMMARY:New Year's Eve 7pm - Midnight (NT\, SA) +SUMMARY:New Year's Eve (NT\, SA) +RRULE:FREQ=YEARLY;INTERVAL=1 DTSTART;VALUE=DATE:20211231 DTEND;VALUE=DATE:20220101 END:VEVENT @@ -205,42 +205,6 @@ DTEND;VALUE=DATE:20220104 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_30 -SUMMARY:Labour Day (WA) -DTSTART;VALUE=DATE:20220307 -DTEND;VALUE=DATE:20220308 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_31 -SUMMARY:Labour Day (VIC) -DTSTART;VALUE=DATE:20220314 -DTEND;VALUE=DATE:20220315 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_32 -SUMMARY:Eight Hours Day (TAS) -DTSTART;VALUE=DATE:20220314 -DTEND;VALUE=DATE:20220315 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_33 -SUMMARY:Canberra Day (ACT) -DTSTART;VALUE=DATE:20220314 -DTEND;VALUE=DATE:20220315 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_34 -SUMMARY:Adelaide Cup Day (SA) -STATUS:CONFIRMED -DTSTART;VALUE=DATE:20220314 -DTEND;VALUE=DATE:20220315 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_35 SUMMARY:Good Friday DTSTART;VALUE=DATE:20220415 @@ -249,7 +213,7 @@ END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_36 -SUMMARY:Easter Saturday (ACT\, NT\, NSW\, QLD\, SA\, and VIC) +SUMMARY:Easter Saturday (ACT\, NSW\, NT\, QLD\, SA\, VIC) DTSTART;VALUE=DATE:20220416 DTEND;VALUE=DATE:20220417 END:VEVENT @@ -276,20 +240,6 @@ DTEND;VALUE=DATE:20220420 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_40 -SUMMARY:Labour Day (QLD) -DTSTART;VALUE=DATE:20220502 -DTEND;VALUE=DATE:20220503 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_41 -SUMMARY:May Day (NT) -DTSTART;VALUE=DATE:20220502 -DTEND;VALUE=DATE:20220503 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_42 SUMMARY:Reconciliation Day (ACT) DTSTART;VALUE=DATE:20220530 @@ -297,97 +247,28 @@ DTEND;VALUE=DATE:20220531 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_43 -SUMMARY:Western Australia Day (WA) -DTSTART;VALUE=DATE:20220606 -DTEND;VALUE=DATE:20220607 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_44 -SUMMARY:Queen's Birthday (ACT\, NT\, NSW\, TAS\, VIC) -DTSTART;VALUE=DATE:20220613 -DTEND;VALUE=DATE:20220614 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_45 -SUMMARY:Queen's Birthday/Volunteer's Day (SA) -DTSTART;VALUE=DATE:20220613 -DTEND;VALUE=DATE:20220614 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_46 -SUMMARY:Picnic Day (NT) -DTSTART;VALUE=DATE:20220801 -DTEND;VALUE=DATE:20220802 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_47 -SUMMARY:Bank Holiday (NSW banks and financial institutions) -DTSTART;VALUE=DATE:20220801 -DTEND;VALUE=DATE:20220802 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_48 -SUMMARY:Labour Day (ACT\, NSW\, SA) -DTSTART;VALUE=DATE:20221003 -DTEND;VALUE=DATE:20221004 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_49 -SUMMARY:Queen's Birthday (QLD) -DTSTART;VALUE=DATE:20221003 -DTEND;VALUE=DATE:20221004 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_50 SUMMARY:Labour Day (ACT\, NSW\, SA) +RRULE:FREQ=YEARLY;INTERVAL=1;BYMONTH=10;BYDAY=1MO DTSTART;VALUE=DATE:20211004 DTEND;VALUE=DATE:20211005 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_51 -SUMMARY:Melbourne Cup (VIC) -DTSTART;VALUE=DATE:20221101 -DTEND;VALUE=DATE:20221102 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_52 -SUMMARY:Christmas Eve 6pm - Midnight (QLD) -DTSTART;VALUE=DATE:20221224 -DTEND;VALUE=DATE:20221225 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_53 -SUMMARY:Christmas Eve 7pm - Midnight (NT\, SA) +SUMMARY:Christmas Eve (NT\, QLD\, SA) DTSTART;VALUE=DATE:20221224 DTEND;VALUE=DATE:20221225 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_54 -SUMMARY:Christmas Day (additional day) (ACT\, NSW\, QLD\, SA\, TAS\, VIC\, +SUMMARY:Christmas Day (additional day) DTSTART;VALUE=DATE:20221227 DTEND;VALUE=DATE:20221228 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_55 -SUMMARY:New Year's Eve 7pm - Midnight (NT\, SA) -DTSTART;VALUE=DATE:20221231 -DTEND;VALUE=DATE:20230101 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_59 SUMMARY:Australia Day RRULE:FREQ=YEARLY;INTERVAL=1 @@ -412,21 +293,6 @@ DTEND;VALUE=DATE:20210426 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_62 -SUMMARY:Anzac Day (NSW\, SA\, TAS\, VIC\, WA) -DTSTART;VALUE=DATE:20210425 -DTEND;VALUE=DATE:20210426 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED -UID:aus_63 -SUMMARY:Boxing Day / Proclamation Day (SA) -RRULE:FREQ=YEARLY;INTERVAL=1 -DTSTART;VALUE=DATE:20211226 -DTEND;VALUE=DATE:20211227 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_64 SUMMARY:New Year's Day RRULE:FREQ=YEARLY;INTERVAL=1 @@ -435,15 +301,8 @@ DTEND;VALUE=DATE:20210102 END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED -UID:aus_65 -SUMMARY:New Year's Day (ACT\, NSW\, QLD\, VIC\, WA) -DTSTART;VALUE=DATE:20220101 -DTEND;VALUE=DATE:20220102 -END:VEVENT -BEGIN:VEVENT -STATUS:CONFIRMED UID:aus_66 -SUMMARY:Boxing Day +SUMMARY:Boxing Day (ACT\, NSW\, QLD\, TAS\, VIC\, WA) RRULE:FREQ=YEARLY;INTERVAL=1 DTSTART;VALUE=DATE:20201226 DTEND;VALUE=DATE:20201227 @@ -451,8 +310,22 @@ END:VEVENT BEGIN:VEVENT STATUS:CONFIRMED UID:aus_67 -SUMMARY:Boxing Day (ACT\, NSW\, QLD\, VIC\, WA) -DTSTART;VALUE=DATE:20201226 -DTEND;VALUE=DATE:20201227 +SUMMARY:Royal Queensland Show (Brisbane) +DTSTART;VALUE=DATE:20210811 +DTEND;VALUE=DATE:20210812 +END:VEVENT +BEGIN:VEVENT +STATUS:CONFIRMED +UID:aus_67 +SUMMARY:Royal Queensland Show (Brisbane) +DTSTART;VALUE=DATE:20220810 +DTEND;VALUE=DATE:20220811 +END:VEVENT +BEGIN:VEVENT +STATUS:CONFIRMED +UID:aus_68 +SUMMARY:Boxing Day / Proclamation Day (SA) +DTSTART;VALUE=DATE:20221226 +DTEND;VALUE=DATE:20221227 END:VEVENT END:VCALENDAR