Minor: add compile switches -g -O

of dynamic time steps (e.g. for Neuhauser, Galtuer (745)).

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

@@ -12,9 +12,37 @@
 #include <QDateTime>
 using namespace std;
 
-class Calculator
-{
+class Calculator {
+    QDateTime m_start;
+    mutable uint16_t m_timeStepCompensation = 0;
 public:
+    explicit Calculator() = default;
+    explicit Calculator(QDateTime const start) : m_start(start) {
+        m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+        qCritical() << "init m_start time:" << m_start.toString(Qt::ISODate);
+    }
+
+    void setStartDateTime(QDateTime const &start) {
+        m_start = start;
+        m_start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+        qCritical() << "set m_start time:" << m_start.toString(Qt::ISODate);
+    }
+
+    QDateTime const &getStartDateTime() const {
+        return m_start;
+    }
+
+    QDateTime &getStartDateTime() {
+        return m_start;
+    }
+
+    void setTimeStepCompensation(uint16_t timeStepCompensation) {
+        m_timeStepCompensation = timeStepCompensation;
+    }
+
+    uint16_t getTimeStepCompensation() const {
+        return m_timeStepCompensation;
+    }
 
 	/// <summary>
 	/// Gets duration in seconds from cost
@@ -45,18 +73,28 @@ 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);
+    }
+
+// testing public:
 private:
     // Introduced for PaymentMethod::Steps (e.g. Schoenau)
     // For tariff of following structure: only steps, no special days, nonstop.
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
 
-    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);
-
     Ticket private_GetCostFromDuration(Configuration const* cfg,
                                        QDateTime const &start,
                                        int durationMinutes,
@@ -71,7 +109,13 @@ private:
 
     //
     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,
@@ -79,9 +123,6 @@ private:
     int findNextWorkTimeRange(QDateTime const &dt,
                               QScopedArrayPointer<TariffTimeRange> const &worktime,
                               size_t size);
-
-    uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const;
-    double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const;
 };
 
 #endif // CALCULATOR_FUNCTIONS_H_INCLUDED

library/include/mobilisis/configuration.h

@@ -21,6 +21,11 @@
 #include "period_year.h"
 #include "payment_rate.h"
 #include "atb_project.h"
+#include "tariff_daily_ticket.h"
+#include "time_range_header.h"
+#include "tariff_timestep_config.h"
+
+#include <QVector>
 
 using namespace std;
 using namespace rapidjson;
@@ -41,6 +46,9 @@ public:
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	multimap<int, ATBPaymentOption> PaymentOption;
+    multimap<int, ATBDailyTicket> DailyTicket;
+    multimap<int, ATBTimeRange> TimeRange;
+    multimap<int, ATBTimeStepConfig> TimeStepConfig;
 
 	/// <summary>
 	/// Parse JSON string
@@ -49,7 +57,8 @@ public:
 	/// <returns>Returns operation status bool (OK | FAIL) </returns>
 	bool ParseJson(Configuration* cfg, const char* json);
 
-    ATBPaymentOption const & getPaymentOptions();
+    ATBPaymentOption const &getPaymentOptions();
+    QVector<ATBDailyTicket> const &getDailyTickets() const;
 
 private:
 	/// <summary>

library/include/mobilisis/duration.h

@@ -1,4 +1,3 @@
-#pragma once
 #include <string>
 
 class ATBDuration
@@ -7,4 +6,6 @@ public:
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
+    int pun_duration_min;
+    int pun_duration_max;
 };

library/include/mobilisis/member_type.h

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef MEMBER_TYPE_H_INCLUDED
+#define MEMBER_TYPE_H_INCLUDED
 
 enum MemberType
 {
@@ -12,5 +13,12 @@ enum MemberType
 	WeekDaysWorkTimeType = 0x06,
 	SpecialDaysWorktimeType = 0x07,
 	SpecialDaysType = 0x08,
-	PeriodYearType = 0x09
+    PeriodYearType = 0x09,
+    DailyTicketType = 0x0A,
+    CustomerType = 0x0B,
+    TimeBaseType = 0x0C,
+    TimeRangeType = 0x0D,
+    TimeStepConfigType = 0x0E
 };
+
+#endif // MEMBER_TYPE_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;
@@ -14,5 +16,8 @@ public:
     double pop_max_time;
     double pop_min_price;
     int pop_carry_over;
+    int pop_carry_over_time_range_id;
     int pop_daily_card_price;
+    int pop_business_hours;
+    int pop_time_step_config;
 };

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_customer.h

@@ -0,0 +1,41 @@
+#ifndef TARIFF_CUSTOMER_H_INCLUDED
+#define TARIFF_CUSTOMER_H_INCLUDED
+
+#include <QString>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+struct ATBCustomer {
+    enum class CustomerType {ADULT=1000, CHILD, TEEN};
+
+    ATBCustomer() = default;
+
+    CustomerType cust_type;
+    QString cust_label;
+
+    friend QDebug operator<<(QDebug debug, ATBCustomer const &customer) {
+        QDebugStateSaver saver(debug);
+
+        switch(customer.cust_type) {
+        case ATBCustomer::CustomerType::ADULT:
+            debug.nospace()
+                << " cust_type: " << "CustomerType::ADULT" << "\n"
+                << "cust_label: " << customer.cust_label << "\n";
+            break;
+        case ATBCustomer::CustomerType::CHILD:
+            debug.nospace()
+                << " cust_type: " << "CustomerType::CHILD" << "\n"
+                << "cust_label: " << customer.cust_label << "\n";
+            break;
+        case ATBCustomer::CustomerType::TEEN:
+            debug.nospace()
+                << " cust_type: " << "CustomerType::TEEN" << "\n"
+                << "cust_label: " << customer.cust_label << "\n";
+            break;
+        }
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_CUSTOMER_H_INCLUDED

library/include/mobilisis/tariff_daily_ticket.h

@@ -0,0 +1,82 @@
+#ifndef TARIFF_DAILY_TICKET_H_INCLUDED
+#define TARIFF_DAILY_TICKET_H_INCLUDED
+
+#include <QString>
+#include <QDateTime>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+
+#include "tariff_customer.h"
+#include "tariff_time_range.h"
+#include "tariff_timebase.h"
+
+struct ATBDailyTicket {
+    ATBDailyTicket() = default;
+
+    int daily_ticket_payment_option_id;
+    int daily_ticket_unit_id;
+    double daily_ticket_price;
+
+    ATBTimeBase::TimeBaseType daily_ticket_tbase_type;
+                                        // time base setting for ticket:
+                                        // absolute: using time stamps
+                                        // relative: use offsets from
+                                        //    some reference time point,
+                                        //    typically "start time".
+
+    ATBCustomer::CustomerType daily_ticket_clearance_customer_type;
+                                        // who is allowed to buy the ticket:
+                                        // list of customer types
+
+    int daily_ticket_weekday_range;  // [mon-sun]
+    int daily_ticket_special_day_range;
+
+
+    friend QDebug operator<<(QDebug debug, ATBDailyTicket const &ticket) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+                << "      daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
+                << "                daily_ticket_unit_id: " << ticket.daily_ticket_unit_id << "\n"
+                << "                  daily_ticket_price: " << ticket.daily_ticket_price << "\n";
+
+        switch(ticket.daily_ticket_tbase_type) {
+        case ATBTimeBase::TimeBaseType::ABSOLUTE:
+            debug.nospace()
+                << "             daily_ticket_tbase_type: " << "TimeBaseType::ABSOLUTE" << "\n";
+            break;
+        case ATBTimeBase::TimeBaseType::RELATIVE:
+            debug.nospace()
+                << "             daily_ticket_tbase_type: " << "TimeBaseType::RELATIVE" << "\n";
+            break;
+        }
+
+        switch(ticket.daily_ticket_clearance_customer_type) {
+        case ATBCustomer::CustomerType::ADULT:
+            debug.nospace()
+                << "daily_ticket_clearance_customer_type: " << "CustomerType::ADULT" << "\n";
+            break;
+        case ATBCustomer::CustomerType::CHILD:
+            debug.nospace()
+                << "daily_ticket_clearance_customer_type: " << "CustomerType::CHILD" << "\n";
+            break;
+        case ATBCustomer::CustomerType::TEEN:
+            debug.nospace()
+                << "daily_ticket_clearance_customer_type: " << "CustomerType::TEEN" << "\n";
+            break;
+        default:
+            debug.nospace()
+                << "daily_ticket_clearance_customer_type: " << "CustomerType::???" << "\n";
+            break;
+        }
+
+        debug.nospace()
+            << "          daily_ticket_weekday_range: " << ticket.daily_ticket_weekday_range << "\n"
+            << "      daily_ticket_special_day_range: " << ticket.daily_ticket_special_day_range << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_DAILY_TICKET_H_INCLUDED

library/include/mobilisis/tariff_duration.h

@@ -1,4 +1,3 @@
-// #pragma once
 
 /// <summary>
 /// Duration data
@@ -9,4 +8,6 @@ public:
     int pun_id;
     std::string pun_label;
     int pun_duration;
+    int pun_duration_min;
+    int pun_duration_max;
 };

library/include/mobilisis/tariff_time_range.h

@@ -7,8 +7,8 @@
 /// Time range definition
 /// </summary>
 class TariffTimeRange {
-    QTime m_time_from;
-    QTime m_time_until;
+    QTime m_time_from;  // if m_time_from == m_time_until, then the time range
+    QTime m_time_until; // actually is the time point m_time_from
 
 public:
 
@@ -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/tariff_timebase.h

@@ -0,0 +1,42 @@
+#ifndef TARIFF_TIME_BASE_H_INCLUDED
+#define TARIFF_TIME_BASE_H_INCLUDED
+
+#include <QString>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+struct ATBTimeBase {
+    enum class TimeBaseType {ABSOLUTE=0, RELATIVE=1};
+
+    ATBTimeBase() = default;
+    int tbase_id;
+    TimeBaseType tbase_type;
+    QString tbase_label;
+
+    friend QDebug operator<<(QDebug debug, ATBTimeBase const &timeBase) {
+        QDebugStateSaver saver(debug);
+
+        switch(timeBase.tbase_type) {
+        case ATBTimeBase::TimeBaseType::ABSOLUTE:
+            debug.nospace()
+                << "   tbase_id: " << timeBase.tbase_id << "\n"
+                << " tbase_type: " << "TimeBaseType::ABSOLUTE" << "\n"
+                << "tbase_label: " << timeBase.tbase_label << "\n";
+            break;
+        case ATBTimeBase::TimeBaseType::RELATIVE:
+            debug.nospace()
+                << " tbase_type: " << "TimeBaseType::RELATIVE" << "\n"
+                << "tbase_label: " << timeBase.tbase_label << "\n";
+            break;
+        default:
+            debug.nospace()
+                << " tbase_type: " << "TimeBaseType::???" << "\n";
+            break;
+        }
+
+        return debug;
+    }
+
+};
+
+#endif // TARIFF_TIME_BASE_H_INCLUDED

library/include/mobilisis/tariff_timestep_config.h

@@ -0,0 +1,26 @@
+#ifndef TARIFF_TIMESTEP_CONFIG_H_INCLUDED
+#define TARIFF_TIMESTEP_CONFIG_H_INCLUDED
+
+#include <QString>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+struct ATBTimeStepConfig {
+    enum class TimeStepConfig {STATIC=1, DYNAMIC=2};
+
+    ATBTimeStepConfig() = default;
+    int tsconfig_id;
+    QString tsconfig_label;
+
+    friend QDebug operator<<(QDebug debug, ATBTimeStepConfig const &tsConfig) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "   tsconfig_id: " << tsConfig.tsconfig_id << "\n"
+            << "tsconfig_label: " << tsConfig.tsconfig_label << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_TIMESTEP_CONFIG_H_INCLUDED

library/include/mobilisis/time_range.h

@@ -1,4 +1,6 @@
-#pragma once
+#ifndef TIME_RANGE_H_INCLUDED
+#define TIME_RANGE_H_INCLUDED
+
 #include "time_range_header.h"
 
 struct TimeRange {
@@ -6,3 +8,5 @@ public:
 	bool IsActive;
 	ATBTimeRange TimeRangeStructure;
 };
+
+#endif // TIME_RANGE_H_INCLUDED

library/include/mobilisis/time_range_header.h

@@ -1,8 +1,27 @@
-#pragma once
-#include <ctime>
+#ifndef TIME_RANGE_HEADER_H_INCLUDED
+#define TIME_RANGE_HEADER_H_INCLUDED
 
-class ATBTimeRange {
-public:
-	time_t time_from;
-	time_t time_to;
+#include <QString>
+#include <QDateTime>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+struct ATBTimeRange {
+    int time_range_id;
+    QTime time_range_from;
+    QTime time_range_to;
+
+
+    friend QDebug operator<<(QDebug debug, ATBTimeRange const &timeRange) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "  time_range_id: " << timeRange.time_range_id << "\n"
+            << "time_range_from: " << timeRange.time_range_from.toString(Qt::ISODate) << "\n"
+            << "  time_range_to: " << timeRange.time_range_to.toString(Qt::ISODate) << "\n";
+
+        return debug;
+    }
 };
+
+#endif // TIME_RANGE_HEADER_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -1,6 +1,5 @@
 #pragma once
 #include <cstring>
-#include <string.h>
 #include <ctime>
 #include <iostream>
 #include <cmath>
@@ -9,6 +8,7 @@
 #include "configuration.h"
 #include "time_range.h"
 #include "payment_method.h"
+#include "tariff_business_hours.h"
 
 #include <QDateTime>
 
@@ -82,4 +82,12 @@ namespace Utilities {
     bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     PaymentMethod getPaymentMethodId(Configuration const *cfg);
+
+    int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+    int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
+    uint32_t getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId);
+    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,12 +2,15 @@ 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
 INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
 
+#start version with project neuhauser/galtuer
+VERSION=1.0.0
+
 CONFIG(debug, debug|release) {
     win32 {
         QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS
@@ -68,9 +71,17 @@ 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 \
+    include/mobilisis/tariff_daily_ticket.h \
+    include/mobilisis/tariff_customer.h \
+    include/mobilisis/tariff_timebase.h \
+    include/mobilisis/tariff_timestep_config.h
 
-OTHER_FILES += src/main.cpp
+OTHER_FILES += src/main.cpp \
+    ../tariffs/tariff_korneuburg.json \
+    ../tariffs/tariff_linsinger_maschinenbau.json \
+    ../tariffs/tariff_naz.json
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

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

@@ -39,7 +39,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
 
     int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
     if(daily_card_price <= 0) {
-        LOG_ERROR("Calculator::GetDailyTicketDuration(): Daily ticket price zero or less");
+        qCritical() << "Calculator::GetDailyTicketDuration(): Daily ticket price zero or less";
         return QDateTime();
     }
 
@@ -74,12 +74,10 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
     else
     {
         // Get day of week
-        int weekdayId = 0;
-        weekdayId = Utilities::ZellersAlgorithm(inputDateTime.date().day(),inputDateTime.date().month(),inputDateTime.date().year());
+        int const weekdayId = inputDateTime.date().dayOfWeek();
 
         // If no working day found, skip it (recursively call method again)
-        size_t found = 0;
-        found = cfg->WeekDaysWorktime.count(weekdayId);
+        size_t found = cfg->WeekDaysWorktime.count(weekdayId);
 
         // When no workday found, go to next available day
         if(found <=0)
@@ -122,235 +120,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
-    int weekdayId = 0;
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
+                        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.time();
 
-    //Get min and max time defined in JSON
-    double minMin = 0;
-    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";
+                            if (from <= startTime && startTime <= until) {
+                                return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).toString(Qt::ISODate).toStdString();
                             }
                         }
-    else
-    {
-        LOG_DEBUG("* PREPAID MODE ACTIVE *");
-        if (inputDate.time() < worktime_from)
-        {
-            inputDate.setTime(worktime_from);
-        }
-        else if(inputDate.time() > worktime_to)
-        {
-            LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
-            inputDate = inputDate.addDays(1);
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
                     }
                 }
 
-    while(true)
-    {
-        if((int)money_left <= 0) break;
-
-        // Check year period
-        bool isYearPeriodActive = false;
-
-        //// Parse input date
-        int dayCurrent = inputDate.date().day();
-        int monthCurrent = inputDate.date().month();
-
-        // Current date time
-        int cdt = (monthCurrent * 100) + dayCurrent;
-
-        multimap<int, ATBPeriodYear>::iterator year_period_itr;
-        for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
-        {
-            int dStart = year_period_itr->second.pye_start_day;
-            int dEnd = year_period_itr->second.pye_end_day;
-
-            int mStart = year_period_itr->second.pye_start_month;
-            int mEnd = year_period_itr->second.pye_end_month;
-
-            int start = (mStart * 100) + dStart;
-            int end = (mEnd * 100) + dEnd;
-
-            if (cdt >= start && cdt <= end) {
-                isYearPeriodActive = true;
-                break;
+                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                return 0;
             }
         }
-        if (!isYearPeriodActive)
-        {
-            LOG_DEBUG("Year period is not valid");
-            return "PARKING NOT ALLOWED";
     }
 
-        if(total_duration_min > maxMin)
-        {
-            total_duration_min = maxMin;
-            break;
-        }
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
 
-        // If reached end of worktime go to next day
-        if(inputDate.time() >= worktime_to)
-        {
-            int carry_over_status = 0;
-            carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
-            if (carry_over_status < 1) break;
+    // qCritical().noquote() << t;
 
-            inputDate = inputDate.addDays(1);
-            overtime = true;
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left ,true, prepaid);
-        }
-
-        if(money_left > 1)
-            inputDate = inputDate.addSecs(60);
-
-        if(price_per_unit > 0) total_duration_min +=1;
-        money_left -= price_per_unit;
-
-        //qDebug() <<"Timestamp:" << inputDate << ", total duration min: " << total_duration_min << ", money left = " << money_left;
-    }
-
-    //    if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
-    //    {
-    //        LOG_DEBUG("Total duration is lower than min_min");
-    //        inputDate.time() = worktime_from;
-    //        total_duration_min = 0;
-    //    }
-
-    double ret_val = 0;
-    // double calc_price = (int)total_duration_min - (int)price / price_per_unit;
-
-    //if (calc_price > 0 && total_duration_min > 0)
-    //{
-    //    inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
-    //}
-
-    if(price >= min_price && total_duration_min >= minMin)
-        qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
-    else
-    {
-        qDebug() << "Parking not allowed";
-        total_duration_min = 0;
-    }
-
-    ret_val = total_duration_min;
-    if(ret_val < 0) ret_val = 0;
-    qDebug() << "Duration: " << ret_val;
-    if (ret_val <= 0) return "PARKING NOT ALLOWED";
-
-    total_duration_min = 0;
-    return inputDate.toString(Qt::ISODate).toStdString();
+    // TODO: im fehlerfall
+    return t.getValidUntil().toString(Qt::ISODate).toStdString();
 }
 
 ///////////////////////////////////////
@@ -363,9 +180,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
-     && cfg->SpecialDays.size() == 0
-     && cfg->SpecialDaysWorktime.size() == 0) {
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    if (paymentMethodId == PaymentMethod::Steps) {
         QDateTime const end = start.addSecs(timeStepInMinutes*60);
         return GetCostFromDuration(cfg, start, end);
     }
@@ -375,9 +191,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
-     && cfg->SpecialDays.size() == 0
-     && cfg->SpecialDaysWorktime.size() == 0) {
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+    if (paymentMethodId == PaymentMethod::Steps) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
         return GetPriceForTimeStep(cfg, timeStepInMinutes);
     }
@@ -397,12 +212,42 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                        int durationMinutes,
                                        bool nextDay,
                                        bool prepaid) {
-    if (cfg->YearPeriod.size() == 0
-        && cfg->SpecialDays.size() == 0
-        && cfg->SpecialDaysWorktime.size() == 0)
-    {
+    Q_UNUSED(payment_option);
+    Q_UNUSED(nextDay);
+
+    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);
+                            }
+                        }
+                    }
+                }
+
+                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                end_datetime = QDateTime();
+                return 0;
+            }
+        }
     }
 
     QDateTime start = start_datetime;
@@ -411,7 +256,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                            durationMinutes,
                                            prepaid);
     if (t) {
-        qCritical().noquote() << t;
+        // qCritical().noquote() << t;
     }
 
     end_datetime = t.getValidUntil();
@@ -419,18 +264,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
     return t.getPrice();
 }
 
-int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
-}
-
-int Calculator::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
-}
-
-uint32_t Calculator::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0);
-}
-
 bool Calculator::checkDurationMinutes(int minParkingTime,
                                       int maxParkingTime,
                                       int durationMinutes) {
@@ -469,23 +302,12 @@ int Calculator::findNextWorkTimeRange(QDateTime const &dt,
 
         if (dt.time() < worktime_from) {
             nextWorkTimeRange = w;
-            continue;
+            break;
         }
     }
     return nextWorkTimeRange;
 }
 
-uint32_t Calculator::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const {
-    int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
-    return cfg->PaymentRate.find(pop_id)->second.pra_price;
-}
-
-double Calculator::computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const {
-    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);
-}
-
 using namespace Utilities;
 
 Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
@@ -495,12 +317,12 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
 
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
-    static const int minParkingTimeMinutes = getMinimalParkingTime(cfg, paymentMethodId);
-    static const int maxParkingTimeMinutes = getMaximalParkingTime(cfg, paymentMethodId);
+    static const int minParkingTimeMinutes = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
+    static const int maxParkingTimeMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
     static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
     static const int durationMinutesNetto = durationMinutes;
-    static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
-    static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
+    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) {
@@ -568,27 +390,33 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
 
         QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
 
-        // find worktime range to start with
+        // qCritical() << "start" << start.toString(Qt::ISODate)
+        //             << "current" << current.toString(Qt::ISODate) << lastWorktimeTo;
 
+        // find worktime range to start with
         int currentRange = 0;
         if (!isSpecialDay) {
             if (start != current) { // on next day
                 current.setTime(worktime[currentRange].getTimeFrom());
             } else {
                 // check if inputDate is located inside a valid worktime-range...
-                currentRange = findWorkTimeRange(current, worktime, ranges);
-                if (currentRange == -1) { // no...
-                    if (!prepaid) {       // parking is not allowed
+                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
-                    currentRange = findNextWorkTimeRange(current, worktime, ranges);
+                    if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
+                        end = current;
+                        continue;
+                    }
                     current.setTime(worktime[currentRange].getTimeFrom());
                 }
             }
         }
 
+        // qCritical() << "current" << current.toString(Qt::ISODate);
+
         for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
             if (durationMinutes > 0) {
                 QTime const &worktime_from = worktime[w].getTimeFrom();
@@ -601,8 +429,6 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                 }
 
                 if (price == 0) {
-                    // inputDate = inputDate.addDays(1);
-                    // inputDate.setTime(worktime_from);
                     end = current;
                     current.setTime(QTime());
                     continue;
@@ -621,12 +447,13 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                         return Ticket();
                     }
                 } else {
-                    qDebug() << "* PREPAID MODE ACTIVE *";
+                    //qDebug() << "* PREPAID MODE ACTIVE *";
+                    //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo;
                     if (current.time() < worktime_from) {
                         current.setTime(worktime_from);
                         end = current;
                     } else if(current.time() > lastWorktimeTo) {
-                        qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
+                        //qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
                         end = current;
                         current.setTime(QTime());
                         continue;
@@ -647,6 +474,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                         current.setTime(QTime());
                         break; // stop while, and continue in outer loop
                     } else {
+                        //qCritical() << "current" << current.toString(Qt::ISODate) << worktime_to;
                         if(current.time() < worktime_to) {
                             // Increment input date minutes for each monetary unit
                             current = current.addSecs(60);
@@ -654,6 +482,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
                             durationMinutes -= 1;
                             //costFromDuration += price_per_unit;
                             costFromDuration += price;
+                            //qCritical() << "current" << current.toString(Qt::ISODate);
                         } else break;
                     }
                 } // while(durationMinutes > 0) {
@@ -665,47 +494,32 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
 
     return
         Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
-               llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
+               ceil(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
                Ticket::s[VALID]);
 }
 
 
 Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                                                QDateTime const &start,
-                                               uint32_t price,
+                                               uint32_t cost,
                                                bool prepaid) {
     // Get input date
     QDateTime current = start;
 
-    // use tariff with structure as for instance Schnau, Koenigsee:
-    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-    if (cfg->YearPeriod.size() == 0
-        && cfg->SpecialDays.size() == 0
-        && cfg->SpecialDaysWorktime.size() == 0)
-    {
-        uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
-        uint64_t const durationSeconds = durationMinutes * 60;
-        current = current.addSecs(durationSeconds);
-
-        return
-            Ticket(start, current, durationMinutes, durationMinutes,
-                   price, Ticket::s[VALID]);
-    }
-
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
-    static const uint32_t minParkingTimeMinutes = std::max(getMinimalParkingTime(cfg, paymentMethodId), 0);
-    static const uint32_t maxParkingTimeMinutes = std::max(getMaximalParkingTime(cfg, paymentMethodId), 0);
+    static const uint32_t 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 = computeWeekDaysPrice(cfg, paymentMethodId);
-    static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
-    static const double specialDaysDurationUnit = 60.0;
+    // 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(price < minParkingPrice) {
-        uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
+    if(cost < minParkingPrice) {
+        uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
         return Ticket(start, current, durationMinutes, durationMinutes,
-                   price, Ticket::s[INVALID_PRICE]);
+                   cost, Ticket::s[INVALID_PRICE]);
     }
     if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
         // TODO
@@ -717,14 +531,15 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
     }
 
     uint32_t durationMinutesNetto = 0;
-    int moneyLeft = price;
-    //double durationUnit = 0.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; current = current.addDays(1)) {
+    for (current = start; moneyLeft > 0 && moneyLeft >= price; current = current.addDays(1)) {
         int const weekdayId = current.date().dayOfWeek();
 
         specialDayId = -1;
@@ -734,9 +549,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
         QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
         int ranges = 0;
 
-        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
+        uint32_t p = 0;
+        if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &p))) {
             // Set special day price:
-      //      durationUnit = specialDaysDurationUnit;
+            durationUnit = specialDaysDurationUnit;
+            price = p / durationUnit;
+            price = std::round(price * 1000.0) / 1000.0;
             worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
                                           SpecialDaysWorkTimeUntil(cfg, specialDayId));
             ranges = 1;
@@ -745,11 +563,13 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
             // for the price, rather compute with integers. Only at the very end of
             // the computation the price is divided by durationUnit.
             price = weekDaysPrice;
-      //      durationUnit = weekDaysDurationUnit;
+            durationUnit = weekDaysDurationUnit;
+            price /= durationUnit;
+            price = std::round(price * 1000.0) / 1000.0; // round to 3 decimals
 
             // If no working day found, skip it (epsecially Sundays!)
             if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
-                qDebug() << "No workday found, trying to find next available day";
+         //     qDebug() << "No workday found, trying to find next available day";
                 end = current;
                 current.setTime(QTime()); // start at midnight on the next day
                 continue;
@@ -768,21 +588,22 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
         QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
 
         // find worktime range to start with
-
         int currentRange = 0;
         if (!isSpecialDay) {
             if (start != current) { // on next day
                 current.setTime(worktime[currentRange].getTimeFrom());
             } else {
                 // check if inputDate is located inside a valid worktime-range...
-                currentRange = findWorkTimeRange(current, worktime, ranges);
-                if (currentRange == -1) { // no...
-                    if (!prepaid) {       // parking is not allowed
+                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
-                    currentRange = findNextWorkTimeRange(current, worktime, ranges);
+                    if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
+                        end = current;
+                        continue;
+                    }
                     current.setTime(worktime[currentRange].getTimeFrom());
                 }
             }
@@ -832,7 +653,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                     }
                 }
 
-                while(moneyLeft > 0) {
+                while(moneyLeft >= price) {
                     // Check for active year period
                     if (!IsYearPeriodActive(cfg, current)) {
                         return Ticket();
@@ -852,14 +673,11 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                     } else {
                         if(current.time() < worktime_to) {
                             // Increment input date minutes for each monetary unit
-                            if(moneyLeft > 1) {
-                                current = current.addSecs(60);
-                            }
-                            end = current;
-                            if(price > 0) {
                             durationMinutesNetto +=1;
-                            }
                             moneyLeft -= price;
+                            moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
+                            current = current.addSecs(60);
+                            end = current;
                         } else break;
                     }
                 } // while(durationMinutes > 0) {
@@ -869,22 +687,82 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
 
     int durationMinutesBrutto =  start.secsTo(end) / 60;
 
+    //qCritical() << "start" << start.toString(Qt::ISODate) << "end"
+    //            << end.toString(Qt::ISODate) << durationMinutesBrutto;
+
     return
         Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
-               price, Ticket::s[VALID]);
+               cost, Ticket::s[VALID]);
 }
 
 QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     QList<int> timeSteps;
 
     int const pop_id = cfg->getPaymentOptions().pop_id;
+    int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
+    int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
 
+    if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
+        if (pop_carry_over) {
+            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+
+            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                        int const durationId = itr->second.pra_payment_unit_id;
+                        auto search = cfg->Duration.find(durationId);
+                        if (search != cfg->Duration.end()) {
+                            ATBDuration duration = search->second;
+                            if (durationId == 1) {
+                                //duration.pun_duration_min = search->second.pun_duration_min;
+                                //duration.pun_duration_max = search->second.pun_duration_max;
+
+                                QDateTime carryOver = m_start;
+                                carryOver = carryOver.addDays(1);
+                                carryOver.setTime(QTime(0, 0, 0));
+
+                                int const timeStep = std::ceil(m_start.secsTo(carryOver) / 60.0);
+                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                    qCritical()
+                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                            .arg(timeStep).arg(duration.pun_duration_min)
+                                            .arg(timeStep).arg(duration.pun_duration_max);
+                                    break;
+                                }
+                                duration.pun_duration = timeStep;
+                                m_timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
+                                timeSteps << duration.pun_duration;
+                            } else {
+                                duration.pun_duration = duration.pun_duration_max - m_timeStepCompensation;
+                                timeSteps << duration.pun_duration;;
+                            }
+
+                            cfg->Duration.erase(search);
+                            cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
+
+                        } else { // if (search != cfg->Duration.end()) {
+                           // TODO
+                        }
+                    }
+                } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                    // TODO
+                }
+            } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
+                // TODO
+            }
+        } else { // if (pop_carry_over) {
+            // TODO
+        }
+    } else {
         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
         {
             int const durationId = itr->second.pra_payment_unit_id;
             int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
             timeSteps << durationUnit;
         }
+    }
 
     return timeSteps;
 }

library/src/configuration.cpp

@@ -1,4 +1,10 @@
 #include "configuration.h"
+#include "tariff_timebase.h"
+#include "time_range_header.h"
+#include "tariff_timestep_config.h"
+
+#include <QString>
+#include <QDebug>
 
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
@@ -13,6 +19,11 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
 	if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
 	if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
 	if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
+    if (strcmp(member_name, "DailyTicket") == 0) return MemberType::DailyTicketType;
+    if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType;
+    if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
+    if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
+    if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
     else return MemberType::UnknownType;
 }
 
@@ -78,7 +89,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
         ATBWeekDaysWorktime  WeekDaysWorktime;
         ATBPaymentOption PaymentOption;
         ATBPeriodYear YearPeriod;
-		MemberType mb_type;
+        ATBDailyTicket DailyTicket;
+        ATBTimeBase TimeBase;
+        ATBCustomer Customer;
+        ATBTimeRange TimeRange;
+        ATBTimeStepConfig TimeStepConfig;
+
+        MemberType mb_type = MemberType::UnknownType;
 
 		// Get all JSON object members
 		// This code should run only once (to load JSON variables into memory)
@@ -109,14 +126,14 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                 continue;
             }
 
-			//printf(" -%s\n", mb_name);
+            printf(" -%s\n", mb_name);
 
 			// Get array for each JSON object member
 			auto mb_array = document[mb_name].GetArray();
 			if (mb_array.Size() <= 0) break;
 
 			//Iterate over provided array
-			for (auto j = 0; j < mb_array.Size(); j++)
+            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++)
 			{
 				// Get all inner objects, don't print name if NULL
 				auto inner_obj = mb_array[j].GetObject();
@@ -136,11 +153,149 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					// Identify member type
 					mb_type = IdentifyJsonMember(mb_name);
 
-//#pragma region Get_values
 					switch (mb_type)
 					{
 					case MemberType::UnknownType:
 						break;
+                    case MemberType::TimeRangeType:
+                        if (QString(inner_obj_name) == QString("time_range_id")) {
+                            if (k->value.IsInt()) {
+                                TimeRange.time_range_id = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("time_range_from")) {
+                            if (k->value.IsString()) {
+                                QTime timeRangeFrom = QTime::fromString(QString::fromStdString(k->value.GetString()), Qt::ISODate);
+                                TimeRange.time_range_from = timeRangeFrom;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("time_range_to")) {
+                            if (k->value.IsString()) {
+                                QTime timeRangeTo = QTime::fromString(QString::fromStdString(k->value.GetString()), Qt::ISODate);
+                                TimeRange.time_range_to = timeRangeTo;
+                            }
+                        }
+                        break;
+                    case MemberType::TimeBaseType:
+                        if (QString(inner_obj_name) == QString("tbase_id")) {
+                            if (k->value.IsInt()) {
+                                TimeBase.tbase_id = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tbase_type")) {
+                            if (k->value.IsInt()) {
+                                int timeBase = k->value.GetInt();
+                                switch (timeBase) {
+                                case (int)ATBTimeBase::TimeBaseType::ABSOLUTE:
+                                    TimeBase.tbase_type = ATBTimeBase::TimeBaseType::ABSOLUTE;
+                                    break;
+                                case (int)ATBTimeBase::TimeBaseType::RELATIVE:
+                                    TimeBase.tbase_type = ATBTimeBase::TimeBaseType::RELATIVE;
+                                    break;
+                                }
+                            }
+                        }
+                        break;
+                    case MemberType::TimeStepConfigType:
+                        if (QString(inner_obj_name) == QString("tsconfig_id")) {
+                            if (k->value.IsInt()) {
+                                TimeStepConfig.tsconfig_id = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tsconfig_label")) {
+                            if (k->value.IsString()) {
+                                TimeStepConfig.tsconfig_label = QString::fromStdString(k->value.GetString());
+                            }
+                        }
+                        break;
+                    case MemberType::DailyTicketType:
+                        if (QString(inner_obj_name) == QString("daily_ticket_payment_option_id")) {
+                            if (k->value.IsInt()) {
+                                DailyTicket.daily_ticket_payment_option_id = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_unit_id")) {
+                            if (k->value.IsInt()) {
+                                DailyTicket.daily_ticket_unit_id = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_price")) {
+                            if (k->value.IsInt()) {
+                                DailyTicket.daily_ticket_price = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_tbase_type")) {
+                            if (k->value.IsInt()) {
+                                int baseType = k->value.GetInt();
+                                switch(baseType) {
+                                case (int)ATBTimeBase::TimeBaseType::ABSOLUTE:
+                                    DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::ABSOLUTE;
+                                    break;
+                                case (int)ATBTimeBase::TimeBaseType::RELATIVE:
+                                    DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::RELATIVE;
+                                    break;
+                                }
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_type")) {
+                            if (k->value.IsInt()) {
+                                int CustomerType = k->value.GetInt();
+                                switch (CustomerType) {
+                                case (int)ATBCustomer::CustomerType::ADULT:
+                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::ADULT;
+                                    break;
+                                case (int)ATBCustomer::CustomerType::CHILD:
+                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::CHILD;
+                                    break;
+                                case (int)ATBCustomer::CustomerType::TEEN:
+                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::TEEN;
+                                    break;
+                                }
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_weekday_range")) {
+                            if (k->value.IsInt()) {
+                                DailyTicket.daily_ticket_weekday_range = k->value.GetInt();
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_special_day_range")) {
+                            if (k->value.IsInt()) {
+                                DailyTicket.daily_ticket_special_day_range = k->value.GetInt();
+                            }
+                        }
+                        break;
+                    case MemberType::CustomerType:
+                        if (QString(inner_obj_name) == QString("cust_type")) {
+                            if (k->value.IsInt()) {
+                                int cust_type = k->value.GetInt();
+                                switch (cust_type) {
+                                case (int)ATBCustomer::CustomerType::ADULT:
+                                    Customer.cust_type = ATBCustomer::CustomerType::ADULT;
+                                    break;
+                                case (int)ATBCustomer::CustomerType::CHILD:
+                                    Customer.cust_type = ATBCustomer::CustomerType::CHILD;
+                                    break;
+                                case (int)ATBCustomer::CustomerType::TEEN:
+                                    Customer.cust_type = ATBCustomer::CustomerType::TEEN;
+                                    break;
+                                }
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("cust_label")) {
+                            if (k->value.IsString()) {
+                                QString label(QString::fromStdString(k->value.GetString()));
+                                if (label.contains("ADULT", Qt::CaseInsensitive)) {
+                                   Customer.cust_label = label;
+                                } else
+                                if (label.contains("CHILD", Qt::CaseInsensitive)) {
+                                   Customer.cust_label = label;
+                                } else
+                                if (label.contains("TEEN", Qt::CaseInsensitive)) {
+                                   Customer.cust_label = label;
+                                }
+                            }
+                        }
+                        break;
                     case MemberType::CurrencyType:
 						if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
@@ -168,13 +323,18 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
 						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_carry_over_time_range_id") == 0) PaymentOption.pop_carry_over_time_range_id = 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();
+                        else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) PaymentOption.pop_time_step_config = k->value.GetInt();
                         this->currentPaymentOptions = PaymentOption;
                         break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
 						else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
                         break;
 					case MemberType::SpecialDaysWorktimeType:
 						if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
@@ -194,6 +354,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pwd_time_to") == 0) WeekDaysWorktime.pwd_time_to = k->value.GetString();
+                        break;
 					case MemberType::SpecialDaysType:
 						if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
@@ -248,6 +409,24 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 				case MemberType::PeriodYearType:
 					cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
 					break;
+                case MemberType::DailyTicketType:
+                    // qCritical() << DailyTicket;
+                    break;
+                case MemberType::CustomerType:
+                    // qCritical() << Customer;
+                    break;
+                case MemberType::TimeBaseType:
+                    // qCritical() << TimeBase;
+                    cfg->TimeBase.insert(pair<int, ATBTimeRange>(TimeBase.tbase_id, TimeBase));
+                    break;
+                case MemberType::TimeRangeType:
+                    // qCritical() << TimeRange;
+                    cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
+                    break;
+                case MemberType::TimeStepConfigType:
+                    // qCritical() << TimeStepConfig;
+                    cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
+                    break;
                 default:
 					break;
 				}

library/src/ticket.cpp

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

library/src/utilities.cpp

@@ -197,7 +197,8 @@ bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTim
 }
 
 bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
-    if (std::none_of(cfg->YearPeriod.cbegin(),
+    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
@@ -373,3 +374,56 @@ PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
 
     return PaymentMethod::Undefined;
 }
+
+int Utilities::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
+}
+
+int Utilities::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
+}
+
+uint32_t Utilities::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0);
+}
+
+uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId) {
+
+    int const popId = cfg->PaymentOption.find(methodId)->second.pop_id;
+    int const punId = cfg->PaymentRate.find(popId)->second.pra_payment_unit_id;
+    uint32_t const firstDurationStep= cfg->Duration.find(punId)->second.pun_duration;
+
+    qCritical() << "getFirstDurationStep() payment-method-id:" << (int)methodId;
+    qCritical() << "getFirstDurationStep()            pop-id:" << popId;
+    qCritical() << "getFirstDurationStep()            pun-id:" << punId;
+    qCritical() << "getFirstDurationStep()        first-step:" << firstDurationStep;
+
+    return firstDurationStep;
+}
+
+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,65 @@ 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        (0)
+#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
+#define NEUHAUSER_BILEXA_GALTUER                (1)
+
 
 int main() {
+#if NEUHAUSER_BILEXA_GALTUER==1
+    std::ifstream input("/opt/ptu5/opt/customer_745/etc/psa_tariff/tariff01.json");
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+        QDateTime start = QDateTime::currentDateTime();
+        start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+        Calculator calculator(start);
+        QList<int> timeSteps = calculator.GetTimeSteps(&cfg);
+        qCritical() << timeSteps;
+
+        for (int i=0; i<timeSteps.size(); ++i) {
+            uint32_t price = calculator.GetPriceForTimeStep(&cfg, timeSteps.at(i));
+            uint32_t duration = calculator.GetDurationForPrice(&cfg, price);
+            qCritical() << "nextTimeStep relative to start:"
+                        << duration << start.addSecs(duration * 60)
+                        << "(price so far:" << price << ")";
+        }
+    }
+#endif
+
+#if NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM==1
+    std::ifstream input("/tmp/tariff_naz.json");
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+        // Calculator calculator;
+
+    }
+
+#endif
+
+#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,121 +102,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-11-27T17:50:00",Qt::ISODate);
-        //QDateTime start = QDateTime::currentDateTime();
-        QDateTime end = start.addSecs(120);
-        uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
-        qCritical() << "cost=" << cost;
-        qCritical() << "end=" << end;
+            pop_max_time = 3*60;
+            bool nextDay = false;
+            bool prePaid = true;
+            // zone 1 (lila)
+            QDateTime s(QDate(2023, 11, 30), QTime());
+            QDateTime end;
+            for (int duration = 30; duration <= pop_max_time; duration += 5) {
+                for (int offset = 420; offset < 1140; ++offset) {
+                    if (offset > 720 && offset < 840) {
+                        continue;
+                    }
+                    QDateTime start = s.addSecs(offset * 60);
+                    //qCritical() << "start" << start.toString(Qt::ISODate);
+
+                    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;
 
-
-
-
-
-
-
-    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;
+#endif
 
 #if 0
 

main/main.pro

@@ -3,8 +3,8 @@ TARGET = main
 
 CONFIG += -std=c++11
 
-QMAKE_CFLAGS = -c -pipe -std=c11 -g -O0 -Wall -Wno-attributes -W -DDEBUG -D_REENTRANT -fPIC
-QMAKE_CXX_FLAGS += -std=c11
+QMAKE_CFLAGS = -c -pipe -std=c11 -g -O -Wall -Wno-attributes -W -DDEBUG -D_REENTRANT -fPIC
+QMAKE_CXXFLAGS += -std=c++17 -g -O
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobilisis/
 INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/rapidjson/

tariffs/tariff_bilexa_galtuer.json

@@ -0,0 +1,172 @@
+{
+  "Project" :   "Bilexa Galtuer",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "Euro",
+      "pcu_minor": "Cent",
+      "pcu_active": true
+    }
+  ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1099,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 1,
+      "pop_max_time": 10080,
+      "pop_min_price": 700,
+      "pop_carry_over": 1,
+      "pop_carry_over_time_range_id": 1,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 0,
+      "pop_time_step_config": 2
+    }
+  ],
+  "TimeBase": [
+    {
+      "tbase_id": 0,
+      "tbase_type": 0,
+      "tbase_type_comment": "time is given as starting from some wall-clock-time",
+      "tbase_label": "absolute time"
+    },
+    {
+      "tbase_id": 1,
+      "tbase_type": 1,
+      "tbase_type_comment": "time is given as starting from 0 minutes",
+      "tbase_label": "relative time"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "00:00:00",
+      "time_range_to": "00:01:00",
+      "time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 1,
+      "pra_price": 700
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 2,
+      "pra_price": 1400
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 3,
+      "pra_price": 2100
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 4,
+      "pra_price": 2800
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 5,
+      "pra_price": 3500
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 6,
+      "pra_price": 4200
+    },
+    {
+      "pra_payment_option_id": 1099,
+      "pra_payment_unit_id": 7,
+      "pra_price": 4900
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "Day 1",
+      "pun_duration_min": 1,
+      "pun_duration_max": 1440,
+      "pun_duration": 0
+    },
+    {
+      "pun_id": 2,
+      "pun_label": "Day 2",
+      "pun_duration_min": 2880,
+      "pun_duration_max": 2880,
+      "pun_duration": 2880
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "Day 3",
+      "pun_duration_min": 4320,
+      "pun_duration_max": 4320,
+      "pun_duration": 4320
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "Day 4",
+      "pun_duration_min": 5760,
+      "pun_duration_max": 5760,
+      "pun_duration": 5760
+    },
+    {
+      "pun_id": 5,
+      "pun_label": "Day 5",
+      "pun_duration_min": 7200,
+      "pun_duration_max": 7200,
+      "pun_duration": 7200
+    },
+    {
+      "pun_id": 6,
+      "pun_label": "Day 6",
+      "pun_duration_min": 8640,
+      "pun_duration_max": 8640,
+      "pun_duration": 8640
+    },
+    {
+      "pun_id": 7,
+      "pun_label": "Day 7",
+      "pun_duration_min": 10080,
+      "pun_duration_max": 10080,
+      "pun_duration": 10080
+    }
+  ]
+}

tariffs/tariff_korneuburg.json

@@ -0,0 +1,629 @@
+{
+  "Project" :   "Korneuburg",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "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 1",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 30,
+      "pop_max_time": 180,
+      "pop_min_price": 60,
+      "pop_carry_over": 1,
+      "pop_daily_card_price": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 10
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "5 min",
+      "pun_duration": 5 
+    },
+    {
+      "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": "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"
+    },
+    {
+      "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": "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"
+    },
+    {
+      "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": "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"
+    },
+    {
+      "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": "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"
+    },
+    {
+      "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": "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"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "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,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
+}

tariffs/tariff_linsinger_maschinenbau.json

@@ -0,0 +1,598 @@
+{
+  "Project" :   "Linsinger Maschinenbau",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "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 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 1,
+      "pop_max_time": 2,
+      "pop_min_price": 900,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 2 
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 900
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 2,
+      "pra_price": 1500
+    },
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 3,
+      "pra_price": 3000
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "3 Marken",
+      "pun_duration": 180 
+    },
+    {
+      "pun_id": 2,
+      "pun_label": "5 Marken",
+      "pun_duration": 300 
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "10 Marken",
+      "pun_duration": 600 
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "06: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": "06: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": "06: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": "06: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": "06:00:00",
+      "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,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
+}

tariffs/tariff_naz.json

@@ -0,0 +1,186 @@
+{
+  "Project" :   "Nordisches Ausbildungszentrum",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 1,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "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"
+    }
+  ],
+  "TimeBase": [
+    {
+      "tbase_id": 0,
+      "tbase_type": 0,
+      "tbase_type_comment": "time is given as starting from some wall-clock-time",
+      "tbase_label": "absolute time"
+    },
+    {
+      "tbase_id": 1,
+      "tbase_type": 1,
+      "tbase_type_comment": "time is given as starting from 0 minutes",
+      "tbase_label": "relative time"
+    }
+  ],
+  "Customer": [
+    {
+      "cust_type": 1000,
+      "cust_label": "Adult"
+    },
+    {
+      "cust_type": 1001,
+      "cust_label": "Child"
+    },
+    {
+      "cust_type": 1002,
+      "cust_label": "Teen"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 1,
+      "pop_max_time": 2,
+      "pop_min_price": 900,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 2 
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pop_comment":"Unused"
+    }
+  ],
+  "DailyTicket": [
+    {
+      "daily_ticket_payment_option_id": 1049,
+      "daily_ticket_unit_id": 1,
+      "daily_ticket_price": 400,
+
+      "daily_ticket_tbase_type": 0,
+      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
+
+      "daily_ticket_clearance_customer_type": 1002,
+      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
+
+      "daily_ticket_weekday_range" : 1,
+      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
+      "daily_ticket_special_day_range": 0
+    },
+    {
+      "daily_ticket_payment_option_id": 1049,
+      "daily_ticket_unit_id": 2,
+      "daily_ticket_price": 800,
+
+      "daily_ticket_tbase_type": 0,
+      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
+
+      "daily_ticket_clearance_customer_type": 1000,
+      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
+
+      "daily_ticket_weekday_ranges" : 1,
+      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
+      "daily_ticket_special_day_ranges": 0
+    }
+  ],
+  "Duration": [
+    {
+      "pun_comment":"Unused"
+    }
+  ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "08:00:00",
+      "time_range_to": "20:00:00"
+    }
+  ],
+  "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": "20:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20:00:00"
+    },
+    {
+      "pwd_id": 627,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "20: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
+    }
+  ]
+}

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
+    }
+  ]
+}