From cc0e6810033d809148fc2acd42e059e1831be03b Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Mon, 29 Apr 2024 16:47:44 +0200 Subject: [PATCH] sync with master --- etc/psa_tariff/tariff03.json | 4 +- etc/psa_tariff/tariff04.json | 4 +- etc/psa_tariff/tariff05.json | 714 ++++++++--------------------------- 3 files changed, 170 insertions(+), 552 deletions(-) diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index 0668e0f..c94e79e 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -1,6 +1,6 @@ { "Project" : "SV Bad Neuenahr", - "Version" : "1.0.0", + "Version" : "1.0.0+2024-04-29T15:41:38", "Info" : "Kurzzeit 2", "comment_1": "20mins free (broetchentaste)", "comment_2": "every following 20mins: 0,40 euro", @@ -47,7 +47,7 @@ "pop_carry_over": 1, "pop_daily_card_price": 0, "pop_business_hours": 163584, - "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000" + "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours" } ], "PaymentRate": [ diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index d8e6b45..cc4fc9c 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -1,6 +1,6 @@ { "Project" : "SV Bad Neuenahr", - "Version" : "1.0.0", + "Version" : "1.0.0+2024-04-29T15:41:38", "Info" : "Kurzzeit 3", "comment_1": "20mins free (broetchentaste)", "comment_2": "every following 20mins: 0,40 euro", @@ -47,7 +47,7 @@ "pop_carry_over": 1, "pop_daily_card_price": 0, "pop_business_hours": 163584, - "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000" + "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours" } ], "PaymentRate": [ diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json index 6b956f8..d96d2ed 100644 --- a/etc/psa_tariff/tariff05.json +++ b/etc/psa_tariff/tariff05.json @@ -1,7 +1,12 @@ { "Project" : "SV Bad Neuenahr", - "Version" : "1.0.0", - "Info" : "Sondertarif", + "Version" : "1.0.0+2024-04-29T16:15:20", + "Info" : "Langzeitparktarif", + "comment_1": "20mins free (broetchentaste)", + "comment_2": "every following 20mins: 0,40 euro", + "comment_3": "24h-ticket: 5,00 euro", + "comment_4": "3x 24h ticket: 12,50 euro", + "comment_5": "7x 24h ticket: 25,00 euro", "Currency": [ { "pcu_id": 2, @@ -33,44 +38,184 @@ { "pop_id": 1049, "pop_label": "Zone 1", - "pop_payment_method_id": 3, + "pop_payment_method_id": 4, "pop_day_end_time": "00:00:00", "pop_day_night_end_time": "00:00:00", "pop_price_night": 0, - "pop_min_time": 30, - "pop_max_time": 180, - "pop_min_price": 60, - "pop_carry_over": 1, - "pop_daily_card_price": 0 + "pop_min_time": 20, + "pop_max_time": 10080, + "pop_min_price": 0, + "pop_carry_over": 0, + "pop_daily_card_price": 500, + "pop_business_hours": 163584, + "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours" } ], "PaymentRate": [ { "pra_payment_option_id": 1049, "pra_payment_unit_id": 1, - "pra_price": 10 + "pra_price": 0 }, { "pra_payment_option_id": 1049, "pra_payment_unit_id": 2, + "pra_price": 40 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 3, + "pra_price": 80 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 4, "pra_price": 120 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 5, + "pra_price": 160 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 6, + "pra_price": 200 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 7, + "pra_price": 240 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 8, + "pra_price": 280 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 9, + "pra_price": 320 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 10, + "pra_price": 360 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 11, + "pra_price": 400 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 12, + "pra_price": 440 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 13, + "pra_price": 480 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 14, + "pra_price": 500, + "pra_comment": "24h-ticket" + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 15, + "pra_price": 1250, + "pra_comment": "3x24h-ticket" + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 16, + "pra_price": 2500, + "pra_comment": "7x24h-ticket" } ], "Duration": [ { "pun_id": 1, - "pun_label": "5 min", - "pun_duration": 5 + "pun_label": "20 min", + "pun_duration": 20 + }, + { + "pun_id": 2, + "pun_label": "40 min", + "pun_duration": 40 }, { "pun_id": 3, - "pun_label": "15 min", - "pun_duration": 15 + "pun_label": "60 min", + "pun_duration": 60 }, { "pun_id": 4, - "pun_label": "1 min", - "pun_duration": 1 + "pun_label": "80 min", + "pun_duration": 80 + }, + { + "pun_id": 5, + "pun_label": "100 min", + "pun_duration": 100 + }, + { + "pun_id": 6, + "pun_label": "120 min", + "pun_duration": 120 + }, + { + "pun_id": 7, + "pun_label": "140 min", + "pun_duration": 140 + }, + { + "pun_id": 8, + "pun_label": "160 min", + "pun_duration": 160 + }, + { + "pun_id": 9, + "pun_label": "180 min", + "pun_duration": 180 + }, + { + "pun_id": 10, + "pun_label": "200 min", + "pun_duration": 200 + }, + { + "pun_id": 11, + "pun_label": "220 min", + "pun_duration": 220 + }, + { + "pun_id": 12, + "pun_label": "240 min", + "pun_duration": 240 + }, + { + "pun_id": 13, + "pun_label": "260 min", + "pun_duration": 260 + }, + { + "pun_id": 14, + "pun_label": "24h", + "pun_duration": 1440 + }, + { + "pun_id": 15, + "pun_label": "72h", + "pun_duration": 4320 + }, + { + "pun_id": 16, + "pun_label": "168h", + "pun_duration": 10080 } ], "WeekDaysWorktime": [ @@ -79,13 +224,6 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 1, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - }, - { - "pwd_id": 621, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 1, - "pwd_time_from": "14:00:00", "pwd_time_to": "18:00:00" }, { @@ -93,13 +231,6 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 2, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - }, - { - "pwd_id": 622, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 2, - "pwd_time_from": "14:00:00", "pwd_time_to": "18:00:00" }, { @@ -107,13 +238,6 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 3, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - }, - { - "pwd_id": 623, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 3, - "pwd_time_from": "14:00:00", "pwd_time_to": "18:00:00" }, { @@ -121,13 +245,6 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 4, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - }, - { - "pwd_id": 624, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 4, - "pwd_time_from": "14:00:00", "pwd_time_to": "18:00:00" }, { @@ -135,13 +252,6 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - }, - { - "pwd_id": 625, - "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 5, - "pwd_time_from": "14:00:00", "pwd_time_to": "18:00:00" }, { @@ -149,506 +259,14 @@ "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 6, "pwd_time_from": "08:00:00", - "pwd_time_to": "12:00:00" - } - ], - "SpecialDaysWorktime": [ - { - "pedwt_id": 2156, - "pedwt_period_exc_day_id": 2024, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 + "pwd_time_to": "18:00:00" }, { - "pedwt_id": 2158, - "pedwt_period_exc_day_id": 2025, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2160, - "pedwt_period_exc_day_id": 2026, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2162, - "pedwt_period_exc_day_id": 2027, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2164, - "pedwt_period_exc_day_id": 2028, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2170, - "pedwt_period_exc_day_id": 2030, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2172, - "pedwt_period_exc_day_id": 2032, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2174, - "pedwt_period_exc_day_id": 11, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2175, - "pedwt_period_exc_day_id": 13, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2177, - "pedwt_period_exc_day_id": 2023, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2178, - "pedwt_period_exc_day_id": 2022, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2179, - "pedwt_period_exc_day_id": 14, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2184, - "pedwt_period_exc_day_id": 2021, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2188, - "pedwt_period_exc_day_id": 2031, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2189, - "pedwt_period_exc_day_id": 2029, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2194, - "pedwt_period_exc_day_id": 2034, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2200, - "pedwt_period_exc_day_id": 2037, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2201, - "pedwt_period_exc_day_id": 2039, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2202, - "pedwt_period_exc_day_id": 2038, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2226, - "pedwt_period_exc_day_id": 2016, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2245, - "pedwt_period_exc_day_id": 2035, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2246, - "pedwt_period_exc_day_id": 2036, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2249, - "pedwt_period_exc_day_id": 2050, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "16:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2250, - "pedwt_period_exc_day_id": 2051, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "16:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2251, - "pedwt_period_exc_day_id": 2052, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2252, - "pedwt_period_exc_day_id": 2053, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2253, - "pedwt_period_exc_day_id": 2054, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2254, - "pedwt_period_exc_day_id": 2055, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2255, - "pedwt_period_exc_day_id": 2056, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2256, - "pedwt_period_exc_day_id": 2057, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2257, - "pedwt_period_exc_day_id": 2058, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2258, - "pedwt_period_exc_day_id": 2059, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2259, - "pedwt_period_exc_day_id": 2060, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - } - ], - "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Mariae Empfaengnis", - "ped_date_start": "2023-12-08", - "ped_date_end": "2023-12-08", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christtag", - "ped_date_start": "2023-12-25", - "ped_date_end": "2023-12-25", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 14, - "ped_label": "Stefanitag", - "ped_date_start": "2023-12-26", - "ped_date_end": "2023-12-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2016, - "ped_label": "Neujahr", - "ped_date_start": "2024-01-01", - "ped_date_end": "2024-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Heilig Drei Koenige", - "ped_date_start": "2024-01-06", - "ped_date_end": "2024-01-06", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2022, - "ped_label": "Ostermontag", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2023, - "ped_label": "Ostersonntag", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2024, - "ped_label": "Staatsfeiertag", - "ped_date_start": "2024-05-01", - "ped_date_end": "2024-05-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2025, - "ped_label": "Christi Himmelfahrt", - "ped_date_start": "2024-05-09", - "ped_date_end": "2024-05-09", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2026, - "ped_label": "Pfingst Montag", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2027, - "ped_label": "Fronleichnam", - "ped_date_start": "2024-05-30", - "ped_date_end": "2024-05-30", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, - { - "ped_id": 2028, - "ped_label": "Maria Himmelfahrt", - "ped_date_start": "2024-08-15", - "ped_date_end": "2024-08-15", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2029, - "ped_label": "Nationalfeiertag", - "ped_date_start": "2024-10-26", - "ped_date_end": "2024-10-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2030, - "ped_label": "Allerheiligen", - "ped_date_start": "2024-11-01", - "ped_date_end": "2024-11-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2031, - "ped_label": "Mariae Empfaengnis", - "ped_date_start": "2024-08-12", - "ped_date_end": "2024-08-12", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2032, - "ped_label": "Christtag", - "ped_date_start": "2024-12-25", - "ped_date_end": "2024-12-25", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2034, - "ped_label": "Stefanitag", - "ped_date_start": "2024-12-26", - "ped_date_end": "2024-12-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2035, - "ped_label": "Neujahr", - "ped_date_start": "2025-01-01", - "ped_date_end": "2025-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2036, - "ped_label": "Heilig Drei Koenige", - "ped_date_start": "2025-06-01", - "ped_date_end": "2025-06-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2037, - "ped_label": "Ostermontag", - "ped_date_start": "2025-04-21", - "ped_date_end": "2025-04-21", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2039, - "ped_label": "Ostersonntag", - "ped_date_start": "2025-04-20", - "ped_date_end": "2025-04-20", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2038, - "ped_label": "Staatsfeiertag", - "ped_date_start": "2025-05-01", - "ped_date_end": "2025-05-01", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2050, - "ped_label": "Christi Himmelfahrt", - "ped_date_start": "2025-05-29", - "ped_date_end": "2025-05-29", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2051, - "ped_label": "Pfingstmontag", - "ped_date_start": "2025-06-09", - "ped_date_end": "2025-06-09", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2052, - "ped_label": "Fronlaeichnam", - "ped_date_start": "2025-06-19", - "ped_date_end": "2025-06-19", - "ped_period_special_day_id": 1, - "ped_year": 2025 - }, - { - "ped_id": 2053, - "ped_label": "Mariae Himmelfahrt", - "ped_date_start": "2025-08-15", - "ped_date_end": "2025-08-15", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Nationalfeiertag", - "ped_date_start": "2025-10-26", - "ped_date_end": "2025-10-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2055, - "ped_label": "Allerheiligen", - "ped_date_start": "2025-11-01", - "ped_date_end": "2025-11-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Mariae Empfaengnis", - "ped_date_start": "2025-12-08", - "ped_date_end": "2025-12-08", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "Christtag", - "ped_date_start": "2025-12-25", - "ped_date_end": "2025-12-25", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Stefanitag", - "ped_date_start": "2025-12-26", - "ped_date_end": "2025-12-26", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2059, - "ped_label": "Neujahr", - "ped_date_start": "2026-01-01", - "ped_date_end": "2026-01-01", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2060, - "ped_label": "Heilige Drei Koenige", - "ped_date_start": "2026-01-06", - "ped_date_end": "2026-01-06", - "ped_period_special_day_id": 1, - "ped_year": 0 + "pwd_id": 626, + "pwd_period_week_day_id": 36, + "pwd_period_day_in_week_id": 7, + "pwd_time_from": "08:00:00", + "pwd_time_to": "18:00:00" } ], "PeriodYear": [