Add tests for linsinger maschinenbau.

set static variables using helpers moved to namespace Utilities.

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,7 +1,14 @@
-#pragma once
+#ifndef CALCULATOR_FUNCTIONS_H_INCLUDED
+#define CALCULATOR_FUNCTIONS_H_INCLUDED
+
 #include <iostream>
+#include <optional>
+
 #include "configuration.h"
 #include "payment_method.h"
+#include "ticket.h"
+#include "tariff_time_range.h"
+
 #include <QDateTime>
 using namespace std;
 
@@ -38,6 +45,20 @@ public:
     // (e.g. Schoenau/Koenigsee)
     //
     QList<int> GetTimeSteps(Configuration *cfg) const;
+    QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
+
+    // additional helper functions
+    bool noSpecialDays(Configuration const *cfg) const {
+        return (cfg->SpecialDays.size() == 0) && (cfg->SpecialDaysWorktime.size() == 0);
+    }
+    bool specialDays(Configuration const *cfg) const {
+        return !noSpecialDays(cfg);
+    }
+    bool tariffIs24_7(Configuration const *cfg) const {
+        return (cfg->YearPeriod.size() == 0 &&
+                cfg->SpecialDays.size() == 0 &&
+                cfg->SpecialDaysWorktime.size() == 0);
+    }
 
 private:
     // Introduced for PaymentMethod::Steps (e.g. Schoenau)
@@ -45,23 +66,34 @@ private:
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
 
-    PaymentMethod getPaymentMethodId(Configuration const *cfg);
+    Ticket private_GetCostFromDuration(Configuration const* cfg,
-    int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
-    int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
-
-    uint32_t private_GetCostFromDuration(Configuration const* cfg,
                                        QDateTime const &start,
-                                         QDateTime &end,
                                        int durationMinutes,
-                                         bool nextDay = false,
+                                       bool prepaid = false);
-                                         bool prepaid = false,
+    Ticket private_GetDurationFromCost(Configuration *cfg,
-                                         bool overtime = false);
+                                       QDateTime const &start,
+                                       uint32_t price,
+                                       bool prepaid = false);
 
-    bool checkDurationMinutes(bool overTime,
+    bool checkDurationMinutes(int minParkingTime, int maxParkingTime,
-                              int minParkingTime, int maxParkingTime,
                               int durationMinutes);
 
     //
     uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
+    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+        return GetPriceForTimeStep(cfg, step);
+    }
     uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
+    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
+        return GetDurationForPrice(cfg, price);
+    }
+
+    int findWorkTimeRange(QDateTime const &dt,
+                          QScopedArrayPointer<TariffTimeRange> const &worktime,
+                          size_t size);
+    int findNextWorkTimeRange(QDateTime const &dt,
+                              QScopedArrayPointer<TariffTimeRange> const &worktime,
+                              size_t size);
 };
+
+#endif // CALCULATOR_FUNCTIONS_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -4,6 +4,8 @@
 class ATBPaymentOption
 {
 public:
+    ATBPaymentOption() = default;
+
     int pop_id;
     std::string pop_label;
     int pop_payment_method_id;
@@ -15,4 +17,5 @@ public:
     double pop_min_price;
     int pop_carry_over;
     int pop_daily_card_price;
+    int pop_business_hours;
 };

library/include/mobilisis/tariff_business_hours.h

@@ -0,0 +1,21 @@
+#ifndef TARIFF_BUSINESS_HOURS_H_INCLUDED
+#define TARIFF_BUSINESS_HOURS_H_INCLUDED
+
+/// <summary>
+/// Business hours (byte represents payment option id)
+/// </summary>
+enum BusinessHours
+{
+    NoRestriction_24_7          = 0,
+    OnlyWorkingDays             = 1,    // [Monday-Friday]
+    OnlyWeekDays                = 2,    // [Monday-Saturday]
+    OnlyWeekEnd                 = 4,    // [Saturday+Sunday]
+    OnlyOfficialHolidays        = 8,
+    OnlySpecialDays             = 16,
+    OnlySchoolHolidays          = 32,
+    SpecialAndSchoolHolidays    = 48,
+    OnlyOpenForBusinessDays     = 64,   // verkaufsoffen
+    NoBusinessHoursDefined      = 255
+};
+
+#endif // TARIFF_BUSINESS_HOURS_H_INCLUDED

library/include/mobilisis/tariff_time_range.h

@@ -16,6 +16,12 @@ public:
     : m_time_from(QTime())
     , m_time_until(QTime()) {}
 
+    TariffTimeRange(QTime const& from, QTime const &until)
+      : m_time_from(from)
+      , m_time_until(until) {
+
+    }
+
     void setTimeRange(QTime const& from, QTime const &until) {
         m_time_from = from;
         m_time_until = until;

library/include/mobilisis/ticket.h

@@ -13,7 +13,8 @@
 #define VALID                   (1)
 #define INVALID_FROM_DATETIME   (2)
 #define INVALID_UNTIL_DATETIME  (3)
-#define STATUS_END              (4)
+#define INVALID_PRICE           (4)
+#define STATUS_END              (5)
 
 class Ticket {
     enum {CODE=0, CODE_STR=1, CODE_DESC=3};
@@ -21,6 +22,9 @@ public:
     using Status = std::tuple<int, char const*, char const*>;
 
     explicit Ticket();
+    explicit Ticket(QDateTime const &s, QDateTime const &e,
+                    int durationMinutesNetto, int durationMinutesBrutto,
+                    uint32_t price, Status status);
 
     explicit operator bool() { return std::get<CODE>(m_status) == VALID; }
     operator QString();
@@ -35,6 +39,16 @@ public:
     void setValidUntil(QDateTime const &validUnil);
     void setPrice(uint32_t price);
 
+    bool isValid() { return operator bool(); }
+
+    static constexpr const Status s[STATUS_END] = {
+        {NOT_INITIALIZED       , "NOT_INITIALIZED"       , "Ticket not initialized"           },
+        {VALID                 , "VALID"                 , "Ticket is valid"                  },
+        {INVALID_FROM_DATETIME , "INVALID_FROM_DATETIME" , "Ticket has invalid start datetime"},
+        {INVALID_UNTIL_DATETIME, "INVALID_UNTIL_DATETIME", "Ticket has invalid end datetime"  },
+        {INVALID_PRICE         , "INVALID_PRICE"         , "PARKING NOT ALLOWED: Ticket has invalid price" }
+    };
+
 private:
     Status m_status;
 
@@ -45,20 +59,8 @@ private:
     int m_durationMinutesBrutto;
 
     uint32_t m_price;
-
-    static constexpr const Status s[STATUS_END] = {
-        {NOT_INITIALIZED       , "NOT_INITIALIZED"       , "Ticket not initialized"           },
-        {VALID                 , "VALID"                 , "Ticket is valid"                  },
-        {INVALID_FROM_DATETIME , "INVALID_FROM_DATETIME" , "Ticket has invalid start datetime"},
-        {INVALID_UNTIL_DATETIME, "INVALID_UNTIL_DATETIME", "Ticket has invalid end datetime"  }
-    };
 };
     
-QDebug operator<<(QDebug debug, Ticket::Status const &status) {
+QDebug operator<<(QDebug debug, Ticket::Status const &status);
-    QDebugStateSaver saver(debug);
-    debug << "Ticket-Status: " << std::get<1>(status) 
-          << "(" << std::get<2>(status) << ")";
-    return debug;
-}
 
 #endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <cstring>
-#include <string.h>
 #include <ctime>
 #include <iostream>
 #include <cmath>
@@ -8,6 +7,8 @@
 #include "day_of_week.h"
 #include "configuration.h"
 #include "time_range.h"
+#include "payment_method.h"
+#include "tariff_business_hours.h"
 
 #include <QDateTime>
 
@@ -57,6 +58,7 @@ namespace Utilities {
 	/// <param name="currentDateTime"></param>
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
+    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
 
 	/// <summary>
 	/// Check permissions
@@ -75,4 +77,17 @@ namespace Utilities {
 
     QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
     QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
+    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
+    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
+    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);
+    BusinessHours getBusinessHours(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
+    double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
 }

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
@@ -68,7 +68,8 @@ HEADERS += \
     include/mobilisis/tariff_log.h \
     include/mobilisis/calculate_price.h \
     include/mobilisis/atb_project.h \
-    include/mobilisis/ticket.h
+    include/mobilisis/ticket.h \
+    include/mobilisis/tariff_business_hours.h
 
 OTHER_FILES += src/main.cpp
 

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

@@ -3,6 +3,7 @@
 #include "utilities.h"
 #include "tariff_log.h"
 #include "tariff_time_range.h"
+#include "ticket.h"
 
 #include <sstream>
 #include <algorithm>
@@ -121,235 +122,54 @@ 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);
 
-    // use tariff with structure as for instance Schnau, Koenigsee:
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    if (paymentMethodId == PaymentMethod::Steps) {
+        if (tariffIs24_7(cfg)) {
+            // use tariff with structure as for instance Schoenau, 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();
-    }
+        } else {
+            QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate);
+            if (Utilities::IsYearPeriodActive(cfg, start)) {
+                if (!prepaid) {
+                    BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
+                    if (businessHours == BusinessHours::OnlyWeekDays) {
+                        int const weekdayId = start.date().dayOfWeek();
 
+                        using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+                        std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
 
-    // Get day of week
+                        for (WTIterator itr = p.first; itr != p.second; ++itr) {
-    int weekdayId = 0;
+                            QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
+                            QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
+                            QTime const& startTime = start.time();
 
-    //Get min and max time defined in JSON
+                            if (from <= startTime && startTime <= until) {
-    double minMin = 0;
+                                return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).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)
+                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
-    {
+                return 0;
-        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)
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
-        {
-            total_duration_min = maxMin;
-            break;
-        }
 
-        // If reached end of worktime go to next day
+    // qCritical().noquote() << t;
-        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);
+    // TODO: im fehlerfall
-            overtime = true;
+    return t.getValidUntil().toString(Qt::ISODate).toStdString();
-            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();
 }
 
 ///////////////////////////////////////
@@ -362,9 +182,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
                                          quint64 timeStepInMinutes) const {
     // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
     // special days, nonstop.
-    if (cfg->YearPeriod.size() == 0
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-     && cfg->SpecialDays.size() == 0
+    if (paymentMethodId == PaymentMethod::Steps) {
-     && cfg->SpecialDaysWorktime.size() == 0) {
         QDateTime const end = start.addSecs(timeStepInMinutes*60);
         return GetCostFromDuration(cfg, start, end);
     }
@@ -374,9 +193,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
 uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          QDateTime const &start,
                                          QDateTime const &end) const {
-    if (cfg->YearPeriod.size() == 0
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-     && cfg->SpecialDays.size() == 0
+    if (paymentMethodId == PaymentMethod::Steps) {
-     && cfg->SpecialDaysWorktime.size() == 0) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
         return GetPriceForTimeStep(cfg, timeStepInMinutes);
     }
@@ -396,32 +214,61 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                        int durationMinutes,
                                        bool nextDay,
                                        bool prepaid) {
-    if (cfg->YearPeriod.size() == 0
+    Q_UNUSED(payment_option);
-        && cfg->SpecialDays.size() == 0
+    Q_UNUSED(nextDay);
-        && cfg->SpecialDaysWorktime.size() == 0)
+
-    {
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    if (paymentMethodId == PaymentMethod::Steps) {
+        if (tariffIs24_7(cfg)) {
+            end_datetime = start_datetime.addSecs(durationMinutes*60);
+            return GetCostFromDuration(cfg, start_datetime, end_datetime);
+        } else {
+            if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
+                if (!prepaid) {
+                    BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
+                    if (businessHours == BusinessHours::OnlyWeekDays) {
+                        int const weekdayId = start_datetime.date().dayOfWeek();
+
+                        using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+                        std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+                        for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                            QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                            QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
+                            QTime const &startTime = start_datetime.time();
+
+                            if (from <= startTime && startTime <= until) {
                                 end_datetime = start_datetime.addSecs(durationMinutes*60);
                                 return GetCostFromDuration(cfg, start_datetime, end_datetime);
                             }
-
+                        }
-    return private_GetCostFromDuration(cfg, start_datetime,
+                    }
-                                       end_datetime, durationMinutes,
-                                       nextDay, prepaid);
                 }
 
-int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
+                end_datetime = QDateTime();
+                return 0;
+            }
+        }
     }
 
-int Calculator::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    QDateTime start = start_datetime;
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
+
+    Ticket t = private_GetCostFromDuration(cfg, start,
+                                           durationMinutes,
+                                           prepaid);
+    if (t) {
+        // qCritical().noquote() << t;
     }
 
-bool Calculator::checkDurationMinutes(bool overtime,
+    end_datetime = t.getValidUntil();
-                                      int minParkingTime,
+
+    return t.getPrice();
+}
+
+bool Calculator::checkDurationMinutes(int minParkingTime,
                                       int maxParkingTime,
                                       int durationMinutes) {
-    if (!overtime) {
     if (durationMinutes > maxParkingTime) {
         qWarning() << QString("Total duration >= max_min (%1 >= %2)").arg(durationMinutes).arg(maxParkingTime);
         return false;
@@ -430,190 +277,425 @@ bool Calculator::checkDurationMinutes(bool overtime,
         qWarning() << QString("Total duration <= minMin (%1 <= %2)").arg(durationMinutes).arg(minParkingTime);
         return false;
     }
-    }
+
     return true;
 }
 
+int Calculator::findWorkTimeRange(QDateTime const &dt,
+                                  QScopedArrayPointer<TariffTimeRange> const &worktime,
+                                  size_t size) {
+    for (size_t w = 0; w < size; ++w) {
+        QTime const &worktime_from = worktime[w].getTimeFrom();
+        QTime const &worktime_to = worktime[w].getTimeUntil();
+
+        if ((dt.time() >= worktime_from) && (dt.time() < worktime_to)) {
+            return w;
+        }
+    }
+    return -1;
+}
+
+int Calculator::findNextWorkTimeRange(QDateTime const &dt,
+                                      QScopedArrayPointer<TariffTimeRange> const &worktime,
+                                      size_t size) {
+    int nextWorkTimeRange = -1;
+    for (size_t w = 0; w < size; ++w) {
+        QTime const &worktime_from = worktime[w].getTimeFrom();
+
+        if (dt.time() < worktime_from) {
+            nextWorkTimeRange = w;
+            break;
+        }
+    }
+    return nextWorkTimeRange;
+}
+
 using namespace Utilities;
 
-uint32_t Calculator::private_GetCostFromDuration(Configuration const* cfg,
+Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                                                QDateTime const &start,
-                                                 QDateTime &end,
+                                               int durationMinutes, // Netto
-                                                 int durationMinutes,
+                                               bool prepaid) {
-                                                 bool nextDay,
-                                                 bool prepaid,
-                                                 bool overtime) {
-    // TODO
-    static const PaymentMethod paymentMethodId = PaymentMethod::Linear;
 
-    static int const minParkingTimeMinutes = getMinimalParkingTime(cfg, paymentMethodId);
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    static int const maxParkingTimeMinutes = getMaximalParkingTime(cfg, paymentMethodId);
+    static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
-
+    static const int minParkingTimeMinutes = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
-    static bool const checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
+    static const int maxParkingTimeMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
+    static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
+    static const int durationMinutesNetto = durationMinutes;
+    static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
+    static const double weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
+    static const double specialDaysDurationUnit = 60.0;
 
     if (!checkMinMaxMinutes) {
         qCritical() << QString(
             "ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID")
                 .arg(minParkingTimeMinutes).arg(maxParkingTimeMinutes);
-        return 0;
+        return Ticket();
     }
 
-    if (!checkDurationMinutes(overtime, minParkingTimeMinutes,
+    if (!checkDurationMinutes(minParkingTimeMinutes,
                               maxParkingTimeMinutes, durationMinutes)) {
-        return 0;
+        return Ticket();
     }
 
-    // Get input date
+    uint32_t price = 0;
-    QDateTime inputDate = start;
+    uint32_t costFromDuration = 0;
+    double durationUnit = 0.0;
+    int specialDayId = -1;
+    bool isSpecialDay = false;
+    Ticket ticket;
+    QDateTime end = start;
+    QDateTime current;
+    int totalTimeRanges = 0;
 
-    // Get day of week
+    for (current = start; durationMinutes > 0; current = current.addDays(1)) {
-    int const weekdayId = inputDate.date().dayOfWeek();
+        int const weekdayId = current.date().dayOfWeek();
 
+        specialDayId = -1;
 
-    uint32_t day_price = 0;
+        // find worktime ranges for the current day
-    uint32_t price_per_unit = 0;
-
-    int current_special_day_id = -1;
-
         int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
         QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
-    int index = 0;
+        int ranges = 0;
 
-    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &day_price)) {
+        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
             // Set special day price:
-        // ACHTUNG: price_per_unit ist eigentlich immer preis pro minute !!!
+            durationUnit = specialDaysDurationUnit;
-        price_per_unit = CalculatePricePerUnit(day_price);
+            worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
-        worktime[index].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
+                                          SpecialDaysWorkTimeUntil(cfg, specialDayId));
-                                     SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
+            ranges = 1;
         } else {
-        // Set new price for the normal day
+            // Set new price for the normal day: do not use a floating-point type
+            // 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;
 
-        int pop_id = cfg->PaymentOption.find(paymentMethodId)->second.pop_id;
+            // If no working day found, skip it (epsecially Sundays!)
-        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)
             if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
-            // When no workday found, go to next available day
                 qDebug() << "No workday found, trying to find next available day";
-            inputDate = inputDate.addDays(1);
+                end = current;
-            return private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
+                current.setTime(QTime()); // start at midnight on the next day
-        }
-
-        for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) {
-            qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str();
-            worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()),
-                                         QTime::fromString(itr->second.pwd_time_to.c_str()));
-            index += 1;
-        }
-    }
-
-    if (price_per_unit < 0) price_per_unit = 1.0f;
-    qDebug() << "Calculated price per minute=" << price_per_unit;
-
-    double costFromDuration = 0.0;
-    for (int w = 0; w < index; ++w) {
-        QTime worktime_from = worktime[w].getTimeFrom();
-        QTime worktime_to = worktime[w].getTimeUntil();
-
-        if (price_per_unit == 0) {
-            inputDate = inputDate.addDays(1);
-            inputDate.setTime(worktime_from);
-            uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
-            if (partialCost == 0) {
-                return 0;
-            }
-            costFromDuration += partialCost;
                 continue;
             }
 
-        // If overtime flag is set
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-        if (overtime || nextDay) {
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
-            inputDate.setTime(worktime_from);
+
-            overtime = false;
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                worktime[ranges].setTimeRange(WeekDaysWorkTimeFrom(itr),
+                                              WeekDaysWorkTimeUntil(itr));
+                ranges += 1;
+            }
+        }
+
+        QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
+
+        // 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...
+                if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
+                    if (!prepaid && carryOverNotSet) {       // 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
+                    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();
+                QTime const &worktime_to = worktime[w].getTimeUntil();
+
+                if (totalTimeRanges) {
+                    // durationMinutes are always meant as netto time and
+                    // the time between worktime-ranges are free.
+                    current.setTime(worktime_from);
+                }
+
+                if (price == 0) {
+                    end = current;
+                    current.setTime(QTime());
+                    continue;
+                }
+
+                if (current.time() == worktime_to) {
+                    end = current;
+                    current.setTime(QTime());
+                    continue;
                 }
 
                 // Check prepaid
                 if (!prepaid) {
-            if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) {
+                    if ((current.time() < worktime_from) || (current.time() > worktime_to)) {
                         qDebug() << "[STOP] * Ticket is not valid * ";
-                return 0.0f;
+                        return Ticket();
                     }
                 } else {
-            qDebug() << "* PREPAID MODE ACTIVE *";
+                    //qDebug() << "* PREPAID MODE ACTIVE *";
-            if (inputDate.time() < worktime_from) {
+                    //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo;
-                inputDate.setTime(worktime_from);
+                    if (current.time() < worktime_from) {
-            } else if(inputDate.time() > worktime_to) {
+                        current.setTime(worktime_from);
-                qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
+                        end = current;
-                inputDate = inputDate.addDays(1);
+                    } else if(current.time() > lastWorktimeTo) {
-                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
+                        //qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
-                if (partialCost == 0) {
+                        end = current;
-                    return 0;
+                        current.setTime(QTime());
-                }
-                costFromDuration += partialCost;
                         continue;
                     }
                 }
 
                 while(durationMinutes > 0) {
                     // Check for active year period
-            if (std::none_of(cfg->YearPeriod.begin(),
+                    if (!IsYearPeriodActive(cfg, current)) {
-                             cfg->YearPeriod.end(),
+                        return Ticket();
-                    [&inputDate](std::pair<int, ATBPeriodYear> const &year) {
-                        QDate const input(2004, // 2004 is a leap year
-                                          inputDate.date().month(),
-                                          inputDate.date().day());
-                        QDate const s(2004, year.second.pye_start_day, year.second.pye_start_month);
-                        QDate const e(2004, year.second.pye_end_day, year.second.pye_end_month);
-                        return (input >= s && input <= e);
-                    })) {
-                qCritical() << "NO VALID YEAR PERIOD";
-                return 0.0;
                     }
-
+                    if(current.time() >= lastWorktimeTo) {
                         // Go to next day if minutes not spent
-            if(inputDate.time() >= worktime_to) {
+                        if (carryOverNotSet) {
-                // check for carry_over status
+                            // no carry_over, so stop computation
-                if (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1) {
                             break;
                         }
-
+                        current.setTime(QTime());
-                qDebug() << "Reached end of worktime, searching for the next working day";
-
-                inputDate = inputDate.addDays(1);
-                overtime = true;
-                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
-                if (partialCost == 0) {
-                    return 0;
-                }
-                costFromDuration += partialCost;
                         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
-                inputDate = inputDate.addSecs(60);
+                            current = current.addSecs(60);
+                            end = current;
                             durationMinutes -= 1;
-                costFromDuration += price_per_unit;
+                            //costFromDuration += price_per_unit;
+                            costFromDuration += price;
+                            //qCritical() << "current" << current.toString(Qt::ISODate);
+                        } else break;
+                    }
+                } // while(durationMinutes > 0) {
+            } // if (durationMinutes > 0) {
+        } // for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
+    } // for (current = start; durationMinutes > 0; current = current.addDays(1)) {
+
+    int durationMinutesBrutto =  start.secsTo(end) / 60;
+
+    return
+        Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
+               ceil(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
+               Ticket::s[VALID]);
+}
+
+
+Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
+                                               QDateTime const &start,
+                                               uint32_t cost,
+                                               bool prepaid) {
+    // Get input date
+    QDateTime current = start;
+
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
+    static const uint32_t minParkingTimeMinutes = std::max(Utilities::getMinimalParkingTime(cfg, paymentMethodId), 0);
+    static const uint32_t maxParkingTimeMinutes = std::max(Utilities::getMaximalParkingTime(cfg, paymentMethodId), 0);
+    static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
+    // static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
+    static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
+    static const uint32_t weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
+    static const uint32_t specialDaysDurationUnit = 60;
+
+    if(cost < minParkingPrice) {
+        uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
+        return Ticket(start, current, durationMinutes, durationMinutes,
+                   cost, Ticket::s[INVALID_PRICE]);
+    }
+    if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
+        // TODO
+        return Ticket();
+    }
+    if (maxParkingTimeMinutes <= minParkingTimeMinutes) {
+        // TODO
+        return Ticket();
+    }
+
+    uint32_t durationMinutesNetto = 0;
+    double moneyLeft = cost;
+    double durationUnit = 1;
+    int specialDayId = -1;
+    bool isSpecialDay = false;
+    QDateTime end = start;
+    int totalTimeRanges = 0;
+    double price = 0;
+
+    for (current = start; moneyLeft > 0 && moneyLeft >= price; current = current.addDays(1)) {
+        int const weekdayId = current.date().dayOfWeek();
+
+        specialDayId = -1;
+
+        // find worktime ranges for the current day
+        int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
+        QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
+        int ranges = 0;
+
+        uint32_t p = 0;
+        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &p))) {
+            // Set special day price:
+            durationUnit = specialDaysDurationUnit;
+            price = p / durationUnit;
+            price = std::round(price * 1000.0) / 1000.0;
+            worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
+                                          SpecialDaysWorkTimeUntil(cfg, specialDayId));
+            ranges = 1;
+        } else {
+            // Set new price for the normal day: do not use a floating-point type
+            // 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;
+            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";
+                end = current;
+                current.setTime(QTime()); // start at midnight on the next day
+                continue;
+            }
+
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                worktime[ranges].setTimeRange(WeekDaysWorkTimeFrom(itr),
+                                              WeekDaysWorkTimeUntil(itr));
+                ranges += 1;
+            }
+        }
+
+        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...
+                if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
+                    if (!prepaid && carryOverNotSet) {       // 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
+                    if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
+                        end = current;
+                        continue;
+                    }
+                    current.setTime(worktime[currentRange].getTimeFrom());
                 }
             }
         }
 
-    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate);
+        for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
+            if (moneyLeft > 0) {
+                QTime const &worktime_from = worktime[w].getTimeFrom();
+                QTime const &worktime_to = worktime[w].getTimeUntil();
 
-    end = inputDate;
+                if (totalTimeRanges) {
-
+                    // durationMinutes are always meant as netto time and
-    //double ret_val = total_cost;
+                    // the time between worktime-ranges are free.
-    //total_cost = 0.0f;
+                    current.setTime(worktime_from);
-    //return ceil(ret_val);
-
-    // TODO: runden nur falls oberster stack-rahmen
-
-    return ceil(costFromDuration);
                 }
 
+                if (price == 0) {
+                    // inputDate = inputDate.addDays(1);
+                    // inputDate.setTime(worktime_from);
+                    end = current;
+                    current.setTime(QTime());
+                    continue;
+                }
 
+                if (current.time() == worktime_to) {
+                    end = current;
+                    current.setTime(QTime());
+                    continue;
+                }
+
+                // Check prepaid
+                if (!prepaid) {
+                    if ((current.time() < worktime_from) || (current.time() > worktime_to)) {
+                        qDebug() << "[STOP] * Ticket is not valid * ";
+                        return Ticket();
+                    }
+                } else {
+                    qDebug() << "* PREPAID MODE ACTIVE *";
+                    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";
+                        end = current;
+                        current.setTime(QTime());
+                        continue;
+                    }
+                }
+
+                while(moneyLeft >= price) {
+                    // Check for active year period
+                    if (!IsYearPeriodActive(cfg, current)) {
+                        return Ticket();
+                    }
+                    if(durationMinutesNetto > maxParkingTimeMinutes) {
+                        durationMinutesNetto = maxParkingTimeMinutes;
+                        break;
+                    }
+                    if(current.time() >= lastWorktimeTo) {
+                        // Go to next day if minutes not spent
+                        if (carryOverNotSet) {
+                            // no carry_over, so stop computation
+                            break;
+                        }
+                        current.setTime(QTime());
+                        break; // stop while, and continue in outer loop
+                    } else {
+                        if(current.time() < worktime_to) {
+                            // Increment input date minutes for each monetary unit
+                            durationMinutesNetto +=1;
+                            moneyLeft -= price;
+                            moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
+                            current = current.addSecs(60);
+                            end = current;
+                        } else break;
+                    }
+                } // while(durationMinutes > 0) {
+            } // if (durationMinutes > 0) {
+        } // for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
+    } // for (current = start; durationMinutes > 0; current = current.addDays(1)) {
+
+    int durationMinutesBrutto =  start.secsTo(end) / 60;
+
+    //qCritical() << "start" << start.toString(Qt::ISODate) << "end"
+    //            << end.toString(Qt::ISODate) << durationMinutesBrutto;
+
+    return
+        Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
+               cost, Ticket::s[VALID]);
+}
 
 QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     QList<int> timeSteps;

library/src/configuration.cpp

@@ -78,7 +78,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		ATBWeekDaysWorktime  WeekDaysWorktime;
 		ATBPaymentOption PaymentOption;
 		ATBPeriodYear YearPeriod;
-		MemberType mb_type;
+        MemberType mb_type = MemberType::UnknownType;
 
 		// Get all JSON object members
 		// This code should run only once (to load JSON variables into memory)
@@ -169,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();
+                        else if (strcmp(inner_obj_name, "pop_business_hours") == 0) PaymentOption.pop_business_hours = k->value.GetInt();
                         this->currentPaymentOptions = PaymentOption;
                         break;
 					case MemberType::DurationType:

library/src/ticket.cpp

@@ -7,11 +7,20 @@ Ticket::Ticket()
   , m_durationMinutesNetto(0)
   , m_durationMinutesBrutto(0)
   , m_price() {
-
-    qDebug() << *this;
-    qDebug() << m_status;
 }
 
+Ticket::Ticket(QDateTime const &s, QDateTime const &e,
+               int durationMinutesNetto, int durationMinutesBrutto,
+               uint32_t price, Ticket::Status status)
+  : m_status(status)
+  , m_validFrom(s)
+  , m_validUntil(e)
+  , m_durationMinutesNetto(durationMinutesNetto)
+  , m_durationMinutesBrutto(durationMinutesBrutto)
+  , m_price(price) {
+}
+
+
 Ticket::Status Ticket::setStatus(Status status) {
     Status old = m_status;
     m_status = status;
@@ -39,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();
 }
@@ -54,14 +63,23 @@ void Ticket::setPrice(uint32_t price) {
     
 Ticket::operator QString() {
     QStringList status;
-    status << QString("Status .............. : %1 (%2)")
+    status << QString("**********************");
+    status << QString("Status ............. : %1 (%2)")
                 .arg(std::get<0>(m_status))
                 .arg(std::get<2>(m_status));
     status << QString("Valid from ......... : %1").arg(m_validFrom.toString(Qt::ISODate));
     status << QString("Valid until ........ : %1").arg(m_validUntil.toString(Qt::ISODate));
     status << QString("Duration (netto) ... : %1").arg(m_durationMinutesNetto);
     status << QString("Duration (brutto)... : %1").arg(m_durationMinutesBrutto);
-    status << QString("Price ......... : %1").arg(m_price);
+    status << QString("Price .............. : %1").arg(m_price);
+    status << QString("**********************");
 
-    return status.join('\n');;
+    return status.join('\n');
+}
+
+QDebug operator<<(QDebug debug, Ticket::Status const &status) {
+    QDebugStateSaver saver(debug);
+    debug << "Ticket-Status: " << std::get<1>(status)
+          << "(" << std::get<2>(status) << ")";
+    return debug;
 }

library/src/utilities.cpp

@@ -2,6 +2,7 @@
 #include "tariff_log.h"
 
 #include <QDebug>
+#include <algorithm>
 
 static int protection_counter = 0;
 
@@ -195,6 +196,24 @@ bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTim
 	}
 }
 
+bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
+    if ((cfg->YearPeriod.size() > 0) &&
+        std::none_of(cfg->YearPeriod.cbegin(),
+                     cfg->YearPeriod.cend(),
+            [&dt](std::pair<int, ATBPeriodYear> const &year) {
+                QDate const d(2004, // 2004 is a leap year
+                              dt.date().month(),
+                              dt.date().day());
+                QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
+                QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
+                return (d >= s && d <= e);
+            })) {
+        qCritical() << "NO VALID YEAR PERIOD";
+        return false;
+    }
+    return true;
+}
+
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
@@ -317,3 +336,94 @@ QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDa
 QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId) {
     return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
 }
+
+QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+    return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
+}
+
+QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+    return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
+}
+
+bool Utilities::isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
+    return !isCarryOverNotSet(cfg, paymentMethodId);
+}
+
+bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
+    return (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1);
+}
+
+PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
+    if (cfg->PaymentOption.size() != 1) {
+        return PaymentMethod::Undefined;
+    }
+
+    std::multimap<int, ATBPaymentOption>::const_iterator it =
+        cfg->PaymentOption.cbegin();
+
+    switch (it->first) {
+    case PaymentMethod::Linear:
+        return PaymentMethod::Linear;
+    case PaymentMethod::Steps:
+        return PaymentMethod::Steps;
+    case PaymentMethod::Degressive:
+        return PaymentMethod::Degressive;
+    case PaymentMethod::Progressive:
+        return PaymentMethod::Progressive;
+    }
+
+    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;
+}
+
+BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
+    int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
+    switch (businessHours) {
+    case NoRestriction_24_7: return NoRestriction_24_7;
+    case OnlyWorkingDays: return OnlyWorkingDays;
+    case OnlyWeekDays: return OnlyWeekDays;
+    case OnlyWeekEnd: return OnlyWeekEnd;
+    case OnlyOfficialHolidays: return OnlyOfficialHolidays;
+    case OnlySpecialDays: return OnlySpecialDays;
+    case OnlySchoolHolidays: return OnlySchoolHolidays;
+    case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
+    case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
+    }
+    return NoBusinessHoursDefined;
+}
+
+uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {
+    int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
+    return cfg->PaymentRate.find(pop_id)->second.pra_price;
+}
+
+double Utilities::computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) {
+    int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
+    int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
+    return (double)(cfg->Duration.find(durationId)->second.pun_duration);
+}

main/main.cpp

@@ -33,10 +33,15 @@ extern "C" char* strptime(const char* s,
 #include "calculator_functions.h"
 #include <calculate_price.h>
 
+#define SZEGED                           (0)
+#define NEUHAUSER_KORNEUBURG             (0)
+#define NEUHAUSER_LINSINGER_MASCHINENBAU (1)
+
 
 int main() {
+#if NEUHAUSER_LINSINGER_MASCHINENBAU==1
+    std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
 
-    std::ifstream input("/tmp/tariff_korneuburg.json");
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
@@ -47,118 +52,173 @@ int main() {
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
     cout << endl;
 
+    if (isParsed) {
+        bool nextDay = false;
+        bool prePaid = false;
 
-    if (isParsed)
+        // zone 1 (lila)
+        QDateTime s(QDate(2023, 11, 30), QTime());
+        QDateTime end;
+        int marken[] = { 3*60, 5*60, 10*60};
+        for (int duration = 0; duration < 3; ++duration) {
+            for (int offset = 360; offset <= 1080; ++offset) {
+                QDateTime start = s.addSecs(offset * 60);
+                //qCritical() << "start" << start.toString(Qt::ISODate);
+
+                double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
+                //qCritical() << "";
+                //qCritical() << "start" << start.toString(Qt::ISODate)
+                //            << "end" << end.toString(Qt::ISODate)
+                //            << "duration" << marken[duration]
+                //            << "cost" << cost;
+
+                std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
+                qCritical() << "start" << start.toString(Qt::ISODate)
+                            << "cost" << cost
+                            << "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
+            }
+        }
+    }
+#endif
+
+#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());
+
+    Calculator calculator;
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
         {
-        QDateTime start = QDateTime::fromString("2023-05-11T08:00:00",Qt::ISODate);
+            pop_max_time = 3*60;
-        QDateTime end = start.addSecs(120);
+            bool nextDay = false;
-        calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+            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);
+
+                    double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
+                    //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;
+                }
+            }
+        }
+    }
+    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/tariff01.json

@@ -1,9 +1,12 @@
 {
+  "Project" :   "Korneuburg",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
   "Currency": [
     {
       "pcu_id": 2,
-      "pcu_sign": "Ft",
+      "pcu_sign": "€",
-      "pcu_major": "HUF",
+      "pcu_major": "EUR",
       "pcu_minor": "",
       "pcu_active": true
     }
@@ -29,30 +32,30 @@
   "PaymentOption": [
     {
       "pop_id": 1049,
-      "pop_label": "Zone Lila",
+      "pop_label": "Zone 1",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "16:25:00",
+      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "16:25:00",
+      "pop_day_night_end_time": "00:00:00",
       "pop_price_night": 0,
-      "pop_min_time": 15,
+      "pop_min_time": 30,
-      "pop_max_time": 300,
+      "pop_max_time": 180,
-      "pop_min_price": 0,
+      "pop_min_price": 60,
       "pop_carry_over": 1,
-      "pop_daily_card_price": 900
+      "pop_daily_card_price": 0
     }
   ],
   "PaymentRate": [
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
-      "pra_price": 150
+      "pra_price": 10
     }
   ],
   "Duration": [
     {
       "pun_id": 1,
-      "pun_label": "1h",
+      "pun_label": "5 min",
-      "pun_duration": 60
+      "pun_duration": 5 
     },
     {
       "pun_id": 3,
@@ -71,6 +74,13 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 1,
       "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -78,6 +88,13 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 2,
       "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -85,6 +102,13 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 3,
       "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -92,6 +116,13 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 4,
       "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -99,73 +130,21 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 5,
       "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "14: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,
+      "pwd_id": 626,
-      "pye_label": "Whole year",
+      "pwd_period_week_day_id": 36,
-      "pye_start_month": 1,
+      "pwd_period_day_in_week_id": 6,
-      "pye_start_day": 1,
+      "pwd_time_from": "08:00:00",
-      "pye_end_month": 12,
+      "pwd_time_to": "12:00:00"
-      "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": [
@@ -385,421 +364,266 @@
       "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": 11,
-      "ped_label": "Christmas 1st day",
+      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2022-12-25",
+      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2022-12-25",
+      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
+      "ped_label": "Christtag",
-      "ped_date_start": "2022-12-26",
+      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2022-12-26",
+      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 14,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Stefanitag",
-      "ped_date_start": "2022-10-23",
+      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2022-10-23",
+      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2016,
-      "ped_label": "Christmas (Sunday)",
+      "ped_label": "Neujahr",
-      "ped_date_start": "2022-12-24",
+      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2022-12-24",
+      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2022-12-31",
+      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2022-12-31",
+      "ped_date_end": "2024-01-06",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2022,
-      "ped_label": "NewYear",
+      "ped_label": "Ostermontag",
-      "ped_date_start": "2023-01-01",
+      "ped_date_start": "2024-01-04",
-      "ped_date_end": "2023-01-01",
+      "ped_date_end": "2024-01-04",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 2024
     },
     {
       "ped_id": 2024,
-      "ped_label": "Good Friday",
+      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2023-04-07",
+      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2023-04-07",
+      "ped_date_end": "2024-05-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 0
     },
     {
       "ped_id": 2025,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2023-04-09",
+      "ped_date_start": "2024-05-09",
-      "ped_date_end": "2023-04-09",
+      "ped_date_end": "2024-05-09",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 2024
     },
     {
       "ped_id": 2026,
-      "ped_label": "Easter Monday",
+      "ped_label": "Pfingst Montag",
-      "ped_date_start": "2023-04-10",
+      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2023-04-10",
+      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 2024
     },
     {
       "ped_id": 2027,
-      "ped_label": "Whit Sunday",
+      "ped_label": "Fronleichnam",
-      "ped_date_start": "2023-05-28",
+      "ped_date_start": "2024-05-30",
-      "ped_date_end": "2023-05-28",
+      "ped_date_end": "2024-05-30",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 2024
     },
     {
       "ped_id": 2028,
-      "ped_label": "Whit Monday",
+      "ped_label": "Maria Himmelfahrt",
-      "ped_date_start": "2023-05-29",
+      "ped_date_start": "2024-08-15",
-      "ped_date_end": "2023-05-29",
+      "ped_date_end": "2024-08-15",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 0
     },
     {
       "ped_id": 2029,
-      "ped_label": "Revolution Day (Hungary)",
+      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2023-03-15",
+      "ped_date_start": "2024-10-26",
-      "ped_date_end": "2023-03-15",
+      "ped_date_end": "2024-10-26",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2030,
-      "ped_label": "Labour Day",
+      "ped_label": "Allerheiligen",
-      "ped_date_start": "2023-05-01",
+      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2023-05-01",
+      "ped_date_end": "2024-11-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2031,
-      "ped_label": "Saint Stephens Day (Hungary)",
+      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-08-20",
+      "ped_date_start": "2024-08-12",
-      "ped_date_end": "2023-08-20",
+      "ped_date_end": "2024-08-12",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2032,
-      "ped_label": "All Saints Day",
+      "ped_label": "Christtag",
-      "ped_date_start": "2023-11-01",
+      "ped_date_start": "2024-12-25",
-      "ped_date_end": "2023-11-01",
+      "ped_date_end": "2024-12-25",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2034,
-      "ped_label": "Good Friday",
+      "ped_label": "Stefanitag",
-      "ped_date_start": "2024-03-29",
+      "ped_date_start": "2024-12-26",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2024-12-26",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0
     },
     {
       "ped_id": 2035,
-      "ped_label": "Easter",
+      "ped_label": "Neujahr",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0 
     },
     {
       "ped_id": 2036,
-      "ped_label": "Easter Monday",
+      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 0
     },
     {
       "ped_id": 2037,
-      "ped_label": "Whit Monday",
+      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 2025
     },
     {
       "ped_id": 2038,
-      "ped_label": "Whit Sunday",
+      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2024
+      "ped_year": 2025
     },
     {
       "ped_id": 2050,
-      "ped_label": "Uskrs",
+      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2023-04-16",
+      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2023-04-16",
+      "ped_date_end": "2025-05-29",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 2025
     },
     {
       "ped_id": 2051,
-      "ped_label": "Uskrs",
+      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2023-04-16",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2023-04-16",
+      "ped_date_end": "2025-06-09",
       "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 2025
     },
     {
       "ped_id": 2052,
-      "ped_label": "Christmas 1st day",
+      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2022-12-25",
+      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2022-12-25",
+      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 0
+      "ped_year": 2025
     },
     {
       "ped_id": 2053,
-      "ped_label": "Christmas 2nd day",
+      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2022-12-26",
+      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2022-12-26",
+      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2054,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2022-10-23",
+      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2022-10-23",
+      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2055,
-      "ped_label": "Christmas (Sunday)",
+      "ped_label": "Allerheiligen",
-      "ped_date_start": "2022-12-24",
+      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2022-12-24",
+      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
+      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2022-12-31",
+      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2022-12-31",
+      "ped_date_end": "2025-12-08",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christtag",
-      "ped_date_start": "2023-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2023-01-01",
+      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-04-07",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2023-04-07",
+      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 0
     },
     {
       "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Neujahr",
-      "ped_date_start": "2023-04-09",
+      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2023-04-09",
+      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "ped_year": 2023
+      "ped_year": 0
     },
     {
       "ped_id": 2060,
-      "ped_label": "Easter Monday",
+      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2023-04-10",
+      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2023-04-10",
+      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 2,
+      "ped_period_special_day_id": 1,
-      "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
-    },
+    }
+  ],
+  "PeriodYear": [
     {
-      "ped_id": 2064,
+      "pye_id": 8,
-      "ped_label": "Labour Day",
+      "pye_label": "Whole year",
-      "ped_date_start": "2023-05-01",
+      "pye_start_month": 1,
-      "ped_date_end": "2023-05-01",
+      "pye_start_day": 1,
-      "ped_period_special_day_id": 2,
+      "pye_end_month": 12,
-      "ped_year": 0
+      "pye_end_day": 31
-    },
-    {
-      "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/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
+    }
+  ]
+}

test-files/tariff_korneuburg.json

@@ -40,7 +40,7 @@
       "pop_min_time": 30,
       "pop_max_time": 180,
       "pop_min_price": 60,
-      "pop_carry_over": 0,
+      "pop_carry_over": 1,
       "pop_daily_card_price": 0
     }
   ],
@@ -147,6 +147,475 @@
       "pwd_time_to": "12:00:00"
     }
   ],
+  "SpecialDaysWorktime": [
+    {
+      "pedwt_id": 2156,
+      "pedwt_period_exc_day_id": 2024,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "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
+    }
+  ],
+  "SpecialDays": [
+    {
+      "ped_id": 11,
+      "ped_label": "Mariae Empfaengnis",
+      "ped_date_start": "2023-12-08",
+      "ped_date_end": "2023-12-08",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 13,
+      "ped_label": "Christtag",
+      "ped_date_start": "2023-12-25",
+      "ped_date_end": "2023-12-25",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 14,
+      "ped_label": "Stefanitag",
+      "ped_date_start": "2023-12-26",
+      "ped_date_end": "2023-12-26",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2016,
+      "ped_label": "Neujahr",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2021,
+      "ped_label": "Heilig Drei Koenige",
+      "ped_date_start": "2024-01-06",
+      "ped_date_end": "2024-01-06",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2022,
+      "ped_label": "Ostermontag",
+      "ped_date_start": "2024-01-04",
+      "ped_date_end": "2024-01-04",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2024,
+      "ped_label": "Staatsfeiertag",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2025,
+      "ped_label": "Christi Himmelfahrt",
+      "ped_date_start": "2024-05-09",
+      "ped_date_end": "2024-05-09",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2026,
+      "ped_label": "Pfingst Montag",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2027,
+      "ped_label": "Fronleichnam",
+      "ped_date_start": "2024-05-30",
+      "ped_date_end": "2024-05-30",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2028,
+      "ped_label": "Maria Himmelfahrt",
+      "ped_date_start": "2024-08-15",
+      "ped_date_end": "2024-08-15",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2029,
+      "ped_label": "Nationalfeiertag",
+      "ped_date_start": "2024-10-26",
+      "ped_date_end": "2024-10-26",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2030,
+      "ped_label": "Allerheiligen",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2031,
+      "ped_label": "Mariae Empfaengnis",
+      "ped_date_start": "2024-08-12",
+      "ped_date_end": "2024-08-12",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2032,
+      "ped_label": "Christtag",
+      "ped_date_start": "2024-12-25",
+      "ped_date_end": "2024-12-25",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2034,
+      "ped_label": "Stefanitag",
+      "ped_date_start": "2024-12-26",
+      "ped_date_end": "2024-12-26",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2035,
+      "ped_label": "Neujahr",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0 
+    },
+    {
+      "ped_id": 2036,
+      "ped_label": "Heilig Drei Koenige",
+      "ped_date_start": "2025-06-01",
+      "ped_date_end": "2025-06-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2037,
+      "ped_label": "Ostermontag",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2038,
+      "ped_label": "Staatsfeiertag",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2050,
+      "ped_label": "Christi Himmelfahrt",
+      "ped_date_start": "2025-05-29",
+      "ped_date_end": "2025-05-29",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2051,
+      "ped_label": "Pfingstmontag",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2052,
+      "ped_label": "Fronlaeichnam",
+      "ped_date_start": "2025-06-19",
+      "ped_date_end": "2025-06-19",
+      "ped_period_special_day_id": 1,
+      "ped_year": 2025
+    },
+    {
+      "ped_id": 2053,
+      "ped_label": "Mariae Himmelfahrt",
+      "ped_date_start": "2025-08-15",
+      "ped_date_end": "2025-08-15",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2054,
+      "ped_label": "Nationalfeiertag",
+      "ped_date_start": "2025-10-26",
+      "ped_date_end": "2025-10-26",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Allerheiligen",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Mariae Empfaengnis",
+      "ped_date_start": "2025-12-08",
+      "ped_date_end": "2025-12-08",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christtag",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Stefanitag",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Neujahr",
+      "ped_date_start": "2026-01-01",
+      "ped_date_end": "2026-01-01",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Heilige Drei Koenige",
+      "ped_date_start": "2026-01-06",
+      "ped_date_end": "2026-01-06",
+      "ped_period_special_day_id": 1,
+      "ped_year": 0
+    }
+  ],
   "PeriodYear": [
     {
       "pye_id": 8,