diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index f7230ae..b3155a3 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -803,5 +803,3 @@ } ] } - - diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index d436f69..2edec6e 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -810,4 +810,3 @@ } ] } -# Tue Aug 1 13:17:57 CEST 2023 diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index 9e77830..bcdc392 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -35,10 +35,11 @@ "pop_day_night_end_time": "16:30:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 600, + "pop_max_time": 240, "pop_min_price": 0, "pop_carry_over": 1, - "pop_daily_card_price": 2400 + "pop_daily_card_price": 2400, + "pop_multi_hour_price": 0 } ], "PaymentRate": [ @@ -63,6 +64,11 @@ "pun_id": 4, "pun_label": "1 min", "pun_duration": 1 + }, + { + "pun_id": 5, + "pun_label": "Voller Tag", + "pun_duration": 1441 } ], "WeekDaysWorktime": [ @@ -166,6 +172,22 @@ "pye_start_day": 1, "pye_end_month": 12, "pye_end_day": 31 + }, + { + "pye_id": 17, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 18, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 } ], "SpecialDaysWorktime": [ @@ -462,6 +484,146 @@ "pedwt_time_from": "00:00:00", "pedwt_time_to": "00:00:00", "pedwt_price": 0 + }, + { + "pedwt_id": 2271, + "pedwt_period_exc_day_id": 2072, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2272, + "pedwt_period_exc_day_id": 2073, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2273, + "pedwt_period_exc_day_id": 2074, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2274, + "pedwt_period_exc_day_id": 2075, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2275, + "pedwt_period_exc_day_id": 2076, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2276, + "pedwt_period_exc_day_id": 2077, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2277, + "pedwt_period_exc_day_id": 2078, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2278, + "pedwt_period_exc_day_id": 2079, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2279, + "pedwt_period_exc_day_id": 2080, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2280, + "pedwt_period_exc_day_id": 2081, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2281, + "pedwt_period_exc_day_id": 2082, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2282, + "pedwt_period_exc_day_id": 2083, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2283, + "pedwt_period_exc_day_id": 2084, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2284, + "pedwt_period_exc_day_id": 2085, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2285, + "pedwt_period_exc_day_id": 2086, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2286, + "pedwt_period_exc_day_id": 2087, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2287, + "pedwt_period_exc_day_id": 2088, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2288, + "pedwt_period_exc_day_id": 2089, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2289, + "pedwt_period_exc_day_id": 2090, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2290, + "pedwt_period_exc_day_id": 2091, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 } ], "SpecialDays": [ @@ -800,6 +962,168 @@ "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, "ped_year": 2024 + }, + { + "ped_id": 2072, + "ped_label": "Christmas 1st day", + "ped_date_start": "2022-12-25", + "ped_date_end": "2022-12-25", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2073, + "ped_label": "Christmas 2nd day", + "ped_date_start": "2022-12-26", + "ped_date_end": "2022-12-26", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2074, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2075, + "ped_label": "Christmas (Sunday)", + "ped_date_start": "2022-12-24", + "ped_date_end": "2022-12-24", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2076, + "ped_label": "Holiday (Hungary)", + "ped_date_start": "2022-12-31", + "ped_date_end": "2022-12-31", + "ped_period_special_day_id": 1, + "ped_year": 0 + }, + { + "ped_id": 2077, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2078, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2079, + "ped_label": "Easter Sunday", + "ped_date_start": "2023-04-09", + "ped_date_end": "2023-04-09", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2080, + "ped_label": "Easter Monday", + "ped_date_start": "2023-04-10", + "ped_date_end": "2023-04-10", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2081, + "ped_label": "Whit Sunday", + "ped_date_start": "2023-05-28", + "ped_date_end": "2023-05-28", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2082, + "ped_label": "Whit Monday", + "ped_date_start": "2023-05-29", + "ped_date_end": "2023-05-29", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2083, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2084, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2085, + "ped_label": "Saint Stephens Day (Hungary)", + "ped_date_start": "2023-08-20", + "ped_date_end": "2023-08-20", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2086, + "ped_label": "All Saints Day", + "ped_date_start": "2023-11-01", + "ped_date_end": "2023-11-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2087, + "ped_label": "Good Friday", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2088, + "ped_label": "Easter", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2089, + "ped_label": "Easter Monday", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2090, + "ped_label": "Whit Monday", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2091, + "ped_label": "Whit Sunday", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 2, + "ped_year": 2024 } ] } + +