Add compute_next_timestep()

but the multimap YearPeriod, which must be empty.

library/include/mobilisis/atb_project.h

@@ -0,0 +1,13 @@
+#ifndef ATB_PROJECT_H_INCLUDED
+#define ATB_PROJECT_H_INCLUDED
+
+#include <QString>
+
+class ATBProject {
+  public:
+    QString project;
+    QString version;
+    QString info;
+};
+
+#endif // ATB_PROJECT_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -109,6 +109,8 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,

library/include/mobilisis/calculator_functions.h

@@ -1,6 +1,7 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
+#include "payment_method.h"
 #include <QDateTime>
 using namespace std;
 
@@ -29,5 +30,19 @@ public:
     double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
 
     // Daily ticket
-    QString GetDailyTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over);
+    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+
+    //
+    // helper function to find time steps for a tariff with PaymentMethod::Steps
+    // (e.g. Schoenau/Koenigsee)
+    //
+    QList<int> GetTimeSteps(Configuration *cfg) const;
+
+private:
+    // Introduced for PaymentMethod::Steps (e.g. Schoenau)
+    // For tariff of following structure: only steps, no special days, nonstop.
+    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
+    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
+    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
 };

library/include/mobilisis/configuration.h

@@ -20,6 +20,7 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
+#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -27,7 +28,7 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-
+    ATBProject project;
     ATBCurrency Currency;
 	ATBDuration duration;
 
@@ -48,6 +49,8 @@ public:
 	/// <returns>Returns operation status bool (OK | FAIL) </returns>
 	bool ParseJson(Configuration* cfg, const char* json);
 
+    ATBPaymentOption const & getPaymentOptions();
+
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -55,4 +58,6 @@ private:
 	/// <param name="member_name"></param>
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
+
+    ATBPaymentOption currentPaymentOptions;
 };

library/include/mobilisis/day_of_week.h

@@ -2,12 +2,12 @@
 
 enum DayOfWeek
 {
-	Saturday = 0x06,
+    Monday = 0x01,
-	Sunday = 0x01,
-	Monday = 0x02,
     Tuesday = 0x02,
     Wednesday = 0x03,
     Thursday = 0x04,
     Friday = 0x05,
+    Saturday = 0x06,
+    Sunday = 0x07,
     UndefinedDay = 0xFF
 };

library/library.pro

@@ -65,7 +65,8 @@ HEADERS += \
     include/mobilisis/tariff_period_year.h \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
-    include/mobilisis/calculate_price.h
+    include/mobilisis/calculate_price.h \
+    include/mobilisis/atb_project.h
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -93,6 +93,44 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
 }
 
 
+//
+// UpDown 1 -> up; 0 -> down
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
+{
+    static const QList<int> stepList = calculator.GetTimeSteps(tariff);
+
+    int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+
+    if (currentStepIndex == -1) {
+        qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+        return  currentTimeMinutes;
+    }
+
+    if (UpDown == 1) { // UP
+        if (stepList[currentStepIndex] == stepList.last()) {
+            qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            return  currentTimeMinutes;
+        }
+        else {
+            return stepList[currentStepIndex + 1];
+        }
+    }
+    if (UpDown == 0) { // DOWN
+        if (stepList[currentStepIndex] == stepList.first()) {
+            qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            return  currentTimeMinutes;
+        }
+        else {
+            return stepList[currentStepIndex - 1];
+        }
+    }
+
+    qCritical() << "compute_next_timestep() *CAN NOT COMPUTE* for currentTimeMinutes (" << currentTimeMinutes << ")";
+    return  currentTimeMinutes;
+}
+
+
+
 // this is currently not used
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
@@ -100,8 +138,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         time_t end_parking_time,   // netto time in minutes
         struct price_t *price) {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -134,11 +172,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     QDateTime end(start);
     if (start.isValid()) {
         double cost = calculator.GetCostFromDuration(
-                    tariff, PaymentOption::Option1,
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     start,
                     end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -160,8 +199,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         struct price_t *price)
 {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
+    double minMin = tariff->getPaymentOptions().pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double maxMin = tariff->getPaymentOptions().pop_max_time;
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
@@ -192,12 +231,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     if (start_parking_time.isValid()) {
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
+                        tariff,
+                        tariff->getPaymentOptions().pop_payment_method_id,
                         start_parking_time,         // starting time
                         end_parking_time,           // return value: end time
                         netto_parking_time,         // minutes, netto
                         false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        double minCost = tariff->getPaymentOptions().pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -233,7 +273,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
-        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
+        duration = calculator.GetDurationFromCost(tariff,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
@@ -258,7 +299,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = calculator.GetDurationFromCost(
-                    tariff, PaymentOption::Option1,
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
                     price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
@@ -283,21 +325,18 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
 {
     CalcState calcState;
     if (start_parking_time.isValid()) {
-        QString cs = start_parking_time.toString(Qt::ISODate);
 
-        QString endTime = calculator.GetDailyTicketDuration(tariff,
+        ticketEndTime = calculator.GetDailyTicketDuration(tariff,
-                                                            cs.toLocal8Bit().constData(),
+                                                            start_parking_time,
-                                                            PaymentOption::Option1,
+                                                            tariff->getPaymentOptions().pop_payment_method_id,
                                                             false);    // carry over
-        ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
         // DEBUG
         qCritical() << "compute_duration_for_daily_ticket(): ";
-        qCritical() << "                 endTime: " << endTime;
         qCritical() << "           ticketEndTime: " << ticketEndTime;
 
         if (!ticketEndTime.isValid()) {
-            calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
+            calcState.setDesc(QString("ticketEndTime=%1").arg(ticketEndTime.toString(Qt::ISODate)));
             return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
         }
 

library/src/calculator_functions.cpp

@@ -1,5 +1,5 @@
 #include "calculator_functions.h"
-#include "payment_method.h"
+#include "payment_option.h"
 #include "utilities.h"
 #include "tariff_log.h"
 
@@ -19,20 +19,25 @@ inline struct tm* localtime_r(const time_t *clock, struct tm* result){
 }
 #endif
 
-QString Calculator::GetDailyTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over)
+QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over)
 {
-    if(start_datetime.isNull() || start_datetime.isEmpty()) return NULL;
+    if(!start_datetime.isValid()) {
+        return QDateTime();
+    }
 
     double day_price = 0.0f;
     int current_special_day_id = -1;
-    bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toStdString().c_str(), &current_special_day_id, &day_price);
+    bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
 
-    QDateTime inputDateTime = QDateTime::fromString(start_datetime, Qt::ISODate);
+    QDateTime inputDateTime = start_datetime;
     QTime worktime_from;
     QTime worktime_to;
 
     int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
-    if(daily_card_price <= 0) return "Daily ticket price zero or less";
+    if(daily_card_price <= 0) {
+        LOG_ERROR("Calculator::GetDailyTicketDuration(): Daily ticket price zero or less");
+        return QDateTime();
+    }
 
     if(is_special_day)
     {
@@ -46,21 +51,21 @@ QString Calculator::GetDailyTicketDuration(Configuration* cfg, QString start_dat
         {
             // Go to next day if outside worktime
             inputDateTime = inputDateTime.addSecs(86400);
-            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
         }
 
         if(day_price <=0)
         {
             // Go to next day if special day price is 0
             inputDateTime = inputDateTime.addSecs(86400);
-            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
         }
 
         int diff = abs(inputDateTime.time().secsTo(worktime_to));
         inputDateTime = inputDateTime.addSecs(diff);
 
         //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
-        return inputDateTime.toString(Qt::ISODate) + ", price = " + to_string(daily_card_price).c_str() + ", duration = " + to_string((diff/60)).c_str();
+        return inputDateTime;
     }
     else
     {
@@ -76,7 +81,7 @@ QString Calculator::GetDailyTicketDuration(Configuration* cfg, QString start_dat
         if(found <=0)
         {
             inputDateTime = inputDateTime.addSecs(86400);
-            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
         }
         else
         {
@@ -92,18 +97,18 @@ QString Calculator::GetDailyTicketDuration(Configuration* cfg, QString start_dat
             {
                 // Go to next day if outside worktime
                 inputDateTime = inputDateTime.addSecs(86400);
-                return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
+                return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
             }
 
             int diff = abs(inputDateTime.time().secsTo(worktime_to));
             inputDateTime = inputDateTime.addSecs(diff);
 
             //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;            
-            return inputDateTime.toString(Qt::ISODate) + ", price = " + to_string(daily_card_price).c_str() + ", duration = " + to_string((diff/60)).c_str();
+            return inputDateTime;
         }
     }
 
-    return NULL;
+    return QDateTime();
 }
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
@@ -113,22 +118,35 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             bool nextDay,
                                             bool prepaid)
 {
+
     // Get input date
     QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 
+    // use tariff with structure as for instance Schnau, Koenigsee:
+    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
+    {
+        inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
+
+        return inputDate.toString(Qt::ISODate).toStdString();
+    }
+
+
     // Get day of week
     int weekdayId = 0;
     weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
 
     //Get min and max time defined in JSON
     double minMin = 0;
-    minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
+    minMin = cfg->getPaymentOptions().pop_min_time;
 
     double maxMin = 0;
-    maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
+    maxMin = cfg->getPaymentOptions().pop_max_time;
 
     double min_price = 0;
-    min_price = cfg->PaymentOption.find(payment_option)->second.pop_min_price;
+    min_price = cfg->getPaymentOptions().pop_min_price;
 
     if(price < min_price)
     {
@@ -201,16 +219,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 +325,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)
+    //if (calc_price > 0 && total_duration_min > 0)
-    {
+    //{
-        inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
+    //    inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
-    }
+    //}
 
     if(price >= min_price && total_duration_min >= minMin)
         qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
@@ -338,11 +349,53 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     return inputDate.toString(Qt::ISODate).toStdString();
 }
 
+///////////////////////////////////////
+
+/// <inheritdoc/>
+///
+
+uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
+                                         QDateTime const &start,
+                                         quint64 timeStepInMinutes) const {
+    // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
+    // special days, nonstop.
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        QDateTime const end = start.addSecs(timeStepInMinutes*60);
+        return GetCostFromDuration(cfg, start, end);
+    }
+    return 0;
+}
+
+uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
+                                         QDateTime const &start,
+                                         QDateTime const &end) const {
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        int const timeStepInMinutes = start.secsTo(end) / 60;
+        return GetPriceForTimeStep(cfg, timeStepInMinutes);
+    }
+    return 0;
+}
+
+
+
+
 ///////////////////////////////////////
 
 /// <inheritdoc/>
 double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_option, const QDateTime start_datetime, QDateTime & end_datetime,  double durationMin, bool nextDay, bool prepaid)
 {
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
+    {
+        end_datetime = start_datetime.addSecs(durationMin*60);
+        return GetCostFromDuration(cfg, start_datetime, end_datetime);
+    }
+
     // Get input date
     QDateTime inputDate = start_datetime;
 
@@ -543,3 +596,67 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
     total_cost = 0.0f;
     return ceil(ret_val);
 }
+
+
+
+QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
+    QList<int> timeSteps;
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        timeSteps << durationUnit;
+    }
+
+    return timeSteps;
+}
+
+uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const payment_unit_id = itr->second.pra_payment_unit_id;
+        int const pun_id = cfg->Duration.find(payment_unit_id)->second.pun_id;
+
+        Q_ASSERT(pun_id == payment_unit_id);
+
+        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        if (timeStep == pun_duration) {
+            return (uint32_t)(itr->second.pra_price);
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * private: read price directly from config file (used with PaymentMethod::Steps)
+ *
+ * return duration in minutes for greatest pra_price < price
+ */
+
+uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
+    int const pop_id = cfg->getPaymentOptions().pop_id; 
+    uint32_t duration = 0;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const pra_price = itr->second.pra_price;
+        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+
+        if (price == pra_price) {
+            return durationUnit;
+        }
+        if (pra_price < price) {
+            duration = durationUnit;
+        }
+    }
+
+    return duration;
+}

library/src/configuration.cpp

@@ -59,8 +59,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			|| !document.HasMember("PaymentRate")
 			|| !document.HasMember("Duration")
 			//|| !document.HasMember("WeekDays")
-			|| !document.HasMember("SpecialDaysWorktime")
+            //|| !document.HasMember("SpecialDaysWorktime")
-			|| !document.HasMember("SpecialDays"))
+            //|| !document.HasMember("SpecialDays")
+            )
 		{
 			printf("%s", "Error: not a valid configuration JSON\n");
 			return false;
@@ -87,13 +88,26 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            // if (!document[mb_name].IsArray()) {
+            if (document[mb_name].IsString()) {
-                std::string const _mb_name(mb_name);
+                QString const _mb_name(mb_name);
-                if (_mb_name == "version" || _mb_name == "project" ||
+                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
-                    _mb_name == "zone" || _mb_name == "info") {
+                    cfg->project.project = document[mb_name].GetString();
+                    continue;
+                 }
+                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                    cfg->project.version = document[mb_name].GetString();
+                    continue;
+                }
+                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                    cfg->project.info = document[mb_name].GetString();
+                    continue;
+                }
+            }
+
+            // ... everything else should be an array
+            if (!document[mb_name].IsArray()) {
                 continue;
             }
-            // }
 
 			//printf(" -%s\n", mb_name);
 
@@ -155,6 +169,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
+                        this->currentPaymentOptions = PaymentOption;
                         break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -245,3 +260,10 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		return false;
 	}
 }
+
+
+
+const ATBPaymentOption & Configuration::getPaymentOptions()
+{
+    return this->currentPaymentOptions;
+}

tariffs/tariff01.json

@@ -28,14 +28,14 @@
   ],
   "PaymentOption": [
     {
-      "pop_id": 17,
+      "pop_id": 1049,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone Lila",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "16:25:00",
-      "pop_day_night_end_time": "00:00: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_option_id": 1049,
-      "pra_payment_unit_id": 3,
+      "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_label": "1 min",
-      "pun_duration": 1440
+      "pun_duration": 1
-    },
-    {
-      "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
     }
   ],
   "WeekDaysWorktime": [
     {
-      "pwd_id": 540,
+      "pwd_id": 621,
-      "pwd_period_week_day_id": 32,
+      "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_id": 622,
-      "pwd_period_week_day_id": 32,
+      "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_id": 623,
-      "pwd_period_week_day_id": 32,
+      "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_id": 624,
-      "pwd_period_week_day_id": 32,
+      "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_id": 625,
-      "pwd_period_week_day_id": 32,
+      "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_id": 8,
-      "pye_label": "Summer",
+      "pye_label": "Whole year",
-      "pye_start_month": 6,
+      "pye_start_month": 1,
       "pye_start_day": 1,
-      "pye_end_month": 9,
+      "pye_end_month": 12,
-      "pye_end_day": 30
-    },
-    {
-      "pye_id": 2,
-      "pye_label": "Winter",
-      "pye_start_month": 10,
-      "pye_start_day": 1,
-      "pye_end_month": 5,
       "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_id": 2050,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-27",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-27",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2042,
+      "ped_id": 2051,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-28",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-28",
+      "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_start": "2022-12-31",
-      "ped_date_end": "2024-12-29",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2044,
+      "ped_id": 2057,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "NewYear",
-      "ped_date_start": "2024-12-30",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2024-12-30",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
-      "ped_id": 2045,
+      "ped_id": 2058,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-12-31",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2024-12-31",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "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_id": 2064,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Labour Day",
-      "ped_date_start": "2025-01-02",
+      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2025-01-02",
+      "ped_date_end": "2023-05-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "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
     }
   ]
 }

tariffs/tariff02.json

@@ -28,23 +28,24 @@
   ],
   "PaymentOption": [
     {
-      "pop_id": 22,
+      "pop_id": 1050,
-      "pop_label": "Zone 2",
+      "pop_label": "Zone Blau",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "16:27:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_night_end_time": "16:27:00",
       "pop_price_night": 0,
       "pop_min_time": 15,
-      "pop_max_time": 240,
+      "pop_max_time": 300,
-      "pop_min_price": 120,
+      "pop_min_price": 0,
-      "pop_carry_over": 1
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 1320
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 22,
+      "pra_payment_option_id": 1050,
-      "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 1,
-      "pra_price": 480
+      "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_label": "1 min",
-      "pun_duration": 1440
+      "pun_duration": 1
-    },
-    {
-      "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
     }
   ],
   "WeekDaysWorktime": [
     {
-      "pwd_id": 540,
+      "pwd_id": 621,
-      "pwd_period_week_day_id": 32,
+      "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_id": 622,
-      "pwd_period_week_day_id": 32,
+      "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_id": 623,
-      "pwd_period_week_day_id": 32,
+      "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_id": 624,
-      "pwd_period_week_day_id": 32,
+      "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_id": 625,
-      "pwd_period_week_day_id": 32,
+      "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_id": 8,
-      "pye_label": "Summer",
+      "pye_label": "Whole year",
-      "pye_start_month": 6,
+      "pye_start_month": 1,
       "pye_start_day": 1,
-      "pye_end_month": 9,
+      "pye_end_month": 12,
-      "pye_end_day": 30
-    },
-    {
-      "pye_id": 2,
-      "pye_label": "Winter",
-      "pye_start_month": 10,
-      "pye_start_day": 1,
-      "pye_end_month": 5,
       "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_id": 2050,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-27",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-27",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2042,
+      "ped_id": 2051,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-28",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-28",
+      "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_start": "2022-12-31",
-      "ped_date_end": "2024-12-29",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2044,
+      "ped_id": 2057,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "NewYear",
-      "ped_date_start": "2024-12-30",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2024-12-30",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
-      "ped_id": 2045,
+      "ped_id": 2058,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-12-31",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2024-12-31",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "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_id": 2064,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Labour Day",
-      "ped_date_start": "2025-01-02",
+      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2025-01-02",
+      "ped_date_end": "2023-05-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "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
     }
   ]
 }

tariffs/tariff03.json

@@ -28,23 +28,24 @@
   ],
   "PaymentOption": [
     {
-      "pop_id": 23,
+      "pop_id": 1051,
-      "pop_label": "Zone 3",
+      "pop_label": "Zone Gelb",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "16:29:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_night_end_time": "16:29:00",
       "pop_price_night": 0,
       "pop_min_time": 15,
-      "pop_max_time": 240,
+      "pop_max_time": 300,
-      "pop_min_price": 120,
+      "pop_min_price": 0,
-      "pop_carry_over": 1
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 1980
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 23,
+      "pra_payment_option_id": 1051,
-      "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 1,
-      "pra_price": 480
+      "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_label": "1 min",
-      "pun_duration": 1440
+      "pun_duration": 1
-    },
-    {
-      "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
     }
   ],
   "WeekDaysWorktime": [
     {
-      "pwd_id": 550,
+      "pwd_id": 632,
-      "pwd_period_week_day_id": 33,
+      "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_id": 633,
-      "pwd_period_week_day_id": 33,
+      "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_id": 634,
-      "pwd_period_week_day_id": 33,
+      "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_id": 635,
-      "pwd_period_week_day_id": 33,
+      "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_id": 636,
-      "pwd_period_week_day_id": 33,
+      "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_id": 637,
-      "pwd_period_week_day_id": 33,
+      "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_id": 8,
-      "pye_label": "Summer",
+      "pye_label": "Whole year",
-      "pye_start_month": 6,
+      "pye_start_month": 1,
       "pye_start_day": 1,
-      "pye_end_month": 9,
+      "pye_end_month": 12,
-      "pye_end_day": 30
-    },
-    {
-      "pye_id": 2,
-      "pye_label": "Winter",
-      "pye_start_month": 10,
-      "pye_start_day": 1,
-      "pye_end_month": 5,
       "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_id": 2050,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-27",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-27",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2042,
+      "ped_id": 2051,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-28",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-28",
+      "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_start": "2022-12-31",
-      "ped_date_end": "2024-12-29",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2044,
+      "ped_id": 2057,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "NewYear",
-      "ped_date_start": "2024-12-30",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2024-12-30",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
-      "ped_id": 2045,
+      "ped_id": 2058,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-12-31",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2024-12-31",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "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_id": 2064,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Labour Day",
-      "ped_date_start": "2025-01-02",
+      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2025-01-02",
+      "ped_date_end": "2023-05-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "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
     }
   ]
 }

tariffs/tariff04.json

@@ -28,23 +28,24 @@
   ],
   "PaymentOption": [
     {
-      "pop_id": 17,
+      "pop_id": 1052,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone Grün",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "16:30:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_night_end_time": "16:30:00",
       "pop_price_night": 0,
       "pop_min_time": 15,
-      "pop_max_time": 240,
+      "pop_max_time": 600,
-      "pop_min_price": 55,
+      "pop_min_price": 0,
-      "pop_carry_over": 1
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 2400
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 17,
+      "pra_payment_option_id": 1052,
-      "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 1,
-      "pra_price": 220
+      "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_label": "1 min",
-      "pun_duration": 1440
+      "pun_duration": 1
-    },
-    {
-      "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
     }
   ],
   "WeekDaysWorktime": [
     {
-      "pwd_id": 540,
+      "pwd_id": 621,
-      "pwd_period_week_day_id": 32,
+      "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_id": 622,
-      "pwd_period_week_day_id": 32,
+      "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_id": 623,
-      "pwd_period_week_day_id": 32,
+      "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_id": 624,
-      "pwd_period_week_day_id": 32,
+      "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_id": 625,
-      "pwd_period_week_day_id": 32,
+      "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_id": 8,
-      "pye_label": "Summer",
+      "pye_label": "Whole year",
-      "pye_start_month": 6,
+      "pye_start_month": 1,
       "pye_start_day": 1,
-      "pye_end_month": 9,
+      "pye_end_month": 12,
-      "pye_end_day": 30
-    },
-    {
-      "pye_id": 2,
-      "pye_label": "Winter",
-      "pye_start_month": 10,
-      "pye_start_day": 1,
-      "pye_end_month": 5,
       "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_id": 2050,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-27",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-27",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2042,
+      "ped_id": 2051,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2024-12-28",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2024-12-28",
+      "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_start": "2022-12-31",
-      "ped_date_end": "2024-12-29",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
-      "ped_id": 2044,
+      "ped_id": 2057,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "NewYear",
-      "ped_date_start": "2024-12-30",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2024-12-30",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
-      "ped_id": 2045,
+      "ped_id": 2058,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-12-31",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2024-12-31",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "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_id": 2064,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Labour Day",
-      "ped_date_start": "2025-01-02",
+      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2025-01-02",
+      "ped_date_end": "2023-05-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "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
     }
   ]
 }