Fix: nextTimeStep must be between minParkingTime and maxParkingTime.

(2) Use UpDown-Argument for calculation of next tiem step.

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/utilities.h

@@ -82,4 +82,9 @@ namespace Utilities {
     bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     PaymentMethod getPaymentMethodId(Configuration const *cfg);
+
+    int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+    int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId);
 }

library/library.pro

@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = mobilisis_calc
 #CONFIG += staticlib
 
-QMAKE_CXXFLAGS += -std=c++17 -g -O0
+QMAKE_CXXFLAGS += -std=c++17 -g -O
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/include
 INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis

library/src/calculate_price.cpp

@@ -2,6 +2,7 @@
 #include "configuration.h"
 #include "calculator_functions.h"
 #include "payment_option.h"
+#include "utilities.h"
 
 #include <QFile>
 #include <QFileInfo>
@@ -92,6 +93,97 @@ 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)
+{
+    qCritical() << "   compute_next_timestep()  currentTimeMinutes: " << currentTimeMinutes;
+    Configuration const *cfg = tariff;
+
+    // compute payment method id (e.g. Linear=3, Steps=4)
+    PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    switch (paymentMethodId) {
+    case PaymentMethod::Progressive:
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Progressive";
+        break;
+    case PaymentMethod::Degressive:
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Degressive";
+        break;
+    case PaymentMethod::Linear:
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Linear";
+        break;
+    case PaymentMethod::Steps:
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Steps";
+        break;
+    case PaymentMethod::Undefined:
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Undefined";
+        break;
+    }
+
+    // use tariff with structure as for instance Schnau, Koenigsee:
+    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
+    if (paymentMethodId == PaymentMethod::Steps)
+    {
+        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];
+            }
+        }
+    } else
+    if (paymentMethodId == PaymentMethod::Linear) {
+
+        // currentTimeMinutes is the number of minutes actually used. This
+        // value is an offset from the start time and cannot be used as a
+        // QDateTime.
+
+        qCritical() << "compute_next_timestep() up/down (1=up, 0=down):" << UpDown;
+
+        // get minimal and maximal parking times
+        int const minParkingTime = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
+        int const maxParkingTime = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
+
+        qCritical() << "        compute_next_timestep() maxParkingTime:" << maxParkingTime;
+        qCritical() << "        compute_next_timestep() minParkingTime:" << minParkingTime;
+
+        // use the first (i.e. main duration step contained in the tariff json-file)
+        int firstDurationStep = Utilities::getFirstDurationStep(cfg, paymentMethodId);
+        firstDurationStep = ((UpDown == 1) ? firstDurationStep : -firstDurationStep);
+
+        qCritical() << "     compute_next_timestep() firstDurationStep:" << firstDurationStep;
+
+        int const nextTimeStep = currentTimeMinutes + firstDurationStep;
+
+        if (nextTimeStep >= minParkingTime && nextTimeStep <= maxParkingTime) {
+            qCritical() << "          compute_next_timestep() nextTimeStep:" << nextTimeStep;
+            return nextTimeStep;
+        }
+    }
+
+    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(

library/src/calculator_functions.cpp

@@ -122,6 +122,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             bool nextDay,
                                             bool prepaid)
 {
+    Q_UNUSED(payment_option);
+    Q_UNUSED(nextDay);
 
     // Get input date
     QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
@@ -133,224 +135,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
         && cfg->SpecialDaysWorktime.size() == 0)
     {
         inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
-
         return inputDate.toString(Qt::ISODate).toStdString();
     }
 
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
 
-    // Get day of week
+    // qCritical().noquote() << t;
-    int weekdayId = 0;
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
 
-    //Get min and max time defined in JSON
+    // TODO: im fehlerfall
-    double minMin = 0;
+    return t.getValidUntil().toString(Qt::ISODate).toStdString();
-    minMin = cfg->getPaymentOptions().pop_min_time;
-
-    double maxMin = 0;
-    maxMin = cfg->getPaymentOptions().pop_max_time;
-
-    double min_price = 0;
-    min_price = cfg->getPaymentOptions().pop_min_price;
-
-    if(price < min_price)
-    {
-        return "PARKING NOT ALLOWED";
-    }
-
-    if (minMin < 0) minMin = 0;
-    if (maxMin < 0) maxMin = 0;
-    if (minMin >= maxMin)
-    {
-        LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
-        return "PARKING NOT ALLOWED";
-    }
-
-    if (maxMin <= minMin)
-    {
-        LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
-        return "PARKING NOT ALLOWED";
-    }
-
-
-    // Get payment method
-    uint8_t p_method = PaymentMethod::Undefined;
-    p_method = payment_option;
-    LOG_DEBUG("Payment method id: ", (unsigned)p_method);
-
-    // Check special day
-    double day_price = 0.0f;
-    int current_special_day_id = -1;
-    bool is_special_day = Utilities::CheckSpecialDay(cfg, inputDate.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
-    LOG_DEBUG("Special day: ", is_special_day);
-
-    double money_left = price;
-    double price_per_unit = 0.0f;
-
-    QTime worktime_from;
-    QTime worktime_to;
-
-    if(is_special_day)
-    {
-        // Set special day price
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
-        worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str());
-        worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str());
-    }
-    else
-    {
-        // Set new price for the normal day
-        int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
-        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
-
-        int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
-        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
-
-        // If no working day found, skip it (recursively call method again)
-        size_t found = 0;
-        found = cfg->WeekDaysWorktime.count(weekdayId);
-
-        // When no workday found, go to next available day
-        if(found <=0)
-        {
-            LOG_DEBUG("- No workday found, trying to find next available day");
-            inputDate = inputDate.addDays(1);
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left,true,prepaid);
-        }
-        worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str());
-        worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str());
-    }
-
-    if (price_per_unit < 0) price_per_unit = 1.0f;
-
-    // if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED";
-    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
-
-    // If overtime flag is set
-    if (overtime || nextDay)
-    {
-        inputDate.setTime(worktime_from);
-        overtime = false;
-    }
-
-    // Check prepaid
-    if (!prepaid)
-    {
-        if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to))
-        {
-            LOG_DEBUG("[STOP] * Ticket is not valid * ");
-            return "PARKING NOT ALLOWED";
-        }
-    }
-    else
-    {
-        LOG_DEBUG("* PREPAID MODE ACTIVE *");
-        if (inputDate.time() < worktime_from)
-        {
-            inputDate.setTime(worktime_from);
-        }
-        else if(inputDate.time() > worktime_to)
-        {
-            LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
-            inputDate = inputDate.addDays(1);
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
-        }
-    }
-
-    while(true)
-    {
-        if((int)money_left <= 0) break;
-
-        // Check year period
-        bool isYearPeriodActive = false;
-
-        //// Parse input date
-        int dayCurrent = inputDate.date().day();
-        int monthCurrent = inputDate.date().month();
-
-        // Current date time
-        int cdt = (monthCurrent * 100) + dayCurrent;
-
-        multimap<int, ATBPeriodYear>::iterator year_period_itr;
-        for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
-        {
-            int dStart = year_period_itr->second.pye_start_day;
-            int dEnd = year_period_itr->second.pye_end_day;
-
-            int mStart = year_period_itr->second.pye_start_month;
-            int mEnd = year_period_itr->second.pye_end_month;
-
-            int start = (mStart * 100) + dStart;
-            int end = (mEnd * 100) + dEnd;
-
-            if (cdt >= start && cdt <= end) {
-                isYearPeriodActive = true;
-                break;
-            }
-        }
-        if (!isYearPeriodActive)
-        {
-            LOG_DEBUG("Year period is not valid");
-            return "PARKING NOT ALLOWED";
-        }
-
-        if(total_duration_min > maxMin)
-        {
-            total_duration_min = maxMin;
-            break;
-        }
-
-        // If reached end of worktime go to next day
-        if(inputDate.time() >= worktime_to)
-        {
-            int carry_over_status = 0;
-            carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
-            if (carry_over_status < 1) break;
-
-            inputDate = inputDate.addDays(1);
-            overtime = true;
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left ,true, prepaid);
-        }
-
-        if(money_left > 1)
-            inputDate = inputDate.addSecs(60);
-
-        if(price_per_unit > 0) total_duration_min +=1;
-        money_left -= price_per_unit;
-
-        //qDebug() <<"Timestamp:" << inputDate << ", total duration min: " << total_duration_min << ", money left = " << money_left;
-    }
-
-    //    if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
-    //    {
-    //        LOG_DEBUG("Total duration is lower than min_min");
-    //        inputDate.time() = worktime_from;
-    //        total_duration_min = 0;
-    //    }
-
-    double ret_val = 0;
-    // double calc_price = (int)total_duration_min - (int)price / price_per_unit;
-
-    //if (calc_price > 0 && total_duration_min > 0)
-    //{
-    //    inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
-    //}
-
-    if(price >= min_price && total_duration_min >= minMin)
-        qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
-    else
-    {
-        qDebug() << "Parking not allowed";
-        total_duration_min = 0;
-    }
-
-    ret_val = total_duration_min;
-    if(ret_val < 0) ret_val = 0;
-    qDebug() << "Duration: " << ret_val;
-    if (ret_val <= 0) return "PARKING NOT ALLOWED";
-
-    total_duration_min = 0;
-    return inputDate.toString(Qt::ISODate).toStdString();
 }
 
 ///////////////////////////////////////
@@ -397,6 +190,9 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                        int durationMinutes,
                                        bool nextDay,
                                        bool prepaid) {
+    Q_UNUSED(payment_option);
+    Q_UNUSED(nextDay);
+
     if (cfg->YearPeriod.size() == 0
         && cfg->SpecialDays.size() == 0
         && cfg->SpecialDaysWorktime.size() == 0)
@@ -411,7 +207,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                            durationMinutes,
                                            prepaid);
     if (t) {
-        qCritical().noquote() << t;
+        // qCritical().noquote() << t;
     }
 
     end_datetime = t.getValidUntil();
@@ -469,7 +265,7 @@ int Calculator::findNextWorkTimeRange(QDateTime const &dt,
 
         if (dt.time() < worktime_from) {
             nextWorkTimeRange = w;
-            continue;
+            break;
         }
     }
     return nextWorkTimeRange;
@@ -568,27 +364,33 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
 
         QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
 
-        // find worktime range to start with
+        // qCritical() << "start" << start.toString(Qt::ISODate)
+        //             << "current" << current.toString(Qt::ISODate) << lastWorktimeTo;
 
+        // find worktime range to start with
         int currentRange = 0;
         if (!isSpecialDay) {
             if (start != current) { // on next day
                 current.setTime(worktime[currentRange].getTimeFrom());
             } else {
                 // check if inputDate is located inside a valid worktime-range...
-                currentRange = findWorkTimeRange(current, worktime, ranges);
+                if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
-                if (currentRange == -1) { // no...
+                    if (!prepaid && carryOverNotSet) {       // parking is not allowed
-                    if (!prepaid) {       // parking is not allowed
                         return Ticket(start, QDateTime(), durationMinutesNetto, 0,
                                       0, Ticket::s[INVALID_FROM_DATETIME]);
                     }
                     // find the next worktime-range (on the same day), and start from there
-                    currentRange = findNextWorkTimeRange(current, worktime, ranges);
+                    if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
+                        end = current;
+                        continue;
+                    }
                     current.setTime(worktime[currentRange].getTimeFrom());
                 }
             }
         }
 
+        // qCritical() << "current" << current.toString(Qt::ISODate);
+
         for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
             if (durationMinutes > 0) {
                 QTime const &worktime_from = worktime[w].getTimeFrom();
@@ -601,8 +403,6 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                 }
 
                 if (price == 0) {
-                    // inputDate = inputDate.addDays(1);
-                    // inputDate.setTime(worktime_from);
                     end = current;
                     current.setTime(QTime());
                     continue;
@@ -621,12 +421,13 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                         return Ticket();
                     }
                 } else {
-                    qDebug() << "* PREPAID MODE ACTIVE *";
+                    //qDebug() << "* PREPAID MODE ACTIVE *";
+                    //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo;
                     if (current.time() < worktime_from) {
                         current.setTime(worktime_from);
                         end = current;
                     } else if(current.time() > lastWorktimeTo) {
-                        qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
+                        //qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
                         end = current;
                         current.setTime(QTime());
                         continue;
@@ -647,6 +448,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                         current.setTime(QTime());
                         break; // stop while, and continue in outer loop
                     } else {
+                        //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_to;
                         if(current.time() < worktime_to) {
                             // Increment input date minutes for each monetary unit
                             current = current.addSecs(60);
@@ -654,6 +456,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                             durationMinutes -= 1;
                             //costFromDuration += price_per_unit;
                             costFromDuration += price;
+                            //qCritical() << "current" << current.toString(Qt::ISODate);
                         } else break;
                     }
                 } // while(durationMinutes > 0) {
@@ -665,14 +468,14 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
 
     return
         Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
-               llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
+               ceil(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
                Ticket::s[VALID]);
 }
 
 
 Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                                                QDateTime const &start,
-                                               uint32_t price,
+                                               uint32_t cost,
                                                bool prepaid) {
     // Get input date
     QDateTime current = start;
@@ -683,13 +486,13 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
         && cfg->SpecialDays.size() == 0
         && cfg->SpecialDaysWorktime.size() == 0)
     {
-        uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
+        uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
         uint64_t const durationSeconds = durationMinutes * 60;
         current = current.addSecs(durationSeconds);
 
         return
             Ticket(start, current, durationMinutes, durationMinutes,
-                   price, Ticket::s[VALID]);
+                   cost, Ticket::s[VALID]);
     }
 
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
@@ -697,15 +500,15 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
     static const uint32_t minParkingTimeMinutes = std::max(getMinimalParkingTime(cfg, paymentMethodId), 0);
     static const uint32_t maxParkingTimeMinutes = std::max(getMaximalParkingTime(cfg, paymentMethodId), 0);
     static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
-    static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
+    // static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
     static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
-    static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
+    static const uint32_t weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
-    static const double specialDaysDurationUnit = 60.0;
+    static const uint32_t specialDaysDurationUnit = 60;
 
-    if(price < minParkingPrice) {
+    if(cost < minParkingPrice) {
-        uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
+        uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
         return Ticket(start, current, durationMinutes, durationMinutes,
-                   price, Ticket::s[INVALID_PRICE]);
+                   cost, Ticket::s[INVALID_PRICE]);
     }
     if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
         // TODO
@@ -717,14 +520,15 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
     }
 
     uint32_t durationMinutesNetto = 0;
-    int moneyLeft = price;
+    double moneyLeft = cost;
-    //double durationUnit = 0.0;
+    double durationUnit = 1;
     int specialDayId = -1;
     bool isSpecialDay = false;
     QDateTime end = start;
     int totalTimeRanges = 0;
+    double price = 0;
 
-    for (current = start; moneyLeft > 0; current = current.addDays(1)) {
+    for (current = start; moneyLeft > 0 && moneyLeft >= price; current = current.addDays(1)) {
         int const weekdayId = current.date().dayOfWeek();
 
         specialDayId = -1;
@@ -734,9 +538,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
         QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
         int ranges = 0;
 
-        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
+        uint32_t p = 0;
+        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &p))) {
             // Set special day price:
-      //      durationUnit = specialDaysDurationUnit;
+            durationUnit = specialDaysDurationUnit;
+            price = p / durationUnit;
+            price = std::round(price * 1000.0) / 1000.0;
             worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
                                           SpecialDaysWorkTimeUntil(cfg, specialDayId));
             ranges = 1;
@@ -745,11 +552,13 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
             // for the price, rather compute with integers. Only at the very end of
             // the computation the price is divided by durationUnit.
             price = weekDaysPrice;
-      //      durationUnit = weekDaysDurationUnit;
+            durationUnit = weekDaysDurationUnit;
+            price /= durationUnit;
+            price = std::round(price * 1000.0) / 1000.0; // round to 3 decimals
 
             // If no working day found, skip it (epsecially Sundays!)
             if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
-                qDebug() << "No workday found, trying to find next available day";
+         //     qDebug() << "No workday found, trying to find next available day";
                 end = current;
                 current.setTime(QTime()); // start at midnight on the next day
                 continue;
@@ -768,21 +577,22 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
         QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
 
         // find worktime range to start with
-
         int currentRange = 0;
         if (!isSpecialDay) {
             if (start != current) { // on next day
                 current.setTime(worktime[currentRange].getTimeFrom());
             } else {
                 // check if inputDate is located inside a valid worktime-range...
-                currentRange = findWorkTimeRange(current, worktime, ranges);
+                if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
-                if (currentRange == -1) { // no...
+                    if (!prepaid && carryOverNotSet) {       // parking is not allowed
-                    if (!prepaid) {       // parking is not allowed
                         return Ticket(start, QDateTime(), durationMinutesNetto, 0,
                                       0, Ticket::s[INVALID_FROM_DATETIME]);
                     }
                     // find the next worktime-range (on the same day), and start from there
-                    currentRange = findNextWorkTimeRange(current, worktime, ranges);
+                    if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
+                        end = current;
+                        continue;
+                    }
                     current.setTime(worktime[currentRange].getTimeFrom());
                 }
             }
@@ -832,7 +642,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                     }
                 }
 
-                while(moneyLeft > 0) {
+                while(moneyLeft >= price) {
                     // Check for active year period
                     if (!IsYearPeriodActive(cfg, current)) {
                         return Ticket();
@@ -852,14 +662,11 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                     } else {
                         if(current.time() < worktime_to) {
                             // Increment input date minutes for each monetary unit
-                            if(moneyLeft > 1) {
+                            durationMinutesNetto +=1;
-                                current = current.addSecs(60);
-                            }
-                            end = current;
-                            if(price > 0) {
-                                durationMinutesNetto +=1;
-                            }
                             moneyLeft -= price;
+                            moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
+                            current = current.addSecs(60);
+                            end = current;
                         } else break;
                     }
                 } // while(durationMinutes > 0) {
@@ -869,9 +676,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
 
     int durationMinutesBrutto =  start.secsTo(end) / 60;
 
+    //qCritical() << "start" << start.toString(Qt::ISODate) << "end"
+    //            << end.toString(Qt::ISODate) << durationMinutesBrutto;
+
     return
         Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
-               price, Ticket::s[VALID]);
+               cost, Ticket::s[VALID]);
 }
 
 QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {

library/src/ticket.cpp

@@ -48,7 +48,7 @@ QDateTime Ticket::getValidFrom() const {
     
 QDateTime Ticket::getValidUntil() const {
     if (std::get<CODE>(m_status) == VALID) {
-        return m_validFrom;
+        return m_validUntil;
     }
     return QDateTime();
 }

library/src/utilities.cpp

@@ -373,3 +373,29 @@ PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
 
     return PaymentMethod::Undefined;
 }
+
+int Utilities::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
+}
+
+int Utilities::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
+}
+
+uint32_t Utilities::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0);
+}
+
+uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId) {
+
+    int const popId = cfg->PaymentOption.find(methodId)->second.pop_id;
+    int const punId = cfg->PaymentRate.find(popId)->second.pra_payment_unit_id;
+    uint32_t const firstDurationStep= cfg->Duration.find(punId)->second.pun_duration;
+
+    qCritical() << "getFirstDurationStep() payment-method-id:" << (int)methodId;
+    qCritical() << "getFirstDurationStep()            pop-id:" << popId;
+    qCritical() << "getFirstDurationStep()            pun-id:" << punId;
+    qCritical() << "getFirstDurationStep()        first-step:" << firstDurationStep;
+
+    return firstDurationStep;
+}

main/main.cpp

@@ -33,10 +33,16 @@ extern "C" char* strptime(const char* s,
 #include "calculator_functions.h"
 #include <calculate_price.h>
 
+#define SZEGED               (1)
+#define NEUHAUSER_KORNEUBURG (0)
+
 
 int main() {
 
+#if NEUHAUSER_KORNEUBURG==1
     std::ifstream input("/tmp/tariff_korneuburg.json");
+    int pop_max_time;
+
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
@@ -47,121 +53,130 @@ int main() {
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
     cout << endl;
 
+    if (isParsed) {
+        {
+            pop_max_time = 3*60;
+            bool nextDay = false;
+            bool prePaid = true;
+            // zone 1 (lila)
+            QDateTime s(QDate(2023, 11, 30), QTime());
+            QDateTime end;
+            for (int duration = 30; duration <= pop_max_time; duration += 5) {
+                for (int offset = 420; offset < 1140; ++offset) {
+                    if (offset > 720 && offset < 840) {
+                        continue;
+                    }
+                    QDateTime start = s.addSecs(offset * 60);
+                    //qCritical() << "start" << start.toString(Qt::ISODate);
 
-    if (isParsed)
+                    double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
-    {
+                    //Q_ASSERT(cost == duration*2.5);
-        QDateTime start = QDateTime::fromString("2023-11-27T17:50:00",Qt::ISODate);
+                    //qCritical() << "";
-        //QDateTime start = QDateTime::currentDateTime();
+                    //qCritical() << "start" << start.toString(Qt::ISODate)
-        QDateTime end = start.addSecs(120);
+                    //            << "end" << end.toString(Qt::ISODate)
-        uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+                    //            << "duration" << duration
-        qCritical() << "cost=" << cost;
+                    //            << "cost" << cost;
-        qCritical() << "end=" << end;
+
+                    std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
+                    //Q_ASSERT(cost == duration*2.5);
+                    qCritical() << "start" << start.toString(Qt::ISODate)
+                                << "cost" << cost
+                                << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
+                }
+            }
+        }
+    }
+    return 0;
+
+#elif SZEGED==1
+    std::ifstream input;
+    int pop_max_time;
+
+    for (int t=6; t < 7; t+=20) {
+        switch (t) {
+        case 1: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
+            pop_max_time = 6*60;
+        } break;
+        case 2: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff02.json");
+            pop_max_time = 5*60;
+        } break;
+        case 3: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff03.json");
+            pop_max_time = 6*60;
+        } break;
+        case 4: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff04.json");
+            pop_max_time = 4*60;
+        } break;
+        case 5: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff05.json");
+            pop_max_time = 6*60;
+        } break;
+        case 6: {
+            input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff06.json");
+            pop_max_time = 4*60;
+        } break;
+        default:
+            continue;
+        }
+        std::stringstream sstr;
+        while(input >> sstr.rdbuf());
+        std::string json(sstr.str());
+
+        Calculator calculator;
+        Configuration cfg;
+
+        bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+        cout << endl;
+
+        if (isParsed) {
+            {
+                // zone 1 (lila)
+                QDateTime s(QDate(2023, 11, 30), QTime());
+                QDateTime end;
+                for (int duration = 15; duration <= pop_max_time; duration += 5) {
+                    for (int offset = 480; offset < 1080; ++offset) {
+                        QDateTime start = s.addSecs(offset * 60);
+                        //qCritical() << "start" << start.toString(Qt::ISODate);
+
+                        double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration);
+                        //Q_ASSERT(cost == duration*2.5);
+                        //qCritical() << "";
+                        //qCritical() << "start" << start.toString(Qt::ISODate)
+                        //            << "end" << end.toString(Qt::ISODate)
+                        //            << "duration" << duration
+                        //            << "cost" << cost;
+
+                        std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
+                        //Q_ASSERT(cost == duration*2.5);
+                        qCritical() << "start" << start.toString(Qt::ISODate)
+                                    << "cost" << cost
+                                    << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
+                    }
+                }
+            }
+            {
+                QDateTime start(QDate(2023, 12, 1), QTime(18, 0));
+                QDateTime end;
+                double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+               // Q_ASSERT(cost == 150);
+                qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
+            }
+            {
+                QDateTime start(QDate(2023, 10, 31), QTime(18, 0));
+                QDateTime end;
+                double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+                //Q_ASSERT(cost == 150);
+                qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
+            }
+        }
     }
 
     return 0;
 
-
+#endif
-
-
-
-
-
-    parking_tariff_t *tariff = 0;
-    if (init_tariff(&tariff, "/etc/psa_tariff/")) {      
-        struct price_t price;
-        memset(&price, 0x00, sizeof(price));
-
-        QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();
-        time_t start_parking_time = start.toSecsSinceEpoch() / 60;
-        time_t end_parking_time = start_parking_time + 615;
-
-        if (compute_price_for_parking_ticket(tariff,
-                                             start_parking_time,
-                                             end_parking_time,
-                                             &price))
-        {
-            qDebug() << "GetCostFromDuration() => price=" << price.netto;
-        }
-
-        QString duration;
-        if(compute_duration_for_parking_ticket(tariff,start_parking_time,3090,duration))
-        {
-            qDebug() << "GetDurationFromCost() => duration=" << duration;
-        }
-
-        // Daily ticket
-        //compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
-
-        //Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
-        //        // tests
-        //        struct tm now;
-        //        memset(&now, 0, sizeof(now));
-
-        //        // 3.Jan 2023 -> Tuesday
-        //        strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
-        //        for (int i = 0; i < 600; ++i) {
-        //            start_parking_time = mktime(&now);
-        //            end_parking_time = start_parking_time + 240; // duration == 240
-
-        //            if (compute_price_for_parking_ticket(tariff,
-        //                                                 start_parking_time,
-        //                                                 end_parking_time,
-        //                                                 &price)) {
-        //                int const zone = get_zone_nr(1);
-        //                switch (zone) {
-        //                case 1:
-        //                    assert(price.netto == 879);    // expected value: 880
-        //                    break;
-        //                case 2:
-        //                    /* fall through */
-        //                case 3:
-        //                    assert(price.netto == 1920);
-        //                    break;
-        //                }
-        //            }
-        //            time_t t = start_parking_time + 60;
-        //            now = *localtime(&t);
-        //        }
-        //        //
-        //        // test May 1st 2023
-        //        //
-        //        memset(&now, 0, sizeof(now));
-        //        strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
-        //        now.tm_hour -= 1; // for ctime
-        //        // for (int i=0; i<6*24; ++i) {
-        //        for (int i=0; i<1; ++i) {
-        //            int const duration = 120;
-        //            time_t t = mktime(&now);
-        //            start_parking_time = t / 60;
-        //            end_parking_time = start_parking_time + duration;
-
-        //            if (compute_price_for_parking_ticket(tariff,
-        //                                                 start_parking_time,
-        //                                                 end_parking_time,
-        //                                                 &price)) {
-        //                int const zone = get_zone_nr();
-        //                switch (zone) {
-        //                case 1:
-        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                    assert(price.netto == 440);
-        //                    break;
-        //                case 2:
-        //                    /* fall through */
-        //                case 3:
-        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                    assert(price.netto == 960);
-        //                    break;
-        //                }
-        //            }
-
-        //            t = (start_parking_time + 60)*60;
-        //            now = *localtime(&t);
-        //        }
-
-        free_tariff(tariff);
-    }
-
-    return 0;
 
 #if 0
 

tariffs/tariff_new_01.json

@@ -0,0 +1,805 @@
+{
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "Ft",
+      "pcu_major": "HUF",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone Lila",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "16:25:00",
+      "pop_day_night_end_time": "16:25:00",
+      "pop_price_night": 0,
+      "pop_min_time": 15,
+      "pop_max_time": 300,
+      "pop_min_price": 0,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 900
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 150
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "1h",
+      "pun_duration": 60
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "1 min",
+      "pun_duration": 1
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "18:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "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,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ],
+  "SpecialDaysWorktime": [
+    {
+      "pedwt_id": 2156,
+      "pedwt_period_exc_day_id": 2024,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2158,
+      "pedwt_period_exc_day_id": 2025,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2160,
+      "pedwt_period_exc_day_id": 2026,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2162,
+      "pedwt_period_exc_day_id": 2027,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2164,
+      "pedwt_period_exc_day_id": 2028,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2170,
+      "pedwt_period_exc_day_id": 2030,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2172,
+      "pedwt_period_exc_day_id": 2032,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2174,
+      "pedwt_period_exc_day_id": 11,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2175,
+      "pedwt_period_exc_day_id": 13,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2178,
+      "pedwt_period_exc_day_id": 2022,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2179,
+      "pedwt_period_exc_day_id": 14,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2184,
+      "pedwt_period_exc_day_id": 2021,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2188,
+      "pedwt_period_exc_day_id": 2031,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2189,
+      "pedwt_period_exc_day_id": 2029,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2194,
+      "pedwt_period_exc_day_id": 2034,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2200,
+      "pedwt_period_exc_day_id": 2037,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2202,
+      "pedwt_period_exc_day_id": 2038,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2226,
+      "pedwt_period_exc_day_id": 2016,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2245,
+      "pedwt_period_exc_day_id": 2035,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2246,
+      "pedwt_period_exc_day_id": 2036,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2249,
+      "pedwt_period_exc_day_id": 2050,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2250,
+      "pedwt_period_exc_day_id": 2051,
+      "pedwt_time_from": "08:00:00",
+      "pedwt_time_to": "16:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2251,
+      "pedwt_period_exc_day_id": 2052,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2252,
+      "pedwt_period_exc_day_id": 2053,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2253,
+      "pedwt_period_exc_day_id": 2054,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2254,
+      "pedwt_period_exc_day_id": 2055,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2255,
+      "pedwt_period_exc_day_id": 2056,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2256,
+      "pedwt_period_exc_day_id": 2057,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2257,
+      "pedwt_period_exc_day_id": 2058,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2258,
+      "pedwt_period_exc_day_id": 2059,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2259,
+      "pedwt_period_exc_day_id": 2060,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "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": [
+    {
+      "ped_id": 2016,
+      "ped_label": "Christmas",
+      "ped_date_start": "2023-12-24",
+      "ped_date_end": "2023-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 11,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2023-12-25",
+      "ped_date_end": "2023-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 13,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2023-12-26",
+      "ped_date_end": "2023-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2022,
+      "ped_label": "NewYear",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 14,
+      "ped_label": "1848 Revolution Memorial Day",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2024,
+      "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": 2025,
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2026,
+      "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": 2030,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2027,
+      "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
+    },
+    {
+      "ped_id": 2028,
+      "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": 2031,
+      "ped_label": "National Day",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2054,
+      "ped_label": "1956 Revolution Memorial Day",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2032,
+      "ped_label": "All Saints Day",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2024-12-24",
+      "ped_date_end": "2024-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2052,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2053,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2029,
+      "ped_label": "1848 Revolution Memorial Day",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2034,
+      "ped_label": "Good Friday",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2035,
+      "ped_label": "Easter",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2036,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2038,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2024-06-08",
+      "ped_date_end": "2024-06-08",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2037,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2065,
+      "ped_label": "<<<<< Hungary National Day >>>>>",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2021,
+      "ped_label": "Holiday (Hungary)",
+      "ped_date_start": "2023-12-31",
+      "ped_date_end": "2023-12-31",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2050,
+      "ped_label": "Uskrs",
+      "ped_date_start": "2023-04-16",
+      "ped_date_end": "2023-04-16",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2051,
+      "ped_label": "Uskrs",
+      "ped_date_start": "2023-04-16",
+      "ped_date_end": "2023-04-16",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Holiday (Hungary)",
+      "ped_date_start": "2022-12-31",
+      "ped_date_end": "2022-12-31",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Good Friday",
+      "ped_date_start": "2023-04-07",
+      "ped_date_end": "2023-04-07",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2023-04-09",
+      "ped_date_end": "2023-04-09",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2023-04-10",
+      "ped_date_end": "2023-04-10",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2023-05-28",
+      "ped_date_end": "2023-05-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2062,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2023-05-29",
+      "ped_date_end": "2023-05-29",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2063,
+      "ped_label": "Revolution Day (Hungary)",
+      "ped_date_start": "2023-03-15",
+      "ped_date_end": "2023-03-15",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2066,
+      "ped_label": "All Saints Day",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-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
+    }
+  ]
+}