From 37522a8a978cfc3a4db7d931b635908d739ca714 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 16 Dec 2024 15:52:28 +0100 Subject: [PATCH] Add holiday 2024-12-28. Switch back to normal handling of Saturdays. --- etc/psa_tariff/tariff01.json | 15 ++++++++------- etc/psa_tariff/tariff02.json | 15 ++++++++------- etc/psa_tariff/tariff03.json | 10 +++++++++- etc/psa_tariff/tariff04.json | 15 ++++++++------- etc/psa_tariff/tariff05.json | 10 +++++++++- etc/psa_tariff/tariff06.json | 10 +++++++++- 6 files changed, 51 insertions(+), 24 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 63a1306..a2e6ff1 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -103,13 +103,6 @@ "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" - }, - { - "pwd_id": 625, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 6, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" } ], "PeriodYear": [ @@ -595,6 +588,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index a02e4f0..24bcd19 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -103,13 +103,6 @@ "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" - }, - { - "pwd_id": 625, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 6, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" } ], "PeriodYear": [ @@ -595,6 +588,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index d4482c6..7cc4457 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -102,7 +102,7 @@ "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_to": "12:00:00" }, { "pwd_id": 636, @@ -595,6 +595,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 1ee62d2..98ec342 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -109,13 +109,6 @@ "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" - }, - { - "pwd_id": 625, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 6, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" } ], "PeriodYear": [ @@ -757,6 +750,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json index 53e0977..1a8ad7b 100644 --- a/etc/psa_tariff/tariff05.json +++ b/etc/psa_tariff/tariff05.json @@ -115,7 +115,7 @@ "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 6, "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_to": "12:00:00" } ], "PeriodYear": [ @@ -757,6 +757,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json index 1a4b041..d4f5e2b 100644 --- a/etc/psa_tariff/tariff06.json +++ b/etc/psa_tariff/tariff06.json @@ -115,7 +115,7 @@ "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 6, "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_to": "12:00:00" } ], "PeriodYear": [ @@ -757,6 +757,14 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, + { + "ped_id": 2061, + "ped_label": "Christmas 4th day", + "ped_date_start": "2024-12-28", + "ped_date_end": "2024-12-28", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)",