From acf799da7e4509f56bb1699e54218ed8f1dad11b Mon Sep 17 00:00:00 2001 From: Siegfried Siegert Date: Mon, 15 May 2023 16:58:28 +0200 Subject: [PATCH 1/8] Add explaining comments --- library/src/calculate_price.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/src/calculate_price.cpp b/library/src/calculate_price.cpp index b833824..5945b9f 100644 --- a/library/src/calculate_price.cpp +++ b/library/src/calculate_price.cpp @@ -191,9 +191,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket( if (start_parking_time.isValid()) { QString cs = start_parking_time.toString(Qt::ISODate); double cost = calculator.GetCostFromDuration( - tariff, PaymentOption::Option1, - cs.toLocal8Bit().constData(), - duration, false, true); + tariff, PaymentOption::Option1, + cs.toLocal8Bit().constData(), // starting time + duration, false, true); // duration, minutes, netto double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price; if (cost < minCost) { calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost)); From 7bd7f666662988b1fa7587d8839bb5d776e06096 Mon Sep 17 00:00:00 2001 From: Moran Rod Date: Wed, 17 May 2023 10:08:02 +0200 Subject: [PATCH 2/8] Fixed pra_payment_unit_id --- library/include/mobilisis/utilities.h | 2 +- library/src/calculator_functions.cpp | 22 ++++++++++++++++------ library/src/configuration.cpp | 2 +- library/src/utilities.cpp | 7 +++++-- main/main.cpp | 2 +- 5 files changed, 24 insertions(+), 11 deletions(-) diff --git a/library/include/mobilisis/utilities.h b/library/include/mobilisis/utilities.h index 74dad3f..09de817 100644 --- a/library/include/mobilisis/utilities.h +++ b/library/include/mobilisis/utilities.h @@ -68,6 +68,6 @@ public: /// /// /// - static double CalculatePricePerUnit(double pra_price); + static double CalculatePricePerUnit(double pra_price, double durationUnit = -1); }; diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index af86222..8fdef0d 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -177,8 +177,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, else { // Set new price for the normal day - day_price = cfg->PaymentRate.find(payment_option)->second.pra_price; - price_per_unit = Utilities::CalculatePricePerUnit(day_price); + int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id; + day_price = cfg->PaymentRate.find(pop_id)->second.pra_price; + + int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id; + double durationUnit = cfg->Duration.find(durationId)->second.pun_duration; + price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit); // If no working day found, skip it (recursively call method again) size_t found = 0; @@ -410,8 +414,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio else { // Set new price for the normal day - day_price = cfg->PaymentRate.find(payment_option)->second.pra_price; - price_per_unit = Utilities::CalculatePricePerUnit(day_price); + + int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id; + day_price = cfg->PaymentRate.find(pop_id)->second.pra_price; + + int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id; + double durationUnit = cfg->Duration.find(durationId)->second.pun_duration; + price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit); // If no working day found, skip it (recursively call method again) size_t found = 0; @@ -506,11 +515,12 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio return 0.0f; } + int carry_over_status = 0; + carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over; + // Go to next day if minutes not spent if(inputDate.time() >= worktime_to) { - int carry_over_status = 0; - carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over; if (carry_over_status < 1) break; LOG_DEBUG("Reached end of worktime, searching for the next working day"); diff --git a/library/src/configuration.cpp b/library/src/configuration.cpp index 70e61c7..ea5f587 100644 --- a/library/src/configuration.cpp +++ b/library/src/configuration.cpp @@ -210,7 +210,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json) cfg->PaymentMethod.insert(pair(PaymentMethod.pme_id, PaymentMethod)); break; case MemberType::PaymentRateType: - cfg->PaymentRate.insert(pair(PaymentRate.pra_payment_unit_id, PaymentRate)); + cfg->PaymentRate.insert(pair(PaymentRate.pra_payment_option_id, PaymentRate)); break; case MemberType::PaymentOptionType: cfg->PaymentOption.insert(pair(PaymentOption.pop_payment_method_id, PaymentOption)); diff --git a/library/src/utilities.cpp b/library/src/utilities.cpp index 48cf880..cb5d896 100644 --- a/library/src/utilities.cpp +++ b/library/src/utilities.cpp @@ -8,12 +8,15 @@ static int protection_counter = 0; /// /// /// -double Utilities::CalculatePricePerUnit(double pra_price) +double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit) { try { double price_per_unit = pra_price; - price_per_unit /= 60.0f; // Divided by 60 because price per unit is set per hour and we are using minutes + double unit = durationUnit; + + if(unit < 0 || unit > 65535 ) unit = 60.0f; + price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes //printf("Price per unit (min) is: %lf\n", price_per_unit); return price_per_unit; } diff --git a/main/main.cpp b/main/main.cpp index f294005..0952851 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -35,7 +35,7 @@ int main() { memset(&price, 0x00, sizeof(price)); QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime(); time_t start_parking_time = start.toSecsSinceEpoch() / 60; - time_t end_parking_time = start_parking_time + 1230; + time_t end_parking_time = start_parking_time + 615; if (compute_price_for_parking_ticket(tariff, start_parking_time, From 6157861d6236b4068383558e5b8d2f8e976f89e6 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 12:11:09 +0200 Subject: [PATCH 3/8] Monday starts with 1 --- library/include/mobilisis/day_of_week.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/library/include/mobilisis/day_of_week.h b/library/include/mobilisis/day_of_week.h index 8f34909..ab5262b 100644 --- a/library/include/mobilisis/day_of_week.h +++ b/library/include/mobilisis/day_of_week.h @@ -2,12 +2,12 @@ enum DayOfWeek { - Saturday = 0x06, - Sunday = 0x01, - Monday = 0x02, - Tuesday = 0x02, - Wednesday = 0x03, - Thursday = 0x04, - Friday = 0x05, - UndefinedDay = 0xFF -}; \ No newline at end of file + Monday = 0x01, + Tuesday = 0x02, + Wednesday = 0x03, + Thursday = 0x04, + Friday = 0x05, + Saturday = 0x06, + Sunday = 0x07, + UndefinedDay = 0xFF +}; From eefdde469343da04c8f2eece8a8305cee2377fba Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 12:12:23 +0200 Subject: [PATCH 4/8] Removed section whith superfluous 'price_per_unit < 0' check. Removed calc_price-caculation followed by shift of inputDate. --- library/src/calculator_functions.cpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 39dbec8..5f0251e 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -201,16 +201,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, if (price_per_unit < 0) price_per_unit = 1.0f; - if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED"; + // if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED"; LOG_DEBUG("Calculated price per minute: ", price_per_unit); - if (price_per_unit < 0) - { - inputDate = inputDate.addDays(1); - inputDate.setTime(worktime_from); - return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true); - } - // If overtime flag is set if (overtime || nextDay) { @@ -314,12 +307,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg, // } double ret_val = 0; - double calc_price = (int)total_duration_min - (int)price / price_per_unit; + // double calc_price = (int)total_duration_min - (int)price / price_per_unit; - if (calc_price > 0 && total_duration_min > 0) - { - inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60); - } + //if (calc_price > 0 && total_duration_min > 0) + //{ + // inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60); + //} if(price >= min_price && total_duration_min >= minMin) qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate); From 8b4d64bd0c34ac074cff0f801a604fb3cbb44cf4 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 13:31:42 +0200 Subject: [PATCH 5/8] max_time=300, unit_id=1 --- tariffs/tariff01.json | 624 +++++++++++++++++++++++++++--------------- 1 file changed, 397 insertions(+), 227 deletions(-) diff --git a/tariffs/tariff01.json b/tariffs/tariff01.json index d708b2b..b3155a3 100644 --- a/tariffs/tariff01.json +++ b/tariffs/tariff01.json @@ -28,14 +28,14 @@ ], "PaymentOption": [ { - "pop_id": 17, - "pop_label": "Zone 1", + "pop_id": 1049, + "pop_label": "Zone Lila", "pop_payment_method_id": 3, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "16:25:00", + "pop_day_night_end_time": "16:25:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 10000, + "pop_max_time": 300, "pop_min_price": 0, "pop_carry_over": 1, "pop_daily_card_price": 900 @@ -43,8 +43,8 @@ ], "PaymentRate": [ { - "pra_payment_option_id": 17, - "pra_payment_unit_id": 3, + "pra_payment_option_id": 1049, + "pra_payment_unit_id": 1, "pra_price": 150 } ], @@ -54,11 +54,6 @@ "pun_label": "1h", "pun_duration": 60 }, - { - "pun_id": 2, - "pun_label": "1 min", - "pun_duration": 1 - }, { "pun_id": 3, "pun_label": "15 min", @@ -66,72 +61,42 @@ }, { "pun_id": 4, - "pun_label": "1d", - "pun_duration": 1440 - }, - { - "pun_id": 6, - "pun_label": "2h", - "pun_duration": 120 - }, - { - "pun_id": 7, - "pun_label": "3h", - "pun_duration": 180 - }, - { - "pun_id": 11, - "pun_label": "4h", - "pun_duration": 240 - }, - { - "pun_id": 17, - "pun_label": "30 min", - "pun_duration": 30 - }, - { - "pun_id": 18, - "pun_label": "1.5h", - "pun_duration": 90 - }, - { - "pun_id": 20, - "pun_label": "10min", - "pun_duration": 10 + "pun_label": "1 min", + "pun_duration": 1 } ], "WeekDaysWorktime": [ { - "pwd_id": 540, - "pwd_period_week_day_id": 32, + "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_id": 541, - "pwd_period_week_day_id": 32, + "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_id": 542, - "pwd_period_week_day_id": 32, + "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_id": 543, - "pwd_period_week_day_id": 32, + "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_id": 544, - "pwd_period_week_day_id": 32, + "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" @@ -139,23 +104,63 @@ ], "PeriodYear": [ { - "pye_id": 1, - "pye_label": "Summer", - "pye_start_month": 6, + "pye_id": 8, + "pye_label": "Whole year", + "pye_start_month": 1, "pye_start_day": 1, - "pye_end_month": 9, - "pye_end_day": 30 - }, - { - "pye_id": 2, - "pye_label": "Winter", - "pye_start_month": 10, - "pye_start_day": 1, - "pye_end_month": 5, + "pye_end_month": 12, "pye_end_day": 31 }, { - "pye_id": 8, + "pye_id": 9, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 10, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 11, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 12, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 13, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 14, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 15, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -241,34 +246,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2180, - "pedwt_period_exc_day_id": 2017, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2181, - "pedwt_period_exc_day_id": 2018, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2182, - "pedwt_period_exc_day_id": 2019, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2183, - "pedwt_period_exc_day_id": 2020, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2184, "pedwt_period_exc_day_id": 2021, @@ -276,13 +253,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2185, - "pedwt_period_exc_day_id": 2023, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2188, "pedwt_period_exc_day_id": 2031, @@ -304,20 +274,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2196, - "pedwt_period_exc_day_id": 2035, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2198, - "pedwt_period_exc_day_id": 2036, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2200, "pedwt_period_exc_day_id": 2037, @@ -332,54 +288,180 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2219, - "pedwt_period_exc_day_id": 2041, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2220, - "pedwt_period_exc_day_id": 2042, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2221, - "pedwt_period_exc_day_id": 2043, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2222, - "pedwt_period_exc_day_id": 2044, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2223, - "pedwt_period_exc_day_id": 2045, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "01:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2224, - "pedwt_period_exc_day_id": 2046, - "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 + }, + { + "pedwt_id": 2260, + "pedwt_period_exc_day_id": 2061, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2261, + "pedwt_period_exc_day_id": 2062, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2262, + "pedwt_period_exc_day_id": 2063, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2263, + "pedwt_period_exc_day_id": 2064, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2264, + "pedwt_period_exc_day_id": 2065, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2265, + "pedwt_period_exc_day_id": 2066, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2266, + "pedwt_period_exc_day_id": 2067, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2267, + "pedwt_period_exc_day_id": 2068, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2268, + "pedwt_period_exc_day_id": 2069, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2269, + "pedwt_period_exc_day_id": 2070, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2270, + "pedwt_period_exc_day_id": 2071, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 } ], "SpecialDays": [ @@ -415,38 +497,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2017, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-27", - "ped_date_end": "2022-12-27", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2018, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-28", - "ped_date_end": "2022-12-28", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2019, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-29", - "ped_date_end": "2022-12-29", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2020, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-30", - "ped_date_end": "2022-12-30", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2021, "ped_label": "Holiday (Hungary)", @@ -463,14 +513,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2023, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2023-01-02", - "ped_date_end": "2023-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, { "ped_id": 2024, "ped_label": "Good Friday", @@ -557,7 +599,7 @@ "ped_date_start": "2024-03-31", "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2036, @@ -565,7 +607,7 @@ "ped_date_start": "2024-04-01", "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2037, @@ -584,52 +626,180 @@ "ped_year": 2024 }, { - "ped_id": 2041, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-27", - "ped_date_end": "2024-12-27", + "ped_id": 2050, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2042, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-28", - "ped_date_end": "2024-12-28", + "ped_id": 2051, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2043, + "ped_id": 2052, + "ped_label": "Christmas 1st day", + "ped_date_start": "2022-12-25", + "ped_date_end": "2022-12-25", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2053, + "ped_label": "Christmas 2nd day", + "ped_date_start": "2022-12-26", + "ped_date_end": "2022-12-26", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2054, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2055, + "ped_label": "Christmas (Sunday)", + "ped_date_start": "2022-12-24", + "ped_date_end": "2022-12-24", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2056, "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-29", - "ped_date_end": "2024-12-29", + "ped_date_start": "2022-12-31", + "ped_date_end": "2022-12-31", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2044, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-30", - "ped_date_end": "2024-12-30", - "ped_period_special_day_id": 1, + "ped_id": 2057, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2045, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-31", - "ped_date_end": "2024-12-31", - "ped_period_special_day_id": 1, + "ped_id": 2058, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2059, + "ped_label": "Easter Sunday", + "ped_date_start": "2023-04-09", + "ped_date_end": "2023-04-09", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2060, + "ped_label": "Easter Monday", + "ped_date_start": "2023-04-10", + "ped_date_end": "2023-04-10", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2061, + "ped_label": "Whit Sunday", + "ped_date_start": "2023-05-28", + "ped_date_end": "2023-05-28", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2062, + "ped_label": "Whit Monday", + "ped_date_start": "2023-05-29", + "ped_date_end": "2023-05-29", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2063, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2046, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2025-01-02", - "ped_date_end": "2025-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2025 + "ped_id": 2064, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2065, + "ped_label": "Saint Stephens Day (Hungary)", + "ped_date_start": "2023-08-20", + "ped_date_end": "2023-08-20", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2066, + "ped_label": "All Saints Day", + "ped_date_start": "2023-11-01", + "ped_date_end": "2023-11-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2067, + "ped_label": "Good Friday", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2068, + "ped_label": "Easter", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2069, + "ped_label": "Easter Monday", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2070, + "ped_label": "Whit Monday", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2071, + "ped_label": "Whit Sunday", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 2, + "ped_year": 2024 } ] } From 7bab9d6ba2a7079c79558fd172e481f05962d8b8 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 13:32:08 +0200 Subject: [PATCH 6/8] max_time=300, unit_id=1 --- tariffs/tariff02.json | 631 +++++++++++++++++++++++++++--------------- 1 file changed, 401 insertions(+), 230 deletions(-) diff --git a/tariffs/tariff02.json b/tariffs/tariff02.json index ad23be1..1608191 100644 --- a/tariffs/tariff02.json +++ b/tariffs/tariff02.json @@ -28,23 +28,24 @@ ], "PaymentOption": [ { - "pop_id": 22, - "pop_label": "Zone 2", + "pop_id": 1050, + "pop_label": "Zone Blau", "pop_payment_method_id": 3, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "16:27:00", + "pop_day_night_end_time": "16:27:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 240, - "pop_min_price": 120, - "pop_carry_over": 1 + "pop_max_time": 300, + "pop_min_price": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 1320 } ], "PaymentRate": [ { - "pra_payment_option_id": 22, - "pra_payment_unit_id": 3, - "pra_price": 480 + "pra_payment_option_id": 1050, + "pra_payment_unit_id": 1, + "pra_price": 230 } ], "Duration": [ @@ -53,11 +54,6 @@ "pun_label": "1h", "pun_duration": 60 }, - { - "pun_id": 2, - "pun_label": "1 min", - "pun_duration": 1 - }, { "pun_id": 3, "pun_label": "15 min", @@ -65,72 +61,42 @@ }, { "pun_id": 4, - "pun_label": "1d", - "pun_duration": 1440 - }, - { - "pun_id": 6, - "pun_label": "2h", - "pun_duration": 120 - }, - { - "pun_id": 7, - "pun_label": "3h", - "pun_duration": 180 - }, - { - "pun_id": 11, - "pun_label": "4h", - "pun_duration": 240 - }, - { - "pun_id": 17, - "pun_label": "30 min", - "pun_duration": 30 - }, - { - "pun_id": 18, - "pun_label": "1.5h", - "pun_duration": 90 - }, - { - "pun_id": 20, - "pun_label": "10min", - "pun_duration": 10 + "pun_label": "1 min", + "pun_duration": 1 } ], "WeekDaysWorktime": [ { - "pwd_id": 540, - "pwd_period_week_day_id": 32, + "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_id": 541, - "pwd_period_week_day_id": 32, + "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_id": 542, - "pwd_period_week_day_id": 32, + "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_id": 543, - "pwd_period_week_day_id": 32, + "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_id": 544, - "pwd_period_week_day_id": 32, + "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" @@ -138,23 +104,63 @@ ], "PeriodYear": [ { - "pye_id": 1, - "pye_label": "Summer", - "pye_start_month": 6, + "pye_id": 8, + "pye_label": "Whole year", + "pye_start_month": 1, "pye_start_day": 1, - "pye_end_month": 9, - "pye_end_day": 30 - }, - { - "pye_id": 2, - "pye_label": "Winter", - "pye_start_month": 10, - "pye_start_day": 1, - "pye_end_month": 5, + "pye_end_month": 12, "pye_end_day": 31 }, { - "pye_id": 8, + "pye_id": 9, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 10, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 11, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 12, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 13, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 14, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 15, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -240,34 +246,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2180, - "pedwt_period_exc_day_id": 2017, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2181, - "pedwt_period_exc_day_id": 2018, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2182, - "pedwt_period_exc_day_id": 2019, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2183, - "pedwt_period_exc_day_id": 2020, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2184, "pedwt_period_exc_day_id": 2021, @@ -275,13 +253,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2185, - "pedwt_period_exc_day_id": 2023, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2188, "pedwt_period_exc_day_id": 2031, @@ -303,20 +274,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2196, - "pedwt_period_exc_day_id": 2035, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2198, - "pedwt_period_exc_day_id": 2036, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2200, "pedwt_period_exc_day_id": 2037, @@ -331,54 +288,180 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2219, - "pedwt_period_exc_day_id": 2041, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2220, - "pedwt_period_exc_day_id": 2042, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2221, - "pedwt_period_exc_day_id": 2043, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2222, - "pedwt_period_exc_day_id": 2044, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2223, - "pedwt_period_exc_day_id": 2045, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "01:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2224, - "pedwt_period_exc_day_id": 2046, - "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 + }, + { + "pedwt_id": 2260, + "pedwt_period_exc_day_id": 2061, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2261, + "pedwt_period_exc_day_id": 2062, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2262, + "pedwt_period_exc_day_id": 2063, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2263, + "pedwt_period_exc_day_id": 2064, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2264, + "pedwt_period_exc_day_id": 2065, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2265, + "pedwt_period_exc_day_id": 2066, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2266, + "pedwt_period_exc_day_id": 2067, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2267, + "pedwt_period_exc_day_id": 2068, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2268, + "pedwt_period_exc_day_id": 2069, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2269, + "pedwt_period_exc_day_id": 2070, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2270, + "pedwt_period_exc_day_id": 2071, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 } ], "SpecialDays": [ @@ -414,38 +497,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2017, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-27", - "ped_date_end": "2022-12-27", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2018, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-28", - "ped_date_end": "2022-12-28", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2019, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-29", - "ped_date_end": "2022-12-29", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2020, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-30", - "ped_date_end": "2022-12-30", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2021, "ped_label": "Holiday (Hungary)", @@ -462,14 +513,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2023, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2023-01-02", - "ped_date_end": "2023-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, { "ped_id": 2024, "ped_label": "Good Friday", @@ -556,7 +599,7 @@ "ped_date_start": "2024-03-31", "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2036, @@ -564,7 +607,7 @@ "ped_date_start": "2024-04-01", "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2037, @@ -583,52 +626,180 @@ "ped_year": 2024 }, { - "ped_id": 2041, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-27", - "ped_date_end": "2024-12-27", + "ped_id": 2050, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2042, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-28", - "ped_date_end": "2024-12-28", + "ped_id": 2051, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2043, + "ped_id": 2052, + "ped_label": "Christmas 1st day", + "ped_date_start": "2022-12-25", + "ped_date_end": "2022-12-25", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2053, + "ped_label": "Christmas 2nd day", + "ped_date_start": "2022-12-26", + "ped_date_end": "2022-12-26", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2054, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2055, + "ped_label": "Christmas (Sunday)", + "ped_date_start": "2022-12-24", + "ped_date_end": "2022-12-24", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2056, "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-29", - "ped_date_end": "2024-12-29", + "ped_date_start": "2022-12-31", + "ped_date_end": "2022-12-31", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2044, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-30", - "ped_date_end": "2024-12-30", - "ped_period_special_day_id": 1, + "ped_id": 2057, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2045, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-31", - "ped_date_end": "2024-12-31", - "ped_period_special_day_id": 1, + "ped_id": 2058, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2059, + "ped_label": "Easter Sunday", + "ped_date_start": "2023-04-09", + "ped_date_end": "2023-04-09", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2060, + "ped_label": "Easter Monday", + "ped_date_start": "2023-04-10", + "ped_date_end": "2023-04-10", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2061, + "ped_label": "Whit Sunday", + "ped_date_start": "2023-05-28", + "ped_date_end": "2023-05-28", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2062, + "ped_label": "Whit Monday", + "ped_date_start": "2023-05-29", + "ped_date_end": "2023-05-29", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2063, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2046, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2025-01-02", - "ped_date_end": "2025-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2025 + "ped_id": 2064, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2065, + "ped_label": "Saint Stephens Day (Hungary)", + "ped_date_start": "2023-08-20", + "ped_date_end": "2023-08-20", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2066, + "ped_label": "All Saints Day", + "ped_date_start": "2023-11-01", + "ped_date_end": "2023-11-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2067, + "ped_label": "Good Friday", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2068, + "ped_label": "Easter", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2069, + "ped_label": "Easter Monday", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2070, + "ped_label": "Whit Monday", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2071, + "ped_label": "Whit Sunday", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 2, + "ped_year": 2024 } ] } From 51d8beda2a456820c428dec489c5a23088986757 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 13:32:12 +0200 Subject: [PATCH 7/8] max_time=300, unit_id=1 --- tariffs/tariff03.json | 635 +++++++++++++++++++++++++++--------------- 1 file changed, 403 insertions(+), 232 deletions(-) diff --git a/tariffs/tariff03.json b/tariffs/tariff03.json index 7b6e7ff..2edec6e 100644 --- a/tariffs/tariff03.json +++ b/tariffs/tariff03.json @@ -28,23 +28,24 @@ ], "PaymentOption": [ { - "pop_id": 23, - "pop_label": "Zone 3", + "pop_id": 1051, + "pop_label": "Zone Gelb", "pop_payment_method_id": 3, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "16:29:00", + "pop_day_night_end_time": "16:29:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 240, - "pop_min_price": 120, - "pop_carry_over": 1 + "pop_max_time": 300, + "pop_min_price": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 1980 } ], "PaymentRate": [ { - "pra_payment_option_id": 23, - "pra_payment_unit_id": 3, - "pra_price": 480 + "pra_payment_option_id": 1051, + "pra_payment_unit_id": 1, + "pra_price": 330 } ], "Duration": [ @@ -53,11 +54,6 @@ "pun_label": "1h", "pun_duration": 60 }, - { - "pun_id": 2, - "pun_label": "1 min", - "pun_duration": 1 - }, { "pun_id": 3, "pun_label": "15 min", @@ -65,79 +61,49 @@ }, { "pun_id": 4, - "pun_label": "1d", - "pun_duration": 1440 - }, - { - "pun_id": 6, - "pun_label": "2h", - "pun_duration": 120 - }, - { - "pun_id": 7, - "pun_label": "3h", - "pun_duration": 180 - }, - { - "pun_id": 11, - "pun_label": "4h", - "pun_duration": 240 - }, - { - "pun_id": 17, - "pun_label": "30 min", - "pun_duration": 30 - }, - { - "pun_id": 18, - "pun_label": "1.5h", - "pun_duration": 90 - }, - { - "pun_id": 20, - "pun_label": "10min", - "pun_duration": 10 + "pun_label": "1 min", + "pun_duration": 1 } ], "WeekDaysWorktime": [ { - "pwd_id": 550, - "pwd_period_week_day_id": 33, + "pwd_id": 632, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 1, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" }, { - "pwd_id": 551, - "pwd_period_week_day_id": 33, + "pwd_id": 633, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 2, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" }, { - "pwd_id": 552, - "pwd_period_week_day_id": 33, + "pwd_id": 634, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 3, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" }, { - "pwd_id": 553, - "pwd_period_week_day_id": 33, + "pwd_id": 635, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 4, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" }, { - "pwd_id": 554, - "pwd_period_week_day_id": 33, + "pwd_id": 636, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 5, "pwd_time_from": "08:00:00", "pwd_time_to": "18:00:00" }, { - "pwd_id": 555, - "pwd_period_week_day_id": 33, + "pwd_id": 637, + "pwd_period_week_day_id": 37, "pwd_period_day_in_week_id": 6, "pwd_time_from": "08:00:00", "pwd_time_to": "12:00:00" @@ -145,23 +111,63 @@ ], "PeriodYear": [ { - "pye_id": 1, - "pye_label": "Summer", - "pye_start_month": 6, + "pye_id": 8, + "pye_label": "Whole year", + "pye_start_month": 1, "pye_start_day": 1, - "pye_end_month": 9, - "pye_end_day": 30 - }, - { - "pye_id": 2, - "pye_label": "Winter", - "pye_start_month": 10, - "pye_start_day": 1, - "pye_end_month": 5, + "pye_end_month": 12, "pye_end_day": 31 }, { - "pye_id": 8, + "pye_id": 9, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 10, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 11, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 12, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 13, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 14, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 15, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -247,34 +253,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2180, - "pedwt_period_exc_day_id": 2017, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2181, - "pedwt_period_exc_day_id": 2018, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2182, - "pedwt_period_exc_day_id": 2019, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2183, - "pedwt_period_exc_day_id": 2020, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2184, "pedwt_period_exc_day_id": 2021, @@ -282,13 +260,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2185, - "pedwt_period_exc_day_id": 2023, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2188, "pedwt_period_exc_day_id": 2031, @@ -310,20 +281,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2196, - "pedwt_period_exc_day_id": 2035, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2198, - "pedwt_period_exc_day_id": 2036, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2200, "pedwt_period_exc_day_id": 2037, @@ -338,54 +295,180 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2219, - "pedwt_period_exc_day_id": 2041, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2220, - "pedwt_period_exc_day_id": 2042, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2221, - "pedwt_period_exc_day_id": 2043, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2222, - "pedwt_period_exc_day_id": 2044, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2223, - "pedwt_period_exc_day_id": 2045, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "01:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2224, - "pedwt_period_exc_day_id": 2046, - "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 + }, + { + "pedwt_id": 2260, + "pedwt_period_exc_day_id": 2061, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2261, + "pedwt_period_exc_day_id": 2062, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2262, + "pedwt_period_exc_day_id": 2063, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2263, + "pedwt_period_exc_day_id": 2064, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2264, + "pedwt_period_exc_day_id": 2065, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2265, + "pedwt_period_exc_day_id": 2066, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2266, + "pedwt_period_exc_day_id": 2067, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2267, + "pedwt_period_exc_day_id": 2068, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2268, + "pedwt_period_exc_day_id": 2069, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2269, + "pedwt_period_exc_day_id": 2070, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2270, + "pedwt_period_exc_day_id": 2071, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 } ], "SpecialDays": [ @@ -421,38 +504,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2017, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-27", - "ped_date_end": "2022-12-27", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2018, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-28", - "ped_date_end": "2022-12-28", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2019, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-29", - "ped_date_end": "2022-12-29", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2020, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-30", - "ped_date_end": "2022-12-30", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2021, "ped_label": "Holiday (Hungary)", @@ -469,14 +520,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2023, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2023-01-02", - "ped_date_end": "2023-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, { "ped_id": 2024, "ped_label": "Good Friday", @@ -563,7 +606,7 @@ "ped_date_start": "2024-03-31", "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2036, @@ -571,7 +614,7 @@ "ped_date_start": "2024-04-01", "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2037, @@ -590,52 +633,180 @@ "ped_year": 2024 }, { - "ped_id": 2041, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-27", - "ped_date_end": "2024-12-27", + "ped_id": 2050, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2042, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-28", - "ped_date_end": "2024-12-28", + "ped_id": 2051, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2043, + "ped_id": 2052, + "ped_label": "Christmas 1st day", + "ped_date_start": "2022-12-25", + "ped_date_end": "2022-12-25", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2053, + "ped_label": "Christmas 2nd day", + "ped_date_start": "2022-12-26", + "ped_date_end": "2022-12-26", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2054, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2055, + "ped_label": "Christmas (Sunday)", + "ped_date_start": "2022-12-24", + "ped_date_end": "2022-12-24", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2056, "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-29", - "ped_date_end": "2024-12-29", + "ped_date_start": "2022-12-31", + "ped_date_end": "2022-12-31", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2044, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-30", - "ped_date_end": "2024-12-30", - "ped_period_special_day_id": 1, + "ped_id": 2057, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2045, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-31", - "ped_date_end": "2024-12-31", - "ped_period_special_day_id": 1, + "ped_id": 2058, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2059, + "ped_label": "Easter Sunday", + "ped_date_start": "2023-04-09", + "ped_date_end": "2023-04-09", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2060, + "ped_label": "Easter Monday", + "ped_date_start": "2023-04-10", + "ped_date_end": "2023-04-10", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2061, + "ped_label": "Whit Sunday", + "ped_date_start": "2023-05-28", + "ped_date_end": "2023-05-28", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2062, + "ped_label": "Whit Monday", + "ped_date_start": "2023-05-29", + "ped_date_end": "2023-05-29", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2063, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2046, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2025-01-02", - "ped_date_end": "2025-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2025 + "ped_id": 2064, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2065, + "ped_label": "Saint Stephens Day (Hungary)", + "ped_date_start": "2023-08-20", + "ped_date_end": "2023-08-20", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2066, + "ped_label": "All Saints Day", + "ped_date_start": "2023-11-01", + "ped_date_end": "2023-11-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2067, + "ped_label": "Good Friday", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2068, + "ped_label": "Easter", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2069, + "ped_label": "Easter Monday", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2070, + "ped_label": "Whit Monday", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2071, + "ped_label": "Whit Sunday", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 2, + "ped_year": 2024 } ] } From 1a71edc274eff5128e7fb68d5bd318add20997a2 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 13 Jun 2023 13:32:16 +0200 Subject: [PATCH 8/8] max_time=300, unit_id=1 --- tariffs/tariff04.json | 631 +++++++++++++++++++++++++++--------------- 1 file changed, 401 insertions(+), 230 deletions(-) diff --git a/tariffs/tariff04.json b/tariffs/tariff04.json index 6ef9e9e..127a8f5 100644 --- a/tariffs/tariff04.json +++ b/tariffs/tariff04.json @@ -28,23 +28,24 @@ ], "PaymentOption": [ { - "pop_id": 17, - "pop_label": "Zone 1", + "pop_id": 1052, + "pop_label": "Zone Grün", "pop_payment_method_id": 3, - "pop_day_end_time": "00:00:00", - "pop_day_night_end_time": "00:00:00", + "pop_day_end_time": "16:30:00", + "pop_day_night_end_time": "16:30:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 240, - "pop_min_price": 55, - "pop_carry_over": 1 + "pop_max_time": 600, + "pop_min_price": 0, + "pop_carry_over": 1, + "pop_daily_card_price": 0 } ], "PaymentRate": [ { - "pra_payment_option_id": 17, - "pra_payment_unit_id": 3, - "pra_price": 220 + "pra_payment_option_id": 1052, + "pra_payment_unit_id": 1, + "pra_price": 600 } ], "Duration": [ @@ -53,11 +54,6 @@ "pun_label": "1h", "pun_duration": 60 }, - { - "pun_id": 2, - "pun_label": "1 min", - "pun_duration": 1 - }, { "pun_id": 3, "pun_label": "15 min", @@ -65,72 +61,42 @@ }, { "pun_id": 4, - "pun_label": "1d", - "pun_duration": 1440 - }, - { - "pun_id": 6, - "pun_label": "2h", - "pun_duration": 120 - }, - { - "pun_id": 7, - "pun_label": "3h", - "pun_duration": 180 - }, - { - "pun_id": 11, - "pun_label": "4h", - "pun_duration": 240 - }, - { - "pun_id": 17, - "pun_label": "30 min", - "pun_duration": 30 - }, - { - "pun_id": 18, - "pun_label": "1.5h", - "pun_duration": 90 - }, - { - "pun_id": 20, - "pun_label": "10min", - "pun_duration": 10 + "pun_label": "1 min", + "pun_duration": 1 } ], "WeekDaysWorktime": [ { - "pwd_id": 540, - "pwd_period_week_day_id": 32, + "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_id": 541, - "pwd_period_week_day_id": 32, + "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_id": 542, - "pwd_period_week_day_id": 32, + "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_id": 543, - "pwd_period_week_day_id": 32, + "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_id": 544, - "pwd_period_week_day_id": 32, + "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" @@ -138,23 +104,63 @@ ], "PeriodYear": [ { - "pye_id": 1, - "pye_label": "Summer", - "pye_start_month": 6, + "pye_id": 8, + "pye_label": "Whole year", + "pye_start_month": 1, "pye_start_day": 1, - "pye_end_month": 9, - "pye_end_day": 30 - }, - { - "pye_id": 2, - "pye_label": "Winter", - "pye_start_month": 10, - "pye_start_day": 1, - "pye_end_month": 5, + "pye_end_month": 12, "pye_end_day": 31 }, { - "pye_id": 8, + "pye_id": 9, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 10, + "pye_label": "Whole year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 11, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 12, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 13, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 14, + "pye_label": "Whole Year", + "pye_start_month": 1, + "pye_start_day": 1, + "pye_end_month": 12, + "pye_end_day": 31 + }, + { + "pye_id": 15, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -240,34 +246,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2180, - "pedwt_period_exc_day_id": 2017, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2181, - "pedwt_period_exc_day_id": 2018, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2182, - "pedwt_period_exc_day_id": 2019, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2183, - "pedwt_period_exc_day_id": 2020, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2184, "pedwt_period_exc_day_id": 2021, @@ -275,13 +253,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2185, - "pedwt_period_exc_day_id": 2023, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2188, "pedwt_period_exc_day_id": 2031, @@ -303,20 +274,6 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2196, - "pedwt_period_exc_day_id": 2035, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2198, - "pedwt_period_exc_day_id": 2036, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, { "pedwt_id": 2200, "pedwt_period_exc_day_id": 2037, @@ -331,54 +288,180 @@ "pedwt_time_to": "00:00:00", "pedwt_price": 0 }, - { - "pedwt_id": 2219, - "pedwt_period_exc_day_id": 2041, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2220, - "pedwt_period_exc_day_id": 2042, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2221, - "pedwt_period_exc_day_id": 2043, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2222, - "pedwt_period_exc_day_id": 2044, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "00:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2223, - "pedwt_period_exc_day_id": 2045, - "pedwt_time_from": "00:00:00", - "pedwt_time_to": "01:00:00", - "pedwt_price": 0 - }, - { - "pedwt_id": 2224, - "pedwt_period_exc_day_id": 2046, - "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 + }, + { + "pedwt_id": 2260, + "pedwt_period_exc_day_id": 2061, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2261, + "pedwt_period_exc_day_id": 2062, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2262, + "pedwt_period_exc_day_id": 2063, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2263, + "pedwt_period_exc_day_id": 2064, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2264, + "pedwt_period_exc_day_id": 2065, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2265, + "pedwt_period_exc_day_id": 2066, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2266, + "pedwt_period_exc_day_id": 2067, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2267, + "pedwt_period_exc_day_id": 2068, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2268, + "pedwt_period_exc_day_id": 2069, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2269, + "pedwt_period_exc_day_id": 2070, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 + }, + { + "pedwt_id": 2270, + "pedwt_period_exc_day_id": 2071, + "pedwt_time_from": "00:00:00", + "pedwt_time_to": "00:00:00", + "pedwt_price": 0 } ], "SpecialDays": [ @@ -414,38 +497,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2017, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-27", - "ped_date_end": "2022-12-27", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2018, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-28", - "ped_date_end": "2022-12-28", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2019, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-29", - "ped_date_end": "2022-12-29", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2020, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-30", - "ped_date_end": "2022-12-30", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2021, "ped_label": "Holiday (Hungary)", @@ -462,14 +513,6 @@ "ped_period_special_day_id": 2, "ped_year": 0 }, - { - "ped_id": 2023, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2023-01-02", - "ped_date_end": "2023-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2024 - }, { "ped_id": 2024, "ped_label": "Good Friday", @@ -556,7 +599,7 @@ "ped_date_start": "2024-03-31", "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2036, @@ -564,7 +607,7 @@ "ped_date_start": "2024-04-01", "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 0 + "ped_year": 2024 }, { "ped_id": 2037, @@ -583,52 +626,180 @@ "ped_year": 2024 }, { - "ped_id": 2041, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-27", - "ped_date_end": "2024-12-27", + "ped_id": 2050, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2042, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-28", - "ped_date_end": "2024-12-28", + "ped_id": 2051, + "ped_label": "Uskrs", + "ped_date_start": "2023-04-16", + "ped_date_end": "2023-04-16", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2043, + "ped_id": 2052, + "ped_label": "Christmas 1st day", + "ped_date_start": "2022-12-25", + "ped_date_end": "2022-12-25", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2053, + "ped_label": "Christmas 2nd day", + "ped_date_start": "2022-12-26", + "ped_date_end": "2022-12-26", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2054, + "ped_label": "Republic Day (Hungary)", + "ped_date_start": "2022-10-23", + "ped_date_end": "2022-10-23", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2055, + "ped_label": "Christmas (Sunday)", + "ped_date_start": "2022-12-24", + "ped_date_end": "2022-12-24", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2056, "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-29", - "ped_date_end": "2024-12-29", + "ped_date_start": "2022-12-31", + "ped_date_end": "2022-12-31", "ped_period_special_day_id": 1, "ped_year": 0 }, { - "ped_id": 2044, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-30", - "ped_date_end": "2024-12-30", - "ped_period_special_day_id": 1, + "ped_id": 2057, + "ped_label": "NewYear", + "ped_date_start": "2023-01-01", + "ped_date_end": "2023-01-01", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2045, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2024-12-31", - "ped_date_end": "2024-12-31", - "ped_period_special_day_id": 1, + "ped_id": 2058, + "ped_label": "Good Friday", + "ped_date_start": "2023-04-07", + "ped_date_end": "2023-04-07", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2059, + "ped_label": "Easter Sunday", + "ped_date_start": "2023-04-09", + "ped_date_end": "2023-04-09", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2060, + "ped_label": "Easter Monday", + "ped_date_start": "2023-04-10", + "ped_date_end": "2023-04-10", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2061, + "ped_label": "Whit Sunday", + "ped_date_start": "2023-05-28", + "ped_date_end": "2023-05-28", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2062, + "ped_label": "Whit Monday", + "ped_date_start": "2023-05-29", + "ped_date_end": "2023-05-29", + "ped_period_special_day_id": 2, + "ped_year": 2023 + }, + { + "ped_id": 2063, + "ped_label": "Revolution Day (Hungary)", + "ped_date_start": "2023-03-15", + "ped_date_end": "2023-03-15", + "ped_period_special_day_id": 2, "ped_year": 0 }, { - "ped_id": 2046, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2025-01-02", - "ped_date_end": "2025-01-02", - "ped_period_special_day_id": 1, - "ped_year": 2025 + "ped_id": 2064, + "ped_label": "Labour Day", + "ped_date_start": "2023-05-01", + "ped_date_end": "2023-05-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2065, + "ped_label": "Saint Stephens Day (Hungary)", + "ped_date_start": "2023-08-20", + "ped_date_end": "2023-08-20", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2066, + "ped_label": "All Saints Day", + "ped_date_start": "2023-11-01", + "ped_date_end": "2023-11-01", + "ped_period_special_day_id": 2, + "ped_year": 0 + }, + { + "ped_id": 2067, + "ped_label": "Good Friday", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2068, + "ped_label": "Easter", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2069, + "ped_label": "Easter Monday", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2070, + "ped_label": "Whit Monday", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", + "ped_period_special_day_id": 2, + "ped_year": 2024 + }, + { + "ped_id": 2071, + "ped_label": "Whit Sunday", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", + "ped_period_special_day_id": 2, + "ped_year": 2024 } ] }