From 1b871caef7a5e4662cc891d028de53734152e0c6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 12 Dec 2023 10:11:58 +0100 Subject: [PATCH 1/9] 2nd draft of tariff file --- etc/psa_tariff/tariff01.json | 557 +++++------------------------------ 1 file changed, 70 insertions(+), 487 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 9f355da..861357c 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -29,6 +29,30 @@ "pme_label": "steps" } ], + "TimeBasis": [ + { + "tb_id": 1, + "tb_label": "absolute time" + }, + { + "tb_id": 2, + "tb_label": "relative time" + } + ], + "Customer": [ + { + "cust_id": 1, + "cust_label": "Adult" + }, + { + "cust_id": 2, + "cust_label": "Child" + }, + { + "cust_id": 3, + "cust_label": "Teen" + } + ], "PaymentOption": [ { "pop_id": 1049, @@ -62,21 +86,35 @@ "pra_price": 3000 } ], + "DailyTicket": [ + { + "daily_ticket_payment_option_id": 1049, + "daily_ticket_unit_id": 1, + "daily_ticket_price": 400, + "daily_ticket_tb_id": 1, + "daily_ticket_clearance_id": [3], + "daily_ticket_from_min": "00:00:00", + "daily_ticket_to_max": "00:00:00", + "daily_ticket_from_offset_min": 0, + "daily_ticket_to_offset_max": 0 + }, + { + "daily_ticket_payment_option_id": 1049, + "daily_ticket_unit_id": 2, + "daily_ticket_price": 800, + "daily_ticket_tb_id": 1, + "daily_ticket_clearance_id": [1], + "daily_ticket_from_min": "00:00:00", + "daily_ticket_to_max": "00:00:00", + "daily_ticket_from_offset_min": 0, + "daily_ticket_to_offset_max": 0 + } + ], "Duration": [ { "pun_id": 1, - "pun_label": "3 Marken", - "pun_duration": 180 - }, - { - "pun_id": 2, - "pun_label": "5 Marken", - "pun_duration": 300 - }, - { - "pun_id": 3, - "pun_label": "10 Marken", - "pun_duration": 600 + "pun_label": "Tagesticket", + "pun_duration": 720 } ], "WeekDaysWorktime": [ @@ -84,505 +122,50 @@ "pwd_id": 621, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 1, - "pwd_time_from": "06:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" }, { "pwd_id": 622, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 2, - "pwd_time_from": "06:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" }, { "pwd_id": 623, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 3, - "pwd_time_from": "06:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" }, { "pwd_id": 624, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 4, - "pwd_time_from": "06:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" }, { "pwd_id": 625, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 5, - "pwd_time_from": "06: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_from": "08:00:00", + "pwd_time_to": "20: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 + "pwd_id": 626, + "pwd_period_week_day_id": 36, + "pwd_period_day_in_week_id": 6, + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" }, { - "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": 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": 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-01-04", - "ped_date_end": "2024-01-04", - "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": 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": 627, + "pwd_period_week_day_id": 36, + "pwd_period_day_in_week_id": 1, + "pwd_time_from": "08:00:00", + "pwd_time_to": "20:00:00" } ], "PeriodYear": [ From 949b91513786942d41b94a27e40687dbe9b265ec Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 31 Jan 2024 11:47:12 +0100 Subject: [PATCH 2/9] Sync with version in master. --- etc/psa_tariff/tariff01.json | 96 +++++++++++++++++++++++++----------- 1 file changed, 66 insertions(+), 30 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 861357c..53d5b36 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -29,27 +29,54 @@ "pme_label": "steps" } ], - "TimeBasis": [ + "TimeBase": [ { - "tb_id": 1, - "tb_label": "absolute time" + "tbase_id": 0, + "tbase_type": 0, + "tbase_type_comment": "time is given as starting from some wall-clock-time", + "tbase_label": "absolute time" }, { - "tb_id": 2, - "tb_label": "relative time" + "tbase_id": 1, + "tbase_type": 1, + "tbase_type_comment": "time is given as starting from 0 minutes", + "tbase_label": "relative time" + } + ], + "TimeRange" : [ + { + "time_range_id": 1, + "time_range_from": "00:00:00", + "time_range_to": "00:01:00", + "time_range_comment": "- <= 60secs -> time range is time point " + } + ], + "TimeStepConfig" : [ + { + "tsconfig_id" : 1, + "tsconfig_label" : "static", + "tsconfig_comment" : "read time steps as given in jsonfiles" + }, + { + "tsconfig_id" : 2, + "tsconfig_label" : "dynamic", + "tsconfig_comment" : "determine timesteps at runtime" } ], "Customer": [ { "cust_id": 1, + "cust_type": 1000, "cust_label": "Adult" }, { "cust_id": 2, + "cust_type": 1001, "cust_label": "Child" }, { "cust_id": 3, + "cust_type": 1002, "cust_label": "Teen" } ], @@ -58,54 +85,63 @@ "pop_id": 1049, "pop_label": "Zone 1", "pop_payment_method_id": 4, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "08:00:00", + "pop_day_night_end_time": "20:00:00", "pop_price_night": 0, "pop_min_time": 1, - "pop_max_time": 2, - "pop_min_price": 900, + "pop_max_time": 720, + "pop_min_price": 400, "pop_carry_over": 0, "pop_daily_card_price": 0, - "pop_business_hours": 2 + "pop_business_hours": 128 + }, + { + "pop_id": 1050, + "pop_label": "Zone 1", + "pop_payment_method_id": 4, + "pop_day_end_time": "08:00:00", + "pop_day_night_end_time": "20:00:00", + "pop_price_night": 0, + "pop_min_time": 1, + "pop_max_time": 720, + "pop_min_price": 800, + "pop_carry_over": 0, + "pop_daily_card_price": 0, + "pop_business_hours": 128 } ], "PaymentRate": [ { "pra_payment_option_id": 1049, "pra_payment_unit_id": 1, - "pra_price": 900 + "pra_price": 400 }, { - "pra_payment_option_id": 1049, + "pra_payment_option_id": 1050, "pra_payment_unit_id": 2, - "pra_price": 1500 - }, - { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 3, - "pra_price": 3000 + "pra_price": 800 } ], "DailyTicket": [ { "daily_ticket_payment_option_id": 1049, - "daily_ticket_unit_id": 1, - "daily_ticket_price": 400, + "daily_ticket_id": 1, + "daily_ticket_price_id": 1, "daily_ticket_tb_id": 1, - "daily_ticket_clearance_id": [3], - "daily_ticket_from_min": "00:00:00", - "daily_ticket_to_max": "00:00:00", + "daily_ticket_clearance_customer_ids": [3], + "daily_ticket_from_min": "08:00:00", + "daily_ticket_to_max": "20:00:00", "daily_ticket_from_offset_min": 0, "daily_ticket_to_offset_max": 0 }, { - "daily_ticket_payment_option_id": 1049, - "daily_ticket_unit_id": 2, - "daily_ticket_price": 800, + "daily_ticket_payment_option_id": 1050, + "daily_ticket_id": 2, + "daily_ticket_price_id": 2, "daily_ticket_tb_id": 1, - "daily_ticket_clearance_id": [1], - "daily_ticket_from_min": "00:00:00", - "daily_ticket_to_max": "00:00:00", + "daily_ticket_clearance_customer_ids": [1], + "daily_ticket_from_min": "08:00:00", + "daily_ticket_to_max": "20:00:00", "daily_ticket_from_offset_min": 0, "daily_ticket_to_offset_max": 0 } @@ -163,7 +199,7 @@ { "pwd_id": 627, "pwd_period_week_day_id": 36, - "pwd_period_day_in_week_id": 1, + "pwd_period_day_in_week_id": 7, "pwd_time_from": "08:00:00", "pwd_time_to": "20:00:00" } From 99ae151d6276d3399c8506b743dbc69d67528ec7 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 22 Feb 2024 14:03:49 +0100 Subject: [PATCH 3/9] set daily card price for TEEN and ADULT --- etc/psa_tariff/tariff01.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index 53d5b36..fbeda6e 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -92,7 +92,7 @@ "pop_max_time": 720, "pop_min_price": 400, "pop_carry_over": 0, - "pop_daily_card_price": 0, + "pop_daily_card_price": 400, "pop_business_hours": 128 }, { @@ -106,7 +106,7 @@ "pop_max_time": 720, "pop_min_price": 800, "pop_carry_over": 0, - "pop_daily_card_price": 0, + "pop_daily_card_price": 800, "pop_business_hours": 128 } ], From b669fa8157d95f14e1bc4fad657fa8296f4b00d2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 22 Feb 2024 16:22:35 +0100 Subject: [PATCH 4/9] Add "Product" entry into tariff file. --- etc/psa_tariff/tariff01.json | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index fbeda6e..96df85f 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -110,6 +110,71 @@ "pop_business_hours": 128 } ], + "Product" : [ + { + "tariff_product_id": 1, + "tariff_product_price": 0, + "tariff_product_name": "DAY_TICKET", + "tariff_product_start": "00:00:00", + "tariff_product_end": "00:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 0 + }, + { + "tariff_product_id": 2, + "tariff_product_price": 0, + "tariff_product_name": "SZEGED_START", + "tariff_product_start": "00:00:00", + "tariff_product_end": "00:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 0 + }, + { + "tariff_product_id": 3, + "tariff_product_price": 0, + "tariff_product_name": "SZEGED_STOP", + "tariff_product_start": "00:00:00", + "tariff_product_end": "00:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 0 + }, + { + "tariff_product_id": 4, + "tariff_product_price": 800, + "tariff_product_name": "DAY_TICKET_ADULT", + "tariff_product_start": "08:00:00", + "tariff_product_end": "20:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 720 + }, + { + "tariff_product_id": 5, + "tariff_product_price": 400, + "tariff_product_name": "DAY_TICKET_TEEN", + "tariff_product_start": "08:00:00", + "tariff_product_end": "20:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 720 + }, + { + "tariff_product_id": 6, + "tariff_product_price": 0, + "tariff_product_name": "DAY_TICKET_CHILD", + "tariff_product_start": "00:00:00", + "tariff_product_end": "00:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 0 + }, + { + "tariff_product_id": 7, + "tariff_product_price": 0, + "tariff_product_name": "INVALID", + "tariff_product_start": "00:00:00", + "tariff_product_end": "00:00:00", + "tariff_product_from_in_minutes_from_start": 0, + "tariff_product_to_in_minutes_from_start": 0 + } + ], "PaymentRate": [ { "pra_payment_option_id": 1049, From b18f3c56b995da2844fa4a0bb122ce7e8cbdf9d5 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 28 Feb 2024 13:27:45 +0100 Subject: [PATCH 5/9] sync with master --- etc/psa_config/DC2C_cash.json | 18 +++++++++++++ etc/psa_config/DC2C_conf.json | 12 +++++++++ etc/psa_config/DC2C_device.json | 27 ++++++++++++++++++++ etc/psa_config/DC2C_print01.json | 43 ++++++++++++++++++++++++++++++++ etc/psa_config/DC2C_print02.json | 25 +++++++++++++++++++ etc/psa_config/DC2C_print03.json | 30 ++++++++++++++++++++++ etc/psa_config/DC2C_print04.json | 6 +++++ etc/psa_config/DC2C_print05.json | 43 ++++++++++++++++++++++++++++++++ etc/psa_config/DC2C_print06.json | 26 +++++++++++++++++++ etc/psa_config/DC2C_print07.json | 30 ++++++++++++++++++++++ etc/psa_config/DC2C_print08.json | 6 +++++ etc/psa_config/DC2C_print31.json | 21 ++++++++++++++++ etc/psa_config/DC2C_print32.json | 42 +++++++++++++++++++++++++++++++ 13 files changed, 329 insertions(+) create mode 100755 etc/psa_config/DC2C_cash.json create mode 100755 etc/psa_config/DC2C_conf.json create mode 100755 etc/psa_config/DC2C_device.json create mode 100755 etc/psa_config/DC2C_print01.json create mode 100755 etc/psa_config/DC2C_print02.json create mode 100755 etc/psa_config/DC2C_print03.json create mode 100755 etc/psa_config/DC2C_print04.json create mode 100755 etc/psa_config/DC2C_print05.json create mode 100755 etc/psa_config/DC2C_print06.json create mode 100755 etc/psa_config/DC2C_print07.json create mode 100755 etc/psa_config/DC2C_print08.json create mode 100755 etc/psa_config/DC2C_print31.json create mode 100755 etc/psa_config/DC2C_print32.json diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json new file mode 100755 index 0000000..5cbc9ed --- /dev/null +++ b/etc/psa_config/DC2C_cash.json @@ -0,0 +1,18 @@ + +"title":"DC2C_cash ", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1], +"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3], +"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0], +"ExchangeRate":1, +"TokenChannel":6, +"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], +"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0], +"LocalTaxRate":19, +"ForeignTaxRate":0, +"Surcharge":0, +"Discount":0 +} + + diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json new file mode 100755 index 0000000..ace3a64 --- /dev/null +++ b/etc/psa_config/DC2C_conf.json @@ -0,0 +1,12 @@ +{ +"title":"DC2C_config", +"project":"NVT NAZ", +"version":"28.02.2024 00001", +"custNum":744, +"machNum":1, +"borough":1, +"zone":1, +"alias":0, +"location":"NAZ Parkplatz" +} + diff --git a/etc/psa_config/DC2C_device.json b/etc/psa_config/DC2C_device.json new file mode 100755 index 0000000..a5222f3 --- /dev/null +++ b/etc/psa_config/DC2C_device.json @@ -0,0 +1,27 @@ +{ +"title":"DC2C_device", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"printer":1, +"coinChk":1, +"mifRd":1, +"solarPwr":0, +"modem":0, +"creditCard":1, +"escrow":1, +"RejMotor":0, +"shutter":1, +"billRd":0, +"vaultLock":0, +"autoAlarm":1, +"autoOpen":1, +"AccPrint":1, +"DorPrint":1, +"TokPrint":1, +"CBwarnLev":1600, +"CBerrLev":1900, +"BattWarn":11800, +"BattErr":11200, +"foreign":1, +"refPrint":0 +} diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json new file mode 100755 index 0000000..d7f3542 --- /dev/null +++ b/etc/psa_config/DC2C_print01.json @@ -0,0 +1,43 @@ +{ +"title":"DC2C_pri01", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"styl":"font 08", +"feed":"margin05", +"feed":"rim02", +"styl":"size 00", +"graf":"logo1", +"styl":"font 10", +"styl":"size 11", +"styl":"align c", +"feed":"margin02", +"feed":"rim02", +"text":"Galtür", +"feed":"nl" +"feed":"nl" +"text":"Parkschein", +"feed":"nl", +"feed":"nl", +"styl":"size 00", +"styl":"align l", +"styl":"size 00", +"text":"Parkzeit bezahlt bis: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json new file mode 100755 index 0000000..baeb254 --- /dev/null +++ b/etc/psa_config/DC2C_print02.json @@ -0,0 +1,25 @@ +{ +"title":"DC2C_pri02", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"issued":"22.01.2024 01.01", +"feed":"nl", +"text":"Bezahlt: ", +"styl":"size 11", +"vari":"Dynamic07", +"text":"", +"feed":"nl", +"styl":"size 00" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json new file mode 100755 index 0000000..bc42203 --- /dev/null +++ b/etc/psa_config/DC2C_print03.json @@ -0,0 +1,30 @@ +{ +"title":"DC2C_pri03", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"feed":"nl", +"styl":"size 00", +"text":"Automat: ", +"vari":"manu", +"feed":"nl", +"styl":"align c", +"text":"Bitte gut sichtbar", +"feed":"nl", +"text":"hinter die Scheibe", +"feed":"nl", +"text":"legen", +"feed":"nl", +"feed":"eject" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json new file mode 100755 index 0000000..47a656f --- /dev/null +++ b/etc/psa_config/DC2C_print04.json @@ -0,0 +1,6 @@ +{ +"title":"DC2C_pri04", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"text":""; +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json new file mode 100755 index 0000000..5ef72fb --- /dev/null +++ b/etc/psa_config/DC2C_print05.json @@ -0,0 +1,43 @@ +{ +"title":"DC2C_pri05", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"styl":"font 08", +"feed":"margin05", +"feed":"rim02", +"styl":"size 00", +"graf":"logo1", +"styl":"font 10", +"styl":"size 11", +"styl":"align c", +"feed":"margin02", +"feed":"rim02", +"text":"Galtür", +"feed":"nl" +"feed":"nl" +"text":"Parkschein", +"feed":"nl", +"feed":"nl", +"styl":"size 00", +"styl":"align l", +"styl":"size 00", +"text":"Parkzeit bezahlt bis: ", +"feed":"nl", +"styl":"size 11", +"vari":"Dynamic04", +"vari":"Dynamic03", +"styl":"size 00", +"feed":"nl" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json new file mode 100755 index 0000000..af02f1f --- /dev/null +++ b/etc/psa_config/DC2C_print06.json @@ -0,0 +1,26 @@ +{ +"title":"DC2C_pri06", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"issued":"13.11.2023 01.01", +"feed":"nl", +"text":"Bezahlt: ", +"styl":"size 11", +"vari":"Dynamic07", +"text":"", +"feed":"nl", +"styl":"size 00" + +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json new file mode 100755 index 0000000..32bfe28 --- /dev/null +++ b/etc/psa_config/DC2C_print07.json @@ -0,0 +1,30 @@ +{ +"title":"DC2C_pri07", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"feed":"nl", +"styl":"size 00", +"text":"Automat: ", +"vari":"manu", +"feed":"nl", +"styl":"align c", +"text":"Bitte gut sichtbar", +"feed":"nl", +"text":"hinter die Scheibe", +"feed":"nl", +"text":"legen", +"feed":"nl", +"feed":"eject" +} + + + + + + + + + + + + diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json new file mode 100755 index 0000000..4c9715d --- /dev/null +++ b/etc/psa_config/DC2C_print08.json @@ -0,0 +1,6 @@ +{ +"title":"DC2C_pri08", +"project":"NVT NAZ", +"Version":"28.02.2024 00103", +"text":""; +} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json new file mode 100755 index 0000000..407bf89 --- /dev/null +++ b/etc/psa_config/DC2C_print31.json @@ -0,0 +1,21 @@ +{ +"title":"DC2C_pri31", +"project":"door close print", +"Version":"15.11.2023 00001", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"feed":"speed10", +"styl":"size 11", +"feed":"nl", +"text":"Türöffnung um:", +"feed":"nl", +"styl":"size 00", +"vari":"date ge", +"vari":"time long", +"feed":"nl", +"feed":"eject" +} + + diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json new file mode 100755 index 0000000..2f1c024 --- /dev/null +++ b/etc/psa_config/DC2C_print32.json @@ -0,0 +1,42 @@ +{ +"title":"DC2C_pri32", +"project":"refund reciept", +"Version":"15.11.2023 00001", +"styl":"font 08", +"styl":"size 10", +"feed":"margin02", +"feed":"rim02", +"feed":"speed10", +"styl":"size 11", +"text":"Ersatzbeleg", +"feed":"nl", +"styl":"size 00", +"text":"Erstattungsbetrag: ", +"feed":"nl", +"vari":"Dynamic07", +"text":"€", +"feed":"nl", +"text":"KuNu: ", +"vari":"cunu", +"text":"MaNu: ", +"vari":"manu", +"text":"Ort: ", +"vari":"location", +"text":"Gruppe: ", +"vari":"group", +"text":"Zone: ", +"vari":"zone", +"text":"Name: ", +"vari":"alias", +"text":"Am: ", +"vari":"date us", +"text":"Um: ", +"vari":"time long", +"feed":"nl", +"text":" * * * * * * * * ", +"feed":"nl", +"feed":"nl", +"feed":"eject" +} + + From ef951b848cb4b6cfcb5eca82ba24ae17c0398721 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 28 Feb 2024 13:45:03 +0100 Subject: [PATCH 6/9] Update files as changed by thomas --- etc/psa_config/DC2C_print01.json | 21 ++++++++++----------- etc/psa_config/DC2C_print02.json | 8 ++------ etc/psa_config/DC2C_print03.json | 14 +------------- etc/psa_config/DC2C_print05.json | 21 ++++++++++----------- etc/psa_config/DC2C_print06.json | 10 +--------- etc/psa_config/DC2C_print07.json | 14 +------------- etc/psa_config/DC2C_print08.json | 2 +- 7 files changed, 26 insertions(+), 64 deletions(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index d7f3542..b589c22 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -12,22 +12,21 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", -"text":"Galtür", "feed":"nl" -"feed":"nl" -"text":"Parkschein", +"text":"Nordisches Ausbildungszentrum", "feed":"nl", +"text":" Eintritt Erwachsener", "feed":"nl", -"styl":"size 00", -"styl":"align l", -"styl":"size 00", -"text":"Parkzeit bezahlt bis: ", +"text":"bezaht: 8,00€", "feed":"nl", "styl":"size 11", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl" +"text":"am: ", +"vari":"wday deu short", +"feed":"nl", +"text":"den ", +"vari":"date ge", +"feed":"nl", +"feed":"eject" } diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json index baeb254..6a42478 100755 --- a/etc/psa_config/DC2C_print02.json +++ b/etc/psa_config/DC2C_print02.json @@ -4,12 +4,8 @@ "Version":"28.02.2024 00103", "issued":"22.01.2024 01.01", "feed":"nl", -"text":"Bezahlt: ", -"styl":"size 11", -"vari":"Dynamic07", -"text":"", -"feed":"nl", -"styl":"size 00" + + } diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json index bc42203..69f38f5 100755 --- a/etc/psa_config/DC2C_print03.json +++ b/etc/psa_config/DC2C_print03.json @@ -2,19 +2,7 @@ "title":"DC2C_pri03", "project":"NVT NAZ", "Version":"28.02.2024 00103", -"feed":"nl", -"styl":"size 00", -"text":"Automat: ", -"vari":"manu", -"feed":"nl", -"styl":"align c", -"text":"Bitte gut sichtbar", -"feed":"nl", -"text":"hinter die Scheibe", -"feed":"nl", -"text":"legen", -"feed":"nl", -"feed":"eject" +"text":""; } diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json index 5ef72fb..b9dd306 100755 --- a/etc/psa_config/DC2C_print05.json +++ b/etc/psa_config/DC2C_print05.json @@ -12,22 +12,21 @@ "styl":"align c", "feed":"margin02", "feed":"rim02", -"text":"Galtür", "feed":"nl" -"feed":"nl" -"text":"Parkschein", +"text":"Nordisches Ausbildungszentrum", "feed":"nl", +"text":" Eintritt Jugendlicher", "feed":"nl", -"styl":"size 00", -"styl":"align l", -"styl":"size 00", -"text":"Parkzeit bezahlt bis: ", +"text":"bezaht: 4,00€", "feed":"nl", "styl":"size 11", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl" +"text":"am: ", +"vari":"wday deu short", +"feed":"nl", +"text":"den ", +"vari":"date ge", +"feed":"nl", +"feed":"eject" } diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json index af02f1f..8088b04 100755 --- a/etc/psa_config/DC2C_print06.json +++ b/etc/psa_config/DC2C_print06.json @@ -2,15 +2,7 @@ "title":"DC2C_pri06", "project":"NVT NAZ", "Version":"28.02.2024 00103", -"issued":"13.11.2023 01.01", -"feed":"nl", -"text":"Bezahlt: ", -"styl":"size 11", -"vari":"Dynamic07", -"text":"", -"feed":"nl", -"styl":"size 00" - +"text":"" } diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json index 32bfe28..7cf1d18 100755 --- a/etc/psa_config/DC2C_print07.json +++ b/etc/psa_config/DC2C_print07.json @@ -2,19 +2,7 @@ "title":"DC2C_pri07", "project":"NVT NAZ", "Version":"28.02.2024 00103", -"feed":"nl", -"styl":"size 00", -"text":"Automat: ", -"vari":"manu", -"feed":"nl", -"styl":"align c", -"text":"Bitte gut sichtbar", -"feed":"nl", -"text":"hinter die Scheibe", -"feed":"nl", -"text":"legen", -"feed":"nl", -"feed":"eject" +"text":"" } diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json index 4c9715d..6ead7f8 100755 --- a/etc/psa_config/DC2C_print08.json +++ b/etc/psa_config/DC2C_print08.json @@ -2,5 +2,5 @@ "title":"DC2C_pri08", "project":"NVT NAZ", "Version":"28.02.2024 00103", -"text":""; +"text":"" } \ No newline at end of file From f9e1be4d22c088e9dae0108efa67f525d1f26ca7 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 28 Feb 2024 14:26:32 +0100 Subject: [PATCH 7/9] ATBAPP: states: ask on overpayment --- etc/atbapp/states/APP_States_744_NAZ.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/etc/atbapp/states/APP_States_744_NAZ.xml b/etc/atbapp/states/APP_States_744_NAZ.xml index 0f99adb..d3756b2 100644 --- a/etc/atbapp/states/APP_States_744_NAZ.xml +++ b/etc/atbapp/states/APP_States_744_NAZ.xml @@ -48,7 +48,7 @@ - + @@ -61,13 +61,22 @@ - + + + + + + + + + + From 0778dc04348002b5d6bdfaf9282597c15f501136 Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 28 Feb 2024 15:35:11 +0100 Subject: [PATCH 8/9] ATBAPP: update text --- etc/atbapp/text/HMI_Texte_744_NAZ.xml | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/etc/atbapp/text/HMI_Texte_744_NAZ.xml b/etc/atbapp/text/HMI_Texte_744_NAZ.xml index 0eda989..a4e921c 100644 --- a/etc/atbapp/text/HMI_Texte_744_NAZ.xml +++ b/etc/atbapp/text/HMI_Texte_744_NAZ.xml @@ -858,11 +858,11 @@ - Parkzeitende: - Parkzeitende: - Park. time ends: - Heure de fin: - Fine sosta: + + + + + @@ -886,8 +886,8 @@ - Parkschein anfordern? - Parkschein anfordern? + Ticket anfordern? + Ticket anfordern? Request Ticket? Demande billet? Richiesta biglietto. @@ -965,10 +965,10 @@ - Parkschein anfordern? + Ticket anfordern? Request Ticket? Demande billet? - Parkschein anfordern? + Ticket anfordern? @@ -1409,11 +1409,11 @@ Selezioni il tipo di pagamento - Parkende: - End of Parking time: - Fin du temps: - Parkende: - Fine sosta: + + + + + @@ -1488,11 +1488,11 @@ Prego inserire monete: - Parkende: - End of Parking time: - Fin du temps: - Parkende: - Fine sosta: + + + + + @@ -1644,11 +1644,11 @@ Prego inserire monete: - Parkende: - End of Parking time: - Fin du temps: - Parkende: - Fine sosta: + + + + + From 388ca776e06935c39382294e434917803c248c8f Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Wed, 28 Feb 2024 15:35:50 +0100 Subject: [PATCH 9/9] Ticket: fix typo --- etc/psa_config/DC2C_print01.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json index b589c22..d244115 100755 --- a/etc/psa_config/DC2C_print01.json +++ b/etc/psa_config/DC2C_print01.json @@ -17,7 +17,7 @@ "feed":"nl", "text":" Eintritt Erwachsener", "feed":"nl", -"text":"bezaht: 8,00€", +"text":"bezahlt: 8,00€", "feed":"nl", "styl":"size 11", "text":"am: ",