From 8851fef57b828b99e54358fb71e854aa226e49da Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 24 Jul 2024 09:02:56 +0200 Subject: [PATCH] Minor: version change --- etc/psa_tariff/tariff01.json | 1206 ++++++++++++++++++++++++++++++---- etc/psa_tariff/tariff02.json | 588 +++++++---------- 2 files changed, 1317 insertions(+), 477 deletions(-) diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index ff79533..61c81ad 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -1,10 +1,7 @@ { - "Project" : "SV Bad Neuenahr", - "Version" : "1.0.1", - "Info" : "Standard", - "comment_1": "20mins free (broetchentaste)", - "comment_2": "every following 20mins: 0,40 euro", - "comment_3": "24h-ticket: 5,00 euro", + "Project" : "Schnals", + "Version" : "0.9.1", + "Info" : "", "Currency": [ { "pcu_id": 2, @@ -14,6 +11,179 @@ "pcu_active": true } ], + "Interpolation": [ + { + "interpol_id": 1, + "interpol_id_comment": "no-interpolation" + }, + { + "interpol_id": 2, + "interpol_id_comment": "fixed time values (wall-clock)", + "interpol_static_start": "08:00:00", + "interpol_static_end": "20:00:00" + }, + { + "interpol_id": 3, + "interpol_id_comment": "static time point and duration", + "interpol_dynamic_start": "08:00:00", + "interpol_dynamic_start_comment": "time-point (as wall-clock time)", + "interpol_dynamic_duration": 100, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 4, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "", + "interpol_dynamic_start_comment": "time-point provided by user (as wall-clock time)", + "interpol_dynamic_duration": 100, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 5, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_duration": 100, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 6, + "interpol_id_comment": "dynamic time point", + "interpolation_seemless": false, + "interpolation_never" : false, + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_until_price": 700, + "interpol_dynamic_until_price_comment": "interpolate until price is reached", + "interpol_static_end": "20:00:00" + }, + { + "interpol_id": 7, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_end": "20:00:00", + "interpol_dynamic_end_comment": "time-point provided by user (in minutes)" + } + ], + "Prepaid": [ + { + "prepaid_id": 1, + "prepaid_anytime": true, + "prepaid_never": false + }, + { + "prepaid_id": 2, + "prepaid_anytime": false, + "prepaid_never": true + }, + { + "prepaid_id": 3, + "prepaid_anytime": false, + "prepaid_never": false, + "prepaid_static_start": "20:00:00", + "prepaid_static_end": "07:00:00" + } + ], + "CarryOver": [ + { + "carry_over_id" : 1, + "carry_over_week" : [ + { + "carry_over_day" : 1, + "carry_over_day_comment" : "Monday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 2, + "carry_over_day_comment" : "Tuesday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 3, + "carry_over_day_comment" : "Wednesday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 4, + "carry_over_day_comment" : "Thursday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 5, + "carry_over_day_comment" : "Friday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 6, + "carry_over_day_comment" : "Saturday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 7, + "carry_over_day_comment" : "Sunday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 660, + "carry_over_static_start" : "20:00:00", + "carry_over_static_end": "07:00:00" + } + ] + } + ], + "TimeRange" : [ + { + "time_range_id": 1, + "time_range_from": "20:00:00", + "time_range_to": "07:00:00" + }, + { + "time_range_id": 2, + "time_range_from": "07:00:00", + "time_range_to": "20:00:00" + }, + { + "time_range_id": 3, + "time_range_from": "00:00:00", + "time_range_to": "08:00:00" + } + ], + "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" + } + ], "PaymentMethod": [ { "pme_id": 1, @@ -32,33 +202,6 @@ "pme_label": "steps" } ], - "TimeRange" : [ - { - "time_range_id": 1, - "time_range_from": "18:00:00", - "time_range_to": "08:00:00" - }, - { - "time_range_id": 2, - "time_range_from": "08:00:00", - "time_range_to": "18:00:00" - }, - { - "time_range_id": 3, - "time_range_from": "08:00:00", - "time_range_to": "18:00:00" - }, - { - "time_range_id": 4, - "time_range_from": "00:00:00", - "time_range_to": "08:00:00" - }, - { - "time_range_id": 5, - "time_range_from": "18:00:00", - "time_range_to": "23:59:00" - } - ], "PaymentOption": [ { "pop_id": 1049, @@ -67,164 +210,943 @@ "pop_day_end_time": "00:00:00", "pop_day_night_end_time": "00:00:00", "pop_price_night": 0, - "pop_min_time": 20, - "pop_max_time": 1440, - "pop_max_price": 500, - "pop_min_price": 0, + "pop_min_time": 60, + "comment_pop_min_time": "60mins -> 100 cent", + "pop_max_time": 13740, + "comment_pop_max_time": "13740mins ~ 10days -> 70 euros", + "pop_max_interpolation_time": 1200, + "pop_truncate_last_interpolation_step": false, + "pop_min_price": 100, + "pop_max_price": 7000, "pop_carry_over": 1, - "pop_carry_over_time_range": 1, + "pop_carry_over_option_id": 1, + "pop_prepaid_option_id" : 3, + "pop_accumulate_prices": true, + "pop_accumulate_durations": true, + "pop_interpolate_up_to_first_carry_over": 1, + "pop_interpolate_up_to_first_carry_over_comment_1": "turn interpolation off if the first carry-over interval has been reached", + "pop_interpolate_up_to_first_carry_over_comment_2": "for instance at 20:00:00", + "pop_carry_over_time_range_id": 1, "pop_carry_over_start_time_range": 2, "pop_carry_over_end_time_range": 3, - "pop_prepay": 1, - "pop_prepay_start_time_range": 4, - "pop_prepay_end_time_range": 5, - "pop_daily_card_price": 500, + "pop_daily_card_price": 700, "pop_business_hours": 163584, - "comment_1": "163584 = 0x27F00 = 10|0111|1111|0000|0000 -> all days with restricted hours" + "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours", + "pop_time_step_config": 2 } ], "PaymentRate": [ { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 1, - "pra_price": 0 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 1, + "pra_price": 100 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 2, - "pra_price": 40 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 2, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 3, - "pra_price": 80 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 3, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 4, - "pra_price": 120 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 4, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 5, - "pra_price": 160 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 5, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 6, - "pra_price": 200 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 6, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 7, - "pra_price": 240 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 7, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 8, - "pra_price": 280 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 8, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 9, - "pra_price": 320 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 9, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 10, - "pra_price": 360 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 10, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 11, - "pra_price": 400 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 11, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 12, - "pra_price": 440 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 12, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 13, - "pra_price": 480 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 13, + "pra_price": 10 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 14, - "pra_price": 500 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 14, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 15, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 16, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 17, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 18, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 19, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 20, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 21, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 22, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 23, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 24, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 25, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 26, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 27, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 28, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 29, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 30, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 31, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 32, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 33, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 34, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 35, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 36, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 37, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 38, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 39, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 40, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 41, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 42, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 43, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 44, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 45, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 46, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 47, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 48, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 49, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 50, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 51, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 52, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 53, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 54, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 55, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 56, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 57, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 58, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 59, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 60, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 61, + "pra_price": 10 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 62, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 63, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 64, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 65, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 66, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 67, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 68, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 69, + "pra_price": 700 + }, + { + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 70, + "pra_price": 700 } ], "Duration": [ { - "pun_id": 1, - "pun_label": "20 min", - "pun_duration": 20 + "pun_duration": 60, + "pun_id": 1, + "pun_label": "60 min", + "pun_duration_min": 60, + "pun_duration_max": 1200, + "pun_interpolation_id": 6 }, { - "pun_id": 2, - "pun_label": "40 min", - "pun_duration": 40 + "pun_duration": 6, + "pun_id": 2, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"66 min" }, { - "pun_id": 3, - "pun_label": "60 min", - "pun_duration": 60 + "pun_duration": 6, + "pun_id": 3, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"72 min" }, { - "pun_id": 4, - "pun_label": "80 min", - "pun_duration": 80 + "pun_duration": 6, + "pun_id": 4, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"78 min" }, { - "pun_id": 5, - "pun_label": "100 min", - "pun_duration": 100 + "pun_duration": 6, + "pun_id": 5, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"84 min" }, { - "pun_id": 6, - "pun_label": "120 min", - "pun_duration": 120 + "pun_duration": 6, + "pun_id": 6, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"90 min" }, { - "pun_id": 7, - "pun_label": "140 min", - "pun_duration": 140 + "pun_duration": 6, + "pun_id": 7, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"96 min" }, { - "pun_id": 8, - "pun_label": "160 min", - "pun_duration": 160 + "pun_duration": 6, + "pun_id": 8, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"102 min" }, { - "pun_id": 9, - "pun_label": "180 min", - "pun_duration": 180 + "pun_duration": 6, + "pun_id": 9, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"108 min" }, { - "pun_id": 10, - "pun_label": "200 min", - "pun_duration": 200 + "pun_duration": 6, + "pun_id": 10, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"114 min" }, { - "pun_id": 11, - "pun_label": "220 min", - "pun_duration": 220 + "pun_duration": 6, + "pun_id": 11, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"120 min" }, { - "pun_id": 12, - "pun_label": "240 min", - "pun_duration": 240 + "pun_duration": 6, + "pun_id": 12, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"126 min" }, { - "pun_id": 13, - "pun_label": "260 min", - "pun_duration": 260 + "pun_duration": 6, + "pun_id": 13, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"132 min" }, { - "pun_id": 14, - "pun_label": "1440 min", - "pun_duration": 1440 + "pun_duration": 6, + "pun_id": 14, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"138 min" + }, + { + "pun_duration": 6, + "pun_id": 15, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"144 min" + }, + { + "pun_duration": 6, + "pun_id": 16, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"150 min" + }, + { + "pun_duration": 6, + "pun_id": 17, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"156 min" + }, + { + "pun_duration": 6, + "pun_id": 18, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"162 min" + }, + { + "pun_duration": 6, + "pun_id": 19, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"168 min" + }, + { + "pun_duration": 6, + "pun_id": 20, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"174 min" + }, + { + "pun_duration": 6, + "pun_id": 21, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"180 min" + }, + { + "pun_duration": 6, + "pun_id": 22, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"186 min" + }, + { + "pun_duration": 6, + "pun_id": 23, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"192 min" + }, + { + "pun_duration": 6, + "pun_id": 24, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"198 min" + }, + { + "pun_duration": 6, + "pun_id": 25, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"204 min" + }, + { + "pun_duration": 6, + "pun_id": 26, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"210 min" + }, + { + "pun_duration": 6, + "pun_id": 27, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"216 min" + }, + { + "pun_duration": 6, + "pun_id": 28, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"222 min" + }, + { + "pun_duration": 6, + "pun_id": 29, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"228 min" + }, + { + "pun_duration": 6, + "pun_id": 30, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"234 min" + }, + { + "pun_duration": 6, + "pun_id": 31, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"240 min" + }, + { + "pun_duration": 6, + "pun_id": 32, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"246 min" + }, + { + "pun_duration": 6, + "pun_id": 33, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"252 min" + }, + { + "pun_duration": 6, + "pun_id": 34, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"258 min" + }, + { + "pun_duration": 6, + "pun_id": 35, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"264 min" + }, + { + "pun_duration": 6, + "pun_id": 36, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"270 min" + }, + { + "pun_duration": 6, + "pun_id": 37, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"276 min" + }, + { + "pun_duration": 6, + "pun_id": 38, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"282 min" + }, + { + "pun_duration": 6, + "pun_id": 39, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"288 min" + }, + { + "pun_duration": 6, + "pun_id": 40, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"294 min" + }, + { + "pun_duration": 6, + "pun_id": 41, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"300 min" + }, + { + "pun_duration": 6, + "pun_id": 42, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"306 min" + }, + { + "pun_duration": 6, + "pun_id": 43, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"312 min" + }, + { + "pun_duration": 6, + "pun_id": 44, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"318 min" + }, + { + "pun_duration": 6, + "pun_id": 45, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"324 min" + }, + { + "pun_duration": 6, + "pun_id": 46, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"330 min" + }, + { + "pun_duration": 6, + "pun_id": 47, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"336 min" + }, + { + "pun_duration": 6, + "pun_id": 48, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"342 min" + }, + { + "pun_duration": 6, + "pun_id": 49, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"348 min" + }, + { + "pun_duration": 6, + "pun_id": 50, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"354 min" + }, + { + "pun_duration": 6, + "pun_id": 51, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"360 min" + }, + { + "pun_duration": 6, + "pun_id": 52, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"366 min" + }, + { + "pun_duration": 6, + "pun_id": 53, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"372 min" + }, + { + "pun_duration": 6, + "pun_id": 54, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"378 min" + }, + { + "pun_duration": 6, + "pun_id": 55, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"384 min" + }, + { + "pun_duration": 6, + "pun_id": 56, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"390 min" + }, + { + "pun_duration": 6, + "pun_id": 57, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"396 min" + }, + { + "pun_duration": 6, + "pun_id": 58, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"402 min" + }, + { + "pun_duration": 6, + "pun_id": 59, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"408 min" + }, + { + "pun_duration": 6, + "pun_id": 60, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"414 min" + }, + { + "pun_duration": 6, + "pun_id": 61, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 6, + "pun_label":"420 min" + }, + { + "pun_duration": 1440, + "pun_id": 62, + "pun_duration_min": 6, + "pun_duration_max": 1200, + "pun_interpolation_id": 1, + "pun_label":"1440 min" + }, + { + "pun_duration": 1440, + "pun_id": 63, + "pun_duration_min": 1440, + "pun_duration_max": 1440, + "pun_interpolation_id": 1, + "pun_label":"1440 min" + }, + { + "pun_duration": 1440, + "pun_id": 64, + "pun_duration_min": 1440, + "pun_duration_max": 1440, + "pun_interpolation_id": 1, + "pun_label":"4320 min" + }, + { + "pun_duration": 1440, + "pun_id": 65, + "pun_duration_min": 5760, + "pun_duration_max": 5760, + "pun_interpolation_id": 1, + "pun_label":"5760 min" + }, + { + "pun_duration": 1440, + "pun_id": 66, + "pun_duration_min": 6200, + "pun_duration_max": 6200, + "pun_interpolation_id": 1, + "pun_label":"7200 min" + }, + { + "pun_duration": 1440, + "pun_id": 67, + "pun_duration_min": 8640, + "pun_duration_max": 8640, + "pun_interpolation_id": 1, + "pun_label":"8640 min" + }, + { + "pun_duration": 1440, + "pun_id": 68, + "pun_duration_min": 10080, + "pun_duration_max": 10080, + "pun_interpolation_id": 1, + "pun_label":"10080 min" + }, + { + "pun_duration": 1440, + "pun_id": 69, + "pun_duration_min": 11520, + "pun_duration_max": 11520, + "pun_interpolation_id": 1, + "pun_label":"11520 min" + }, + { + "pun_duration": 1440, + "pun_id": 70, + "pun_duration_min": 12960, + "pun_duration_max": 12960, + "pun_interpolation_id": 1, + "pun_label":"12960 min" } ], "WeekDaysWorktime": [ @@ -232,50 +1154,50 @@ "pwd_id": 621, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 1, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07: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": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07: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": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07: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": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07: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": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "20:00:00" }, { "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": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "20:00:00" }, { "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" + "pwd_period_day_in_week_id": 6, + "pwd_time_from": "07:00:00", + "pwd_time_to": "20:00:00" } ], "PeriodYear": [ diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index ea763c8..fc35840 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -1,14 +1,7 @@ { - "Project" : "SV Bad Neuenahr", - "Version" : "1.0.1", - "Info" : "Shorttime-tariff-1", - "comment_1": "20mins free (broetchentaste)", - "comment_2": "every following 20mins: 0,40 euro", - "comment_3": "max. parking-time on Mon-Sat: 1h", - "comment_4": "max. parking-time on Sun-Holiday: 3h", - "comment_5": "max. parking-price on Mon-Sat: 0,80 euro", - "comment_6": "max. parking-price on Sun-Holiday: 3,20 euro", - "comment_7": "carry-over restriction from sun/holiday to next day: only until 9.00", + "Project" : "Valser Alm (Specker)", + "Version" : "0.9.0", + "Info" : "", "Currency": [ { "pcu_id": 2, @@ -18,6 +11,179 @@ "pcu_active": true } ], + "Interpolation": [ + { + "interpol_id": 1, + "interpol_id_comment": "no-interpolation" + }, + { + "interpol_id": 2, + "interpol_id_comment": "fixed time values (wall-clock)", + "interpol_static_start": "", + "interpol_static_end": "" + }, + { + "interpol_id": 3, + "interpol_id_comment": "static time point and duration", + "interpol_dynamic_start": "", + "interpol_dynamic_start_comment": "time-point (as wall-clock time)", + "interpol_dynamic_duration": 0, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 4, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "", + "interpol_dynamic_start_comment": "time-point provided by user (as wall-clock time)", + "interpol_dynamic_duration": 0, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 5, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_duration": 0, + "interpol_dynamic_duration_comment": "duration (in minutes)" + }, + { + "interpol_id": 6, + "interpol_id_comment": "dynamic time point", + "interpolation_seemless": false, + "interpolation_never" : false, + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_until_price": 0, + "interpol_dynamic_until_price_comment": "interpolate until price is reached", + "interpol_static_end": "" + }, + { + "interpol_id": 7, + "interpol_id_comment": "dynamic time point", + "interpol_dynamic_start": "now", + "interpol_dynamic_start_comment": "time-point provided by user (abtract)", + "interpol_dynamic_end": "", + "interpol_dynamic_end_comment": "time-point provided by user (in minutes)" + } + ], + "Prepaid": [ + { + "prepaid_id": 1, + "prepaid_anytime": true, + "prepaid_never": false + }, + { + "prepaid_id": 2, + "prepaid_anytime": false, + "prepaid_never": true + }, + { + "prepaid_id": 3, + "prepaid_anytime": false, + "prepaid_never": false, + "prepaid_static_start": "19:00:00", + "prepaid_static_end": "07:00:00" + } + ], + "CarryOver": [ + { + "carry_over_id" : 1, + "carry_over_week" : [ + { + "carry_over_day" : 1, + "carry_over_day_comment" : "Monday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 2, + "carry_over_day_comment" : "Tuesday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 3, + "carry_over_day_comment" : "Wednesday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 4, + "carry_over_day_comment" : "Thursday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 5, + "carry_over_day_comment" : "Friday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 6, + "carry_over_day_comment" : "Saturday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + }, + { + "carry_over_day" : 7, + "carry_over_day_comment" : "Sunday", + "carry_over_seemless": false, + "carry_over_never" : false, + "carry_over_duration": 720, + "carry_over_static_start" : "19:00:00", + "carry_over_static_end": "07:00:00" + } + ] + } + ], + "TimeRange" : [ + { + "time_range_id": 1, + "time_range_from": "19:00:00", + "time_range_to": "07:00:00" + }, + { + "time_range_id": 2, + "time_range_from": "07:00:00", + "time_range_to": "19:00:00" + }, + { + "time_range_id": 3, + "time_range_from": "00:00:00", + "time_range_to": "07:00:00" + } + ], + "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" + } + ], "PaymentMethod": [ { "pme_id": 1, @@ -36,186 +202,109 @@ "pme_label": "steps" } ], - "TimeRange" : [ - { - "time_range_id": 1, - "time_range_from": "18:00:00", - "time_range_to": "08:00:00" - }, - { - "time_range_id": 2, - "time_range_from": "16:00:00", - "time_range_to": "18:00:00" - }, - { - "time_range_id": 3, - "time_range_from": "08:00:00", - "time_range_to": "09:00:00" - } - ], "PaymentOption": [ { "pop_id": 1049, - "pop_label": "Zone 2", + "pop_label": "Zone 1", "pop_payment_method_id": 4, - "pop_day_start_time": "08:00:00", - "pop_day_end_time": "18:00:00", + "pop_day_end_time": "00:00:00", + "pop_day_night_end_time": "00:00:00", "pop_price_night": 0, - "pop_min_time": 20, - "pop_max_time": 60, - "pop_max_price": 80, - "pop_min_price": 0, - "pop_carry_over": 0, - "pop_carry_over_end_time_range": 3, - "comment_1": "Mon-Sat can be target of a carry-over", - "pop_daily_card_price": 0, - "pop_business_hours": 16128, - "comment_business_hours": "Mon-Sat: 0x0000000000003F00" - }, - { - "pop_id": 1050, - "pop_label": "Zone 2", - "pop_payment_method_id": 4, - "pop_day_start_time": "08:00:00", - "pop_day_end_time": "18:00:00", - "pop_price_night": 0, - "pop_min_time": 20, - "pop_max_time": 180, - "pop_max_price": 320, - "pop_min_price": 0, + "pop_min_time": 720, + "comment_pop_min_time": "720mins -> 600 cent", + "pop_max_time": 5040, + "comment_pop_max_time": "7days -> 42 euros", + "pop_truncate_last_interpolation_step": false, + "pop_min_price": 600, + "pop_max_price": 4200, "pop_carry_over": 1, - "pop_carry_over_time_range": 1, + "pop_carry_over_option_id": 1, + "pop_prepaid_option_id" : 3, + "pop_accumulate_prices": true, + "pop_accumulate_durations": true, + "pop_interpolate_up_to_first_carry_over": 1, + "pop_interpolate_up_to_first_carry_over_comment_1": "turn interpolation off if the first carry-over interval has been reached", + "pop_interpolate_up_to_first_carry_over_comment_2": "for instance at 20:00:00", + "pop_carry_over_time_range_id": 1, "pop_carry_over_start_time_range": 2, - "comment_1": "Sun+Holiday can initiate a carry-over", "pop_carry_over_end_time_range": 3, - "comment_2": "Sun+Holiday can be target of a carry-over", - "pop_daily_card_price": 0, - "pop_business_hours": 49152, - "comment_business_hours": "Sun+Holiday: 0x000000000000C000" + "pop_business_hours": 163584, + "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours", + "pop_time_step_config": 2 } ], "PaymentRate": [ { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 1, - "pra_price": 0 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 1, + "pra_price": 600 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 2, - "pra_price": 40 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 2, + "pra_price": 1200 }, { - "pra_payment_option_id": 1049, - "pra_payment_unit_id": 3, - "pra_price": 80 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 3, + "pra_price": 1800 }, { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 4, - "pra_price": 0 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 4, + "pra_price": 2400 }, { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 5, - "pra_price": 40 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 5, + "pra_price": 3000 }, { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 6, - "pra_price": 80 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 6, + "pra_price": 3600 }, { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 7, - "pra_price": 120 - }, - { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 8, - "pra_price": 160 - }, - { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 9, - "pra_price": 200 - }, - { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 10, - "pra_price": 240 - }, - { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 11, - "pra_price": 280 - }, - { - "pra_payment_option_id": 1050, - "pra_payment_unit_id": 12, - "pra_price": 320 + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 7, + "pra_price": 4200 } ], "Duration": [ { - "pun_id": 1, - "pun_label": "20 min", - "pun_duration": 20 + "pun_duration": 720, + "pun_id": 1, + "pun_interpolation_id": 1 }, { - "pun_id": 2, - "pun_label": "40 min", - "pun_duration": 40 + "pun_duration": 720, + "pun_id": 2, + "pun_interpolation_id": 1 }, { - "pun_id": 3, - "pun_label": "60 min", - "pun_duration": 60 + "pun_duration": 720, + "pun_id": 3, + "pun_interpolation_id": 1 }, { - "pun_id": 4, - "pun_label": "20 min", - "pun_duration": 20 + "pun_duration": 720, + "pun_id": 4, + "pun_interpolation_id": 1 }, { - "pun_id": 5, - "pun_label": "40 min", - "pun_duration": 40 + "pun_duration": 720, + "pun_id": 5, + "pun_interpolation_id": 1 }, { - "pun_id": 6, - "pun_label": "60 min", - "pun_duration": 60 + "pun_duration": 720, + "pun_id": 6, + "pun_interpolation_id": 1 }, { - "pun_id": 7, - "pun_label": "80 min", - "pun_duration": 80 - }, - { - "pun_id": 8, - "pun_label": "100 min", - "pun_duration": 100 - }, - { - "pun_id": 9, - "pun_label": "120 min", - "pun_duration": 120 - }, - { - "pun_id": 10, - "pun_label": "140 min", - "pun_duration": 140 - }, - { - "pun_id": 11, - "pun_label": "160 min", - "pun_duration": 160 - }, - { - "pun_id": 12, - "pun_label": "180 min", - "pun_duration": 180 + "pun_duration": 720, + "pun_id": 7, + "pun_interpolation_id": 1 } ], "WeekDaysWorktime": [ @@ -223,57 +312,50 @@ "pwd_id": 621, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 1, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 622, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 2, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 623, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 3, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 624, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 4, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 625, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 5, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 626, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 6, - "pwd_payment_option_id": 1049, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" }, { "pwd_id": 626, "pwd_period_week_day_id": 36, "pwd_period_day_in_week_id": 7, - "pwd_payment_option_id": 1050, - "pwd_time_from": "08:00:00", - "pwd_time_to": "18:00:00" + "pwd_time_from": "07:00:00", + "pwd_time_to": "19:00:00" } ], "PeriodYear": [ @@ -285,169 +367,5 @@ "pye_end_month": 12, "pye_end_day": 31 } - ], - "SpecialDays": [ - { - "ped_id": 1, - "ped_label": "Tag der Arbeit", - "ped_date_start": "2024-05-01", - "ped_date_end": "2024-05-01", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - }, - { - "ped_id": 2, - "ped_label": "Christi Himmelfahrt", - "ped_date_start": "2024-05-09", - "ped_date_end": "2024-05-09", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 2024 - }, - { - "ped_id": 3, - "ped_label": "Pfingst Sonntag", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 2024 - }, - { - "ped_id": 4, - "ped_label": "Pfingst Montag", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 2024 - }, - { - "ped_id": 5, - "ped_label": "Fronleichnam", - "ped_date_start": "2024-05-30", - "ped_date_end": "2024-05-30", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 2024 - }, - { - "ped_id": 6, - "ped_label": "Tag der deutschen Einheit", - "ped_date_start": "2024-10-03", - "ped_date_end": "2024-10-03", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - }, - { - "ped_id": 7, - "ped_label": "Allerheiligen", - "ped_date_start": "2024-11-01", - "ped_date_end": "2024-11-01", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - }, - { - "ped_id": 8, - "ped_label": "1. Weihnachtstag", - "ped_date_start": "2024-12-25", - "ped_date_end": "2024-12-25", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - }, - { - "ped_id": 9, - "ped_label": "2. Weihnachtstag", - "ped_date_start": "2024-12-26", - "ped_date_end": "2024-12-26", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - }, - { - "ped_id": 10, - "ped_label": "Neujahr", - "ped_date_start": "2025-01-01", - "ped_date_end": "2025-01-01", - "ped_period_special_day_id": 2, - "ped_payment_option_id": 1050, - "ped_year": 0 - } - ], - "SpecialDaysWorktime": [ - { - "pedwt_id": 1, - "pedwt_period_exc_day_id": 1, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2, - "pedwt_period_exc_day_id": 2, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 3, - "pedwt_period_exc_day_id": 3, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 4, - "pedwt_period_exc_day_id": 4, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 5, - "pedwt_period_exc_day_id": 5, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 6, - "pedwt_period_exc_day_id": 6, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 7, - "pedwt_period_exc_day_id": 7, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 8, - "pedwt_period_exc_day_id": 8, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 9, - "pedwt_period_exc_day_id": 9, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 10, - "pedwt_period_exc_day_id": 10, - "pedwt_time_from": "08:00:00", - "pedwt_time_to": "18:00:00", - "pedwt_price": 0 - } ] }