added new files

Fix: take into account that there may be more than just two
	carry-over-ranges. For instance, in Korneuburg (714), there are three
	as they have a break from 12:00-14:00.

\

@@ -0,0 +1 @@
+                                return std::make_pair(CalcState(CalcState::State::OVERPAID), dt);

library/include/mobilisis/atb_time.h

@@ -0,0 +1,83 @@
+#ifndef ATB_TIME_H_INCLUDED
+#define ATB_TIME_H_INCLUDED
+
+#include <QDateTime>
+
+class ATBTime {
+    static QDateTime const m_end;
+    mutable QDateTime m_time;
+
+public:
+    explicit ATBTime();
+    explicit ATBTime(int h, int m, int s = 0, int ms = 0);
+    explicit ATBTime(QString const &time);
+    explicit ATBTime(QTime const &time);
+
+    explicit ATBTime(ATBTime const &atbTime) {
+        m_time = atbTime.m_time;
+    }
+
+    ATBTime &operator=(ATBTime && atbTime) {
+        m_time = std::move(atbTime.m_time);
+        return *this;
+    }
+
+    ATBTime &operator=(ATBTime const &atbTime) {
+        m_time = atbTime.m_time;
+        return *this;
+    }
+
+
+    int hour() const { return m_time.time().hour(); }
+    int minute() const { return m_time.time().minute(); }
+    int second() const { return m_time.time().second(); }
+    int msec() const { return m_time.time().msec(); }
+
+    int secsTo(QString const &t) const {
+        if (t == "24:00:00") {
+            return m_time.secsTo(m_end);
+        }
+        return m_time.time().secsTo(QTime::fromString(t, Qt::ISODate));
+    }
+
+    int msecsTo(QTime t) const { return m_time.time().msecsTo(t); }
+
+    bool setHMS(int h, int m, int s, int ms = 0);
+
+    bool isNull() const { return m_time.time().isNull(); }
+    bool isValid() const { return m_time.time().isValid(); }
+
+
+    QTime addMSecs(int ms) const;
+    QTime addMSecs(int ms);
+
+    QTime addSecs(int s) const;
+    QTime addSecs(int s);
+
+    int msecsSinceStartOfDay() const;
+    QString toString(Qt::DateFormat format = Qt::TextDate) const;
+
+
+    static bool isValid(int h, int m, int s, int ms = 0);
+
+    static QTime currentTime() { return QDateTime::currentDateTime().time(); }
+
+    static constexpr QTime fromMSecsSinceStartOfDay(int msecs);
+
+    static QTime fromString(QString const &string, Qt::DateFormat format = Qt::TextDate);
+    static QTime fromString(QString const &string, const QString &format);
+
+    friend bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator>=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend QDataStream &operator<<(QDataStream &out, ATBTime const &time);
+    friend QDebug &operator<<(QDebug &out, ATBTime const &time);
+    friend QDataStream &operator>>(QDataStream &in, ATBTime &time);
+};
+
+
+#endif // ATB_TIME_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -56,6 +56,7 @@ struct CALCULATE_LIBRARY_API CalcState {
     static QString const ABOVE_MAX_PARKING_PRICE;
     static QString const OVERPAID;
     static QString const OUTSIDE_ALLOWED_PARKING_TIME;
+    static QString const SUCCESS_MAXPRICE;
 
     enum class State : uint8_t {
         SUCCESS,
@@ -71,7 +72,8 @@ struct CALCULATE_LIBRARY_API CalcState {
         BELOW_MIN_PARKING_PRICE,
         ABOVE_MAX_PARKING_PRICE,
         OVERPAID,
-        OUTSIDE_ALLOWED_PARKING_TIME
+        OUTSIDE_ALLOWED_PARKING_TIME,
+        SUCCESS_MAXPRICE
     };
 
     State m_status;
@@ -88,9 +90,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         , m_desc(desc) {
     }
 
-    explicit CalcState(State state, QString desc = "",
+    explicit CalcState(State state, QString desc,
-                       QTime const &from = QTime(),
+                       QTime const &from,
-                       QTime const &until = QTime())
+                       QTime const &until)
         : m_status(state)
         , m_desc(desc)
         , m_allowedTimeRange(from, until) {
@@ -106,6 +108,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -158,6 +163,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -207,6 +215,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         if (desc == SUCCESS) {
             m_status = State::SUCCESS;
         } else
+        if (desc == SUCCESS_MAXPRICE) {
+            m_status = State::SUCCESS_MAXPRICE;
+        }
         if (desc == ERROR_PARSING_ZONE_NR) {
             m_status = State::ERROR_PARSING_ZONE_NR;
         } else

library/include/mobilisis/calculator_functions.h

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <optional>
+#include <utility>
 
 #include "configuration.h"
 #include "calculate_price.h"
@@ -26,9 +27,16 @@ class Calculator {
                                             QDateTime const &start,
                                             int netto_parking_time,
                                             int paymentOptionIndex);
+    struct State {
+        bool m_timeLimitReached;
+        uint32_t m_costAtTimeLimit;
+    } m_state;
 
 protected:
-    explicit Calculator() = default;
+    explicit Calculator() {
+        m_state.m_timeLimitReached = false;
+        m_state.m_costAtTimeLimit = ~0;
+    }
 
 public:
     Calculator(Calculator const &other) = delete;
@@ -39,6 +47,12 @@ public:
         return c;
     }
 
+    bool timeLimitReached() const { return m_state.m_timeLimitReached; }
+    void setTimeLimitReached(bool timeLimitReached) { m_state.m_timeLimitReached = timeLimitReached; }
+    bool costAtTimeLimit() const { return m_state.m_costAtTimeLimit; }
+    void setCostAtTimeLimit(uint32_t cost) { if (m_state.m_costAtTimeLimit > cost) m_state.m_costAtTimeLimit = cost; }
+    void resetCostAtTimeLimit() { m_state.m_costAtTimeLimit = ~0; }
+
     void ResetTimeSteps(int paymentOptionIndex) {
         if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
             m_timeSteps[paymentOptionIndex].clear();
@@ -70,7 +84,8 @@ public:
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z)</param>
 	/// <param name="price"></param>
 	/// <returns>Returns duration in seconds (data type: double)</returns>
-    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+    std::pair<std::string, QDateTime>
+        GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
                             PermitType permitType, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
@@ -85,6 +100,9 @@ public:
     double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
                                PermitType permitType, bool nextDay = false, bool prepaid = false);
 
+    std::pair<CalcState, QDateTime> ComputeDurationFromCost(Configuration *cfg, QDateTime const &startDatetimePassed,  int cost);
+    std::pair<CalcState, std::optional<int>> ComputeCostFromDuration(Configuration *cfg, QDateTime const &startDatetime, QDateTime &endDatetime, int nettoParkingTime);
+
     // Daily ticket
     QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
     std::optional<struct price_t> GetDailyTicketPrice(Configuration* cfg, QDateTime const &startDatetime, QDateTime &endTime, PERMIT_TYPE permitType);

library/include/mobilisis/configuration.h

@@ -29,6 +29,8 @@
 #include "tariff_prepaid.h"
 #include "tariff_carryover.h"
 #include "tariff_permit_type.h"
+#include "tariff_service.h"
+#include "tariff_out_of_service.h"
 
 #include <QVector>
 #include <optional>
@@ -36,6 +38,7 @@
 using namespace std;
 using namespace rapidjson;
 
+
 class Calculator;
 class Configuration
 {
@@ -49,6 +52,10 @@ public:
     using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
     using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
     using TariffDurationType = std::multimap<int, ATBDuration>;
+    using TariffServiceType = std::multimap<int, ATBTariffService>;
+    using TariffOutOfServiceType = std::multimap<int, ATBTariffOutOfService>;
+    using ATBTariffPrepaidType = std::multimap<int, ATBTariffPrepaid>;
+    using ATBTariffCarryOverType = std::multimap<int, ATBTariffCarryOver>;
 
     ATBProject project;
     ATBCurrency Currency;
@@ -59,7 +66,7 @@ public:
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;
 	SpecialDaysType SpecialDays;
-	multimap<int, ATBWeekDays> WeekDays;
+    multimap<Qt::DayOfWeek, ATBWeekDay> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	ATBPaymentOptionType PaymentOption;
@@ -72,6 +79,10 @@ public:
 	TariffInterpolationType TariffInterpolations;
 	TariffPrepaidType TariffPrepaidOptions;
 	TariffCarryOverType TariffCarryOverOptions;
+    TariffServiceType TariffServices;
+    TariffOutOfServiceType TariffOutOfServices;
+    ATBTariffPrepaidType TariffPrepaids;
+    ATBTariffCarryOverType TariffCarryOvers;
 
 	/// <summary>
 	/// Parse JSON string
@@ -126,3 +137,15 @@ private:
 
 	QVector<ATBPaymentOption> currentPaymentOptions;
 };
+
+bool previousDayHoliday(Configuration const &cfg, QDateTime const &t);
+bool isHoliday(Configuration const &cfg, QDateTime const &t);
+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const& dt = QDateTime::currentDateTime());
+
+ATBWeekDay parseWeekDay(Configuration &cfg,
+                        rapidjson::GenericMemberIterator<false,
+                                                         rapidjson::UTF8<char>,
+                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
+                        QString const &innerObjName,
+                        Qt::DayOfWeek weekDay,
+                        QString const &weekDayName);

library/include/mobilisis/payment_method.h

@@ -6,7 +6,8 @@ enum PaymentMethod {
 	Progressive = 0x01,
 	Degressive = 0x02,
 	Linear = 0x03,
-	Steps = 0x04
+    Steps = 0x04,
+    Unified = 0x05
 };
 
 #endif // PAYMENT_METHOD_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -25,6 +25,7 @@ public:
         pop_max_time = 0;
         pop_min_price = 0;
         pop_max_price = 0;
+        pop_max_price_save = 0;
         pop_carry_over = -1;
         pop_carry_over_option_id = -1;
         pop_prepaid_option_id = -1;
@@ -41,7 +42,10 @@ public:
         pop_use_only_upto_datetime = ""; // deprecated
         pop_use_only_for_duration = 0;   // deprecated
         pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_plus_steps_saved = 1;
         pop_minus_steps = 1; // -: jump <x=1> steps backward
+        pop_allow_overpay = false;
+        pop_apply_carry_over_to_ticket_endtime = false;
     }
 
     int pop_id;
@@ -58,6 +62,7 @@ public:
     double pop_max_time;
     double pop_min_price;
     double pop_max_price;
+    double pop_max_price_save;
     int pop_carry_over;
     int pop_carry_over_option_id;
     bool pop_truncate_last_interpolation_step;
@@ -72,7 +77,10 @@ public:
     bool pop_accumulate_prices;
     bool pop_accumulate_durations;
     int pop_plus_steps;
+    int pop_plus_steps_saved;
     int pop_minus_steps;
+    bool pop_allow_overpay;
+    bool pop_apply_carry_over_to_ticket_endtime;
 
     struct ATBMaxDateTime {
         int direction;

library/include/mobilisis/spec_days_worktime.h

@@ -9,4 +9,8 @@ public:
 	std::string pedwt_time_from;
 	std::string pedwt_time_to;
     double pedwt_price;
+    int pedwt_paid; // 00: not paid (i.e. free)
+                    // 01: not paid in winter term, piad in summer term
+                    // 10: paid in winter term, not paid in summer term
+                    // 11: paid in winter and in summer term
 };

library/include/mobilisis/tariff_carryover.h

@@ -3,6 +3,102 @@
 
 #include <QTime>
 
+#include "time_range.h"
+
+enum class ApplyCarryOver {
+    NEVER = 0,
+    MATCH_PREV_DAY = 1,
+    MATCH_NEXT_DAY = 2,
+    ALWAYS = 3
+};
+
+struct ATBTariffCarryOver {
+    int m_id;
+    QString m_weekDay;
+    TimeRange m_range;
+    QDate m_date;
+    ApplyCarryOver m_carryOverIf;
+
+    explicit ATBTariffCarryOver()
+      : m_id(-1)
+      , m_carryOverIf(ApplyCarryOver::NEVER) {
+    }
+
+    void setCarryOverIf(QString const &coif) {
+        if (coif == "never") {
+            m_carryOverIf = ApplyCarryOver::NEVER;
+        } else
+        if (coif == "match_prev_day") {
+            m_carryOverIf = ApplyCarryOver::MATCH_PREV_DAY;
+        } else
+        if (coif == "match_next_day") {
+            m_carryOverIf = ApplyCarryOver::MATCH_NEXT_DAY;
+        } else
+        if (coif == "always") {
+            m_carryOverIf = ApplyCarryOver::ALWAYS;
+        } else {
+           qCritical() << "ERROR unknown carry over application" << coif;
+        }
+    }
+
+    ApplyCarryOver carryOverIf() const {
+        return m_carryOverIf;
+    }
+
+    QString carryOverIfStr() const {
+        if (m_carryOverIf == ApplyCarryOver::NEVER) {
+            return "never";
+        }
+        if (m_carryOverIf == ApplyCarryOver::ALWAYS) {
+            return "always";
+        }
+        if (m_carryOverIf == ApplyCarryOver::MATCH_PREV_DAY) {
+            return "match prev day";
+        }
+        if (m_carryOverIf == ApplyCarryOver::MATCH_NEXT_DAY) {
+            return "match next day";
+        }
+        return QString("ERROR unknown carry over application: %1").arg(static_cast<int>(m_carryOverIf));
+    }
+
+    int computeMinutesUntilCarryOverEnd(QDateTime const &dt) {
+        int minutes = 0;
+        QString end = m_range.m_end.toString(Qt::ISODate);
+        if (end == "24:00:00") {
+            QDateTime t = dt.addDays(1);
+            t.setTime(QTime(0,0,0));
+            minutes = dt.secsTo(t) / 60;
+        } else {
+            QDateTime t(dt);
+            t.setTime(QTime::fromString(end, Qt::ISODate));
+            minutes = dt.secsTo(t) / 60;
+        }
+
+        if (minutes < 0 || minutes > m_range.m_duration) {
+            minutes = 0;
+        }
+
+        // qCritical() << __func__ << ":" << __LINE__ << "minutes" << minutes;
+
+        return minutes;
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffCarryOver const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "\nTariffCarryOver:\n"
+            << "         week day: " << co.m_weekDay << "\n"
+            << "             date: " << co.m_date.toString(Qt::ISODate) << "\n"
+            << "               id: " << co.m_id << "\n"
+            << "            start: " << co.m_range.m_start << "\n"
+            << "              end: " << co.m_range.m_end << "\n"
+            << "         duration: " << co.m_range.m_duration << "\n"
+            << "    carry over if: " << co.carryOverIfStr() << endl;
+        return debug;
+    }
+};
+
 struct ATBCarryOver {
     struct week {
         int day;
@@ -15,6 +111,19 @@ struct ATBCarryOver {
 
     int id;
 
+    explicit ATBCarryOver()
+      : id(-1) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            carryover[i].day = -1;
+            carryover[i].seemless = false;
+            carryover[i].never = false;
+            carryover[i].static_start = QTime(23, 59, 59);
+            carryover[i].static_end = QTime(0, 0, 0);
+            carryover[i].duration = -1;
+        }
+    }
+
     friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
         QDebugStateSaver saver(debug);
 
@@ -31,21 +140,21 @@ struct ATBCarryOver {
             << "                day: " << co.carryover[(int)Qt::Tuesday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Tuesday].duration << "\n"
             << "            anytime: " << co.carryover[(int)Qt::Tuesday].seemless << "\n"
             << "              never: " << co.carryover[(int)Qt::Tuesday].never << "\n"
             << "        **** Wednesday **** \n"
             << "                day: " << co.carryover[(int)Qt::Wednesday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Wednesday].duration << "\n"
             << "            anytime: " << co.carryover[(int)Qt::Wednesday].seemless << "\n"
             << "              never: " << co.carryover[(int)Qt::Wednesday].never << "\n"
             << "        **** Thursday **** \n"
             << "                day: " << co.carryover[(int)Qt::Thursday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Thursday].duration << "\n"
             << "            anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
             << "              never: " << co.carryover[(int)Qt::Thursday].never << "\n"
             << "        **** Friday **** \n"
@@ -58,14 +167,14 @@ struct ATBCarryOver {
             << "                day: " << co.carryover[(int)Qt::Saturday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Saturday].duration << "\n"
             << "            anytime: " << co.carryover[(int)Qt::Saturday].seemless << "\n"
             << "              never: " << co.carryover[(int)Qt::Saturday].never << "\n"
             << "        **** Sunday **** \n"
             << "                day: " << co.carryover[(int)Qt::Sunday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
-            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Sunday].duration << "\n"
             << "            anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
             << "              never: " << co.carryover[(int)Qt::Sunday].never << "\n";
 

library/include/mobilisis/tariff_carryover_settings.h

@@ -0,0 +1,69 @@
+#ifndef ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+#include <QDateTime>
+
+#include <functional>
+
+struct ATBTariffCarryOverSettings {
+
+    // parking time limit not violated: return false, otherwise: return true.
+    using ParkingTimeLimitChecker = std::function<bool(ATBTariffCarryOverSettings const&,
+                                                       QDateTime const &startTime,
+                                                       QDateTime const &endTime,
+                                                       int paymentOptionIndex)>;
+
+    int m_duration;
+    QTime m_start;
+    QTime m_end;
+    ParkingTimeLimitChecker m_parkingTimeLimitChecker;
+
+    QTime m_parking_time_limit;
+    QTime m_about_to_exceed_parking_time_limit;
+
+    explicit ATBTariffCarryOverSettings()
+      : m_duration(0)
+      , m_start(QTime())
+      , m_end(QTime())
+      , m_parkingTimeLimitChecker([](ATBTariffCarryOverSettings const&,
+                                  QDateTime const&, QDateTime const&, int) { return false; })
+      , m_parking_time_limit(QTime())
+      , m_about_to_exceed_parking_time_limit(QTime()) {}
+
+    explicit ATBTariffCarryOverSettings(int duration, QTime const &start,
+                                        QTime const &end,
+                                        QTime const &parking_time_limit,
+                                        QTime const &about_to_exceed_parking_time_limit,
+                                        ParkingTimeLimitChecker parkingTimeLimitChecker)
+      : m_duration(duration)
+      , m_start(start)
+      , m_end(end)
+      , m_parkingTimeLimitChecker(std::move(parkingTimeLimitChecker))
+      , m_parking_time_limit(parking_time_limit)
+      , m_about_to_exceed_parking_time_limit(about_to_exceed_parking_time_limit) {
+    }
+
+    bool parkingTimeLimitExceeded(QDateTime const &startTime,
+                                  QDateTime const &endTime,
+                                  int paymentOptionIndex) const {
+        return m_parkingTimeLimitChecker(*this, startTime, endTime, paymentOptionIndex);
+    }
+
+    QTime const &parkingTimeLimit() const { return m_parking_time_limit; }
+    QTime &parkingTimeLimit() { return m_parking_time_limit; }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffCarryOverSettings const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 duration: " << co.m_duration << "\n"
+            << "                    start: " << co.m_start.toString(Qt::ISODate) << "\n"
+            << "                      end: " << co.m_end.toString(Qt::ISODate) << "\n"
+            << "       parking_time_limit: " << co.m_parking_time_limit.toString(Qt::ISODate) << endl;
+
+        return debug;
+    }
+};
+
+#endif // ATB_TARIFF_CARRYOVER_SETTINGS_H_INCLUDED

library/include/mobilisis/tariff_cfg.h

@@ -1,4 +1,3 @@
-#pragma once
 #include <variant>
 #include <cstddef>
 #include <stdio.h>

library/include/mobilisis/tariff_comp_state.h

@@ -0,0 +1,20 @@
+#ifndef TARIFF_COMP_STATE_H_INCLUDED
+#define TARIFF_COMP_STATE_H_INCLUDED
+
+#include <QDateTime>
+
+struct TariffCompState {
+    QDateTime const m_start;
+    int m_nettoParkingTimeTotal = 0;
+    int m_bruttoParkingTimeTotal = 0;
+    int m_priceTotal = 0;
+
+    explicit TariffCompState(QDateTime start)
+        : m_start(std::move(start))
+        , m_nettoParkingTimeTotal(0)
+        , m_bruttoParkingTimeTotal(0)
+        , m_priceTotal(0) {
+    }
+};
+
+#endif // TARIFF_COMP_STATE_H_INCLUDED

library/include/mobilisis/tariff_comp_step.h

@@ -0,0 +1,29 @@
+#ifndef TARIFF_COMP_STEP_H_INCLUDED
+#define TARIFF_COMP_STEP_H_INCLUDED
+
+#include <QDateTime>
+#include "tariff_comp_state.h"
+
+class TariffCompStep {
+    int m_duration;
+    QDateTime const m_start;
+    QDateTime const m_end;
+    uint64_t const m_handle;
+    TariffCompState m_compState;
+
+    uint64_t hash();
+
+public:
+    explicit TariffCompStep(int duration, QDateTime start, QDateTime end, TariffCompState &compState)
+        : m_duration(duration)
+        , m_start(std::move(start))
+        , m_end(std::move(end))
+        , m_handle(hash())
+        , m_compState(compState) {
+    }
+
+    uint64_t handle() { return m_handle; }
+    uint64_t handle() const { return m_handle; }
+};
+
+#endif // TARIFF_COMP_STEP_H_INCLUDED

library/include/mobilisis/tariff_log.h

@@ -14,6 +14,8 @@
 void setDebugLevel(int level);
 int getDebugLevel();
 
+#if 0
+
 static void print() {
     std::cerr << "\n";
     if (getDebugLevel() == DBG_LEVEL_FATAL) {
@@ -75,4 +77,6 @@ static void LOG_FATAL(const Arg1& arg1, const Args&&... args) {
     }
 }
 
+#endif
+
 #endif //  TARIFF_LOG_INCLUDED_H

library/include/mobilisis/tariff_out_of_service.h

@@ -0,0 +1,79 @@
+#ifndef TARIFF_OUT_OF_SERVICE_H_INCLUDED
+#define TARIFF_OUT_OF_SERVICE_H_INCLUDED
+
+#include <QDateTime>
+#include <QString>
+
+#include "time_range.h"
+
+enum class ApplyOutOfService {
+    NEVER = 0,
+    MATCH_PREV_DAY = 1,
+    MATCH_NEXT_DAY = 2,
+    ALWAYS = 3
+};
+
+struct ATBTariffOutOfService {
+    int m_id;
+    QString m_weekDay;
+    QDate m_date;
+    TimeRange m_range;
+    ApplyOutOfService m_outOfServiceIf;
+
+    explicit ATBTariffOutOfService()
+      : m_id(-1)
+      , m_outOfServiceIf(ApplyOutOfService::NEVER) {
+    }
+
+    void setOutOfServiceIf(QString const &oosif) {
+        if (oosif == "never") {
+            m_outOfServiceIf = ApplyOutOfService::NEVER;
+        } else
+        if (oosif == "match_prev_day") {
+            m_outOfServiceIf = ApplyOutOfService::MATCH_PREV_DAY;
+        } else
+        if (oosif == "match_next_day") {
+            m_outOfServiceIf = ApplyOutOfService::MATCH_NEXT_DAY;
+        } else
+        if (oosif == "always") {
+            m_outOfServiceIf = ApplyOutOfService::ALWAYS;
+        } else {
+           qCritical() << "ERROR unknown servcie application" << oosif;
+        }
+    }
+
+    ApplyOutOfService outOfServiceIf() const {
+        return m_outOfServiceIf;
+    }
+
+    QString outOfServiceIfStr() const {
+        if (m_outOfServiceIf == ApplyOutOfService::NEVER) {
+            return "never";
+        }
+        if (m_outOfServiceIf == ApplyOutOfService::ALWAYS) {
+            return "always";
+        }
+        if (m_outOfServiceIf == ApplyOutOfService::MATCH_PREV_DAY) {
+            return "match prev day";
+        }
+        if (m_outOfServiceIf == ApplyOutOfService::MATCH_NEXT_DAY) {
+            return "match next day";
+        }
+        return QString("ERROR unknown out of service application: %1").arg(static_cast<int>(m_outOfServiceIf));
+    }
+    friend QDebug operator<<(QDebug debug, ATBTariffOutOfService const &oos) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "\nTariffOutOfService:\n"
+            << "            week day: " << oos.m_weekDay << "\n"
+            << "                date: " << oos.m_date.toString(Qt::ISODate) << "\n"
+            << "                  id: " << oos.m_id << "\n"
+            << "               start: " << oos.m_range.m_start << "\n"
+            << "                 end: " << oos.m_range.m_end << "\n"
+            << "            duration: " << oos.m_range.m_duration << endl;
+        return debug;
+    }
+};
+
+#endif // TARIFF_SERVICE_H_INCLUDED

library/include/mobilisis/tariff_prepaid.h

@@ -1,17 +1,114 @@
 #ifndef TARIFF_PREPAID_H_INCLUDED
 #define TARIFF_PREPAID_H_INCLUDED
 
-#include <QTime>
+#include <QDateTime>
 #include <QString>
 
+#include "time_range.h"
+
+enum class ApplyPrepaid {
+    NEVER = 0,
+    MATCH_PREV_DAY = 1,
+    MATCH_NEXT_DAY = 2,
+    ALWAYS = 3
+};
+
+struct ATBTariffPrepaid {
+    int m_id;
+    QString m_weekDay;
+    QDate m_date;
+    TimeRange m_range;
+    ApplyPrepaid m_prepaidIf;
+
+    explicit ATBTariffPrepaid()
+      : m_id(-1)
+      , m_prepaidIf(ApplyPrepaid::NEVER) {
+    }
+
+    void setPrepaidIf(QString const &ppif) {
+        if (ppif == "never") {
+            m_prepaidIf = ApplyPrepaid::NEVER;
+        } else
+        if (ppif == "match_prev_day") {
+            m_prepaidIf = ApplyPrepaid::MATCH_PREV_DAY;
+        } else
+        if (ppif == "match_next_day") {
+            m_prepaidIf = ApplyPrepaid::MATCH_NEXT_DAY;
+        } else
+        if (ppif == "always") {
+            m_prepaidIf = ApplyPrepaid::ALWAYS;
+        } else {
+           qCritical() << "ERROR unknown carry over application" << ppif;
+        }
+    }
+
+    ApplyPrepaid prepaidIf() const {
+        return m_prepaidIf;
+    }
+
+    QString prepaidIfStr() const {
+        if (m_prepaidIf == ApplyPrepaid::NEVER) {
+            return "never";
+        }
+        if (m_prepaidIf == ApplyPrepaid::ALWAYS) {
+            return "always";
+        }
+        if (m_prepaidIf == ApplyPrepaid::MATCH_PREV_DAY) {
+            return "match prev day";
+        }
+        if (m_prepaidIf == ApplyPrepaid::MATCH_NEXT_DAY) {
+            return "match next day";
+        }
+        return QString("ERROR unknown prepaid application: %1").arg(static_cast<int>(m_prepaidIf));
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffPrepaid const &pp) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "\nTariffPrepaid:\n"
+            << "       week day: " << pp.m_weekDay << "\n"
+            << "           date: " << pp.m_date.toString(Qt::ISODate) << "\n"
+            << "             id: " << pp.m_id << "\n"
+            << "          start: " << pp.m_range.m_start << "\n"
+            << "            end: " << pp.m_range.m_end << "\n"
+            << "       duration: " << pp.m_range.m_duration << "\n"
+            << "     prepaid if: " << pp.prepaidIfStr() << endl;
+        return debug;
+    }
+};
+
+// deprecated
+
 struct ATBPrepaid {
-    explicit ATBPrepaid() = default;
     int id;
     bool anytime;
     bool never;
     QTime static_start;
     QTime static_end;
 
+    struct week {
+        int day;
+        QTime static_start;
+        QTime static_end;
+        int duration;
+    } prepaid[8];
+
+    explicit ATBPrepaid()
+      : id(-1)
+      , anytime(false)
+      , never(false)
+      , static_start(QTime(23, 59, 59))
+      , static_end(QTime(0, 0, 0)) {
+
+        for (int i = 0 ; i < 8; ++i) {
+            prepaid[i].day = -1;
+            prepaid[i].static_start = QTime(23, 59, 59);
+            prepaid[i].static_end = QTime(0, 0, 0);
+            prepaid[i].duration = -1;
+        }
+    }
+
     friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
         QDebugStateSaver saver(debug);
 
@@ -20,7 +117,41 @@ struct ATBPrepaid {
             << "       static_start: " << pp.static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << pp.static_end.toString(Qt::ISODate) << "\n"
             << "            anytime: " << pp.anytime << "\n"
-            << "              never: " << pp.never << "\n";
+            << "              never: " << pp.never << "\n"
+            << "        **** Monday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Monday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Monday].duration << "\n"
+            << "        **** Tuesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Tuesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Tuesday].duration << "\n"
+            << "        **** Wednesday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Wednesday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Wednesday].duration << "\n"
+            << "        **** Thursday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Thursday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Thursday].duration << "\n"
+            << "        **** Friday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Friday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
+            << "        **** Saturday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Saturday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Saturday].duration << "\n"
+            << "        **** Sunday **** \n"
+            << "                day: " << pp.prepaid[(int)Qt::Sunday].day << "\n"
+            << "       static_start: " << pp.prepaid[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << pp.prepaid[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << pp.prepaid[(int)Qt::Sunday].duration << "\n";
 
         return debug;
     }

library/include/mobilisis/tariff_service.h

@@ -0,0 +1,81 @@
+#ifndef TARIFF_SERVICE_H_INCLUDED
+#define TARIFF_SERVICE_H_INCLUDED
+
+#include <QDateTime>
+#include <QString>
+
+#include "time_range.h"
+
+enum class ApplyService {
+    NEVER = 0,
+    MATCH_PREV_DAY = 1,
+    MATCH_NEXT_DAY = 2,
+    ALWAYS = 3
+};
+
+struct ATBTariffService {
+    int m_id;
+    QString m_weekDay;
+    QDate m_date;
+    TimeRange m_range;
+    ApplyService m_serviceIf;
+
+    explicit ATBTariffService()
+      : m_id(-1)
+      , m_serviceIf(ApplyService::NEVER) {
+    }
+
+    void setServiceIf(QString const &sif) {
+        if (sif == "never") {
+            m_serviceIf = ApplyService::NEVER;
+        } else
+        if (sif == "match_prev_day") {
+            m_serviceIf = ApplyService::MATCH_PREV_DAY;
+        } else
+        if (sif == "match_next_day") {
+            m_serviceIf = ApplyService::MATCH_NEXT_DAY;
+        } else
+        if (sif == "always") {
+            m_serviceIf = ApplyService::ALWAYS;
+        } else {
+           qCritical() << "ERROR unknown servcie application" << sif;
+        }
+    }
+
+    ApplyService serviceIf() const {
+        return m_serviceIf;
+    }
+
+    QString serviceIfStr() const {
+        if (m_serviceIf == ApplyService::NEVER) {
+            return "never";
+        }
+        if (m_serviceIf == ApplyService::ALWAYS) {
+            return "always";
+        }
+        if (m_serviceIf == ApplyService::MATCH_PREV_DAY) {
+            return "match prev day";
+        }
+        if (m_serviceIf == ApplyService::MATCH_NEXT_DAY) {
+            return "match next day";
+        }
+        return QString("ERROR unknown service application: %1").arg(static_cast<int>(m_serviceIf));
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffService const &ts) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "\nTariffService:\n"
+            << "       week day: " << ts.m_weekDay << "\n"
+            << "           date: " << ts.m_date.toString(Qt::ISODate) << "\n"
+            << "             id: " << ts.m_id << "\n"
+            << "          start: " << ts.m_range.m_start << "\n"
+            << "            end: " << ts.m_range.m_end << "\n"
+            << "       duration: " << ts.m_range.m_duration << "\n"
+            << "     prepaid if: " << ts.serviceIfStr() << endl;
+        return debug;
+    }
+};
+
+#endif // TARIFF_SERVICE_H_INCLUDED

library/include/mobilisis/tariff_settings.h

@@ -0,0 +1,40 @@
+#ifndef ATB_TARIFF_SETTINGS_H_INCLUDED
+#define ATB_TARIFF_SETTINGS_H_INCLUDED
+
+#include <QDebug>
+
+struct ATBTariffSettings {
+    int m_max_price;
+    int m_min_price;
+    int m_max_time;
+    int m_min_time;
+
+    explicit ATBTariffSettings()
+      : m_max_price(0)
+      , m_min_price(0)
+      , m_max_time(0)
+      , m_min_time(0) {
+    }
+
+    explicit ATBTariffSettings(int max_price, int min_price, int max_time, int min_time)
+      : m_max_price(max_price)
+      , m_min_price(min_price)
+      , m_max_time(max_time)
+      , m_min_time(min_time) {
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffSettings const &ts) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                max_price: " << ts.m_max_price << "\n"
+            << "                min_price: " << ts.m_min_price << "\n"
+            << "                 max_time: " << ts.m_max_time << "\n"
+            << "                 min_time: " << ts.m_min_time << endl;
+
+        return debug;
+    }
+};
+
+
+#endif // ATB_TARIFF_SETTINGS_H_INCLUDED

library/include/mobilisis/time_range.h

@@ -1,12 +1,46 @@
 #ifndef TIME_RANGE_H_INCLUDED
 #define TIME_RANGE_H_INCLUDED
 
-#include "time_range_header.h"
+#include "atb_time.h"
+
+#include <QString>
 
 struct TimeRange {
-public:
+    ATBTime m_start;
-	bool IsActive;
+    ATBTime m_end;
-	ATBTimeRange TimeRangeStructure;
+    int m_duration;
+
+    explicit TimeRange() = default;
+    explicit TimeRange(QString const &start, QString const &end, int duration)
+      : m_start(start)
+      , m_end(end)
+      , m_duration(duration) {
+    }
+    explicit TimeRange(ATBTime const &start, ATBTime const &end, int duration)
+      : m_start(start)
+      , m_end(end)
+      , m_duration(duration) {
+    }
+
+    explicit TimeRange(TimeRange const &timeRange) {
+      m_start = timeRange.m_start;
+      m_end = timeRange.m_end;
+      m_duration = timeRange.m_duration;
+    }
+
+    TimeRange &operator=(TimeRange && timeRange) {
+        m_start = std::move(timeRange.m_start);
+        m_end = std::move(timeRange.m_end);
+        m_duration = timeRange.m_duration;
+        return *this;
+    }
+
+    TimeRange &operator=(TimeRange const &timeRange) {
+        m_start = timeRange.m_start;
+        m_end = timeRange.m_end;
+        m_duration = timeRange.m_duration;
+        return *this;
+    }
 };
 
 #endif // TIME_RANGE_H_INCLUDED

library/include/mobilisis/weekdays.h

@@ -1,10 +1,57 @@
-#pragma once
+#include "tariff_settings.h"
-#include <string>
+#include "tariff_carryover_settings.h"
 
-class ATBWeekDays
+#include <QString>
-{
+#include <Qt>
-public:
+#include <QDate>
-	int pdiw_id;
+
-	std::string pdiw_label;
+struct ATBWeekDay {
-	int pdiw_index;
+    enum WeekDayType {USUAL_WEEKDAY=0, HOLIDAY=1};
+
+    Qt::DayOfWeek m_id;
+    QString m_name;
+    QDate m_date;
+    WeekDayType m_type;
+    ATBTariffSettings m_tariffSettings;
+    ATBTariffCarryOverSettings m_tariffCarryOverSettings;
+
+    explicit ATBWeekDay()
+        : m_id(Qt::Monday)
+        , m_name("")
+        , m_date(QDate())
+        , m_type(USUAL_WEEKDAY)
+        , m_tariffSettings()
+        , m_tariffCarryOverSettings() {}
+
+    explicit ATBWeekDay(Qt::DayOfWeek id, QString const &name, WeekDayType type,
+                        QDate const &date,
+                        ATBTariffSettings const &tariffSettings,
+                        ATBTariffCarryOverSettings const &tariffCarryOverSettings)
+        : m_id(id)
+        , m_name(name)
+        , m_date(date)
+        , m_type(type)
+        , m_tariffSettings(tariffSettings)
+        , m_tariffCarryOverSettings(tariffCarryOverSettings) {}
+
+    ATBTariffCarryOverSettings &getTariffCarryOverSettings() { return m_tariffCarryOverSettings; }
+    ATBTariffCarryOverSettings const &getTariffCarryOverSettings() const { return m_tariffCarryOverSettings; }
+
+    ATBTariffSettings &getTariffSettings() { return m_tariffSettings; }
+    ATBTariffSettings const &getTariffSettings() const { return m_tariffSettings; }
+
+    friend QDebug operator<<(QDebug debug, ATBWeekDay const &wd) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                       id: " << (int)wd.m_id << "\n"
+            << "                     name: " << wd.m_name << "\n"
+            << "                     type: " << (int)wd.m_type << "\n\n"
+            << "          tariff settings: " << "\n"
+                                             << wd.m_tariffSettings << "\n"
+            << "tariff carryover settings: " << "\n"
+                                             << wd.m_tariffCarryOverSettings << endl;
+
+        return debug;
+    }
 };

library/library.pro

@@ -35,7 +35,9 @@ SOURCES += \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
     src/ticket.cpp \
-    src/tariff_global_defines.cpp
+    src/tariff_global_defines.cpp \
+    src/atb_time.cpp \
+    src/tariff_comp_step.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -89,7 +91,12 @@ HEADERS += \
     include/mobilisis/tariff_interpolation.h \
     include/mobilisis/tariff_prepaid.h \
     include/mobilisis/tariff_carryover.h \
-    include/mobilisis/tariff_global_defines.h
+    include/mobilisis/tariff_global_defines.h \
+    include/mobilisis/atb_time.h \
+    include/mobilisis/tariff_service.h \
+    include/mobilisis/tariff_out_of_service.h \
+    include/mobilisis/tariff_comp_state.h \
+    include/mobilisis/tariff_comp_step.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

library/src/atb_time.cpp

@@ -0,0 +1,151 @@
+#include "atb_time.h"
+#include <QDebugStateSaver>
+
+QDateTime const ATBTime::m_end(QDateTime::fromString("1970-01-02T00:00:00", Qt::ISODate));
+
+ATBTime::ATBTime()
+    : m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+}
+
+ATBTime::ATBTime(int h, int m, int /*s*/, int /*ms*/)
+    : m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+
+    if (h == 24 && m == 0) {
+        m_time = m_end;
+    } else {
+        QTime const t(h, m, 0, 0);
+        m_time.setTime(t);
+    }
+}
+
+ATBTime::ATBTime(QString const &t)
+    : m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+
+    if (t == "24:00:00") {
+        m_time = m_end;
+    } else {
+        QTime tmp = QTime::fromString(t, Qt::ISODate);
+        if (tmp.isValid()) {
+            m_time.setTime(tmp);
+        }
+    }
+}
+
+ATBTime::ATBTime(QTime const &t)
+    : m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+    m_time.setTime(t);
+}
+
+QTime ATBTime::addMSecs(int ms) const {
+    return m_time.time().addMSecs(ms);
+}
+
+QTime ATBTime::addMSecs(int ms)  {
+    QTime t = m_time.time();
+    t = t.addMSecs(ms);
+    m_time.setTime(t);
+    return t;
+}
+
+QTime ATBTime::addSecs(int s) const {
+    return m_time.time().addSecs(s);
+}
+
+QTime ATBTime::addSecs(int s)  {
+    QTime t = m_time.time();
+    t = t.addSecs(s);
+    m_time.setTime(t);
+    return t;
+}
+
+constexpr QTime ATBTime::fromMSecsSinceStartOfDay(int msecs) {
+    return QTime::fromMSecsSinceStartOfDay(msecs);
+}
+
+QTime ATBTime::fromString(QString const &string, Qt::DateFormat format) {
+    return QTime::fromString(string, format);
+}
+
+QTime ATBTime::fromString(QString const &string, QString const &format) {
+    return QTime::fromString(string, format);
+}
+
+bool ATBTime::isValid(int h, int m, int s, int ms) {
+    return QTime(h, m, s, ms).isValid();
+}
+
+int ATBTime::msecsSinceStartOfDay() const {
+    return m_time.time().msecsSinceStartOfDay();
+}
+
+bool ATBTime::setHMS(int h, int m, int s, int ms) {
+    if (isValid(h, m, s, ms)) {
+        QTime t(h, m, s, ms);
+        m_time.setTime(t);
+        return true;
+    }
+    return false;
+}
+
+QString ATBTime::toString(Qt::DateFormat format) const {
+    if (m_time == m_end) {
+        return "24:00:00";
+    }
+    return m_time.time().toString(format);
+}
+
+bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() != rhs.m_time.time();
+}
+
+bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    if (rhs.m_time == rhs.m_end) {
+        return true;
+    }
+    return lhs.m_time.time() <= rhs.m_time.time();
+}
+
+bool operator>=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() >= rhs.m_time.time();
+}
+
+bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    if (rhs.m_time == rhs.m_end) {
+        return true;
+    }
+    return lhs.m_time.time() < rhs.m_time.time();
+}
+
+bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() > rhs.m_time.time();
+}
+
+bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() == rhs.m_time.time();
+}
+
+QDebug &operator<<(QDebug &debug, ATBTime const &time) {
+    QDebugStateSaver saver(debug);
+    if (time.m_time == time.m_end) {
+        debug.nospace() << QString("24:00:00");
+    } else {
+        debug.nospace() << time.m_time.time().toString(Qt::ISODate);
+    }
+    return debug;
+}
+
+QDataStream &operator<<(QDataStream &out, ATBTime const &time) {
+    if (time.m_time == time.m_end) {
+        out << QString("24:00:00");
+    } else {
+        out << time.m_time.time();
+    }
+    return out;
+}
+
+QDataStream &operator>>(QDataStream &in, ATBTime &time) {
+    QTime t;
+    in >> t;
+    time.m_time.setTime(t);
+    return in;
+}

library/src/calculate_price.cpp

@@ -26,6 +26,7 @@ QString const CalcState::BELOW_MIN_PARKING_PRICE = "BELOW_MIN_PARKING_PRICE";
 QString const CalcState::ABOVE_MAX_PARKING_PRICE = "ABOVE_MAX_PARKING_PRICE";
 QString const CalcState::OVERPAID = "OVERPAID";
 QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
+QString const CalcState::SUCCESS_MAXPRICE = "SUCCESS_MAXPRICE";
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
@@ -36,7 +37,10 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   int paymentOptionIndex) {
     int minTime = 0;
 
+    paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    if (paymentOptionIndex == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
 
     qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
     qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
@@ -69,7 +73,11 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
 
+    paymentOptionIndex = getPaymentOptionIndex(*cfg);
+    if (paymentOptionIndex == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
+
     int maxTime = 0;
 
     switch(permitType) {
@@ -94,7 +102,10 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    int paymentOptionIndex,
                                                    QDateTime const &start) {
     int minPrice = -1;
+
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg, start)) == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
 
     int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;
 
@@ -321,12 +332,18 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
     int maxPrice = -1;
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg)) == -1) {
         paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
-        if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
+        if (paymentMethodId == PaymentMethod::Progressive
-            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+         || paymentMethodId == PaymentMethod::Steps
+         || paymentMethodId == PaymentMethod::Unified) {
+            //maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            ATBPaymentOption const &po = cfg->getPaymentOptions(paymentOptionIndex);
+            maxPrice = po.pop_max_price; // maxTime is given in minutes
         } else { // PaymentMethod::Linear -> e.g. szeged
             int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
             int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
@@ -467,6 +484,15 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
     qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
+    if (UpDown == 1) {
+        if (Calculator::GetInstance().timeLimitReached()) {
+            qCritical() << __LINE__ << "compute_next_timestep() time limit reached";
+            Calculator::GetInstance().setTimeLimitReached(false);
+            Calculator::GetInstance().resetCostAtTimeLimit();
+            return currentTimeMinutes;
+        }
+    }
+
     // FIXME
     //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
     //if (!paymentOption.has_value()) {
@@ -474,7 +500,11 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     //    return currentTimeMinutes;
     //}
 
-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    }
+
     int const &pop_plus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_plus_steps;
     int const &pop_minus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_minus_steps;
 
@@ -499,6 +529,9 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     case PaymentMethod::Steps:
         qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Steps";
         break;
+    case PaymentMethod::Unified:
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Unified";
+        break;
     case PaymentMethod::Undefined:
         qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Undefined";
         break;
@@ -509,6 +542,8 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     if ((paymentMethodId == PaymentMethod::Steps) ||
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
         (paymentMethodId == PaymentMethod::Progressive) ||
+        // unified tariff: starting with Bad Neuenahr (249), Tariff for Zone5
+        (paymentMethodId == PaymentMethod::Unified) ||
         // degressive tariff: e.g. Fuchs Technik (500)
         (paymentMethodId == PaymentMethod::Degressive))
     {
@@ -539,7 +574,7 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
                 }
             }
             // max. tolerance set to 3 minutes
-            unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
+            // unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
             if (j != -1) {
                 stepList[j] = currentTimeMinutes;
             }
@@ -654,7 +689,21 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     CalcState calcState;
 
-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    QDateTime end(start);
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+    }
+
+    qCritical() << __func__ << ":" << __LINE__ << "pop_max_price" << tariff->getPaymentOptions(paymentOptionIndex).pop_max_price;
+
+    tariff->getPaymentOptions(paymentOptionIndex).pop_max_price
+        = tariff->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
 
     double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_time;
     double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_max_time;
@@ -682,11 +731,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::SUCCESS);
     }
 
-    QDate const d(1970, 1, 1);
+    //QDate const d(1970, 1, 1);
-    QTime const t(0, 0, 0);
+    //QTime const t(0, 0, 0);
-    QDateTime start(d, t, Qt::UTC);
+    //QDateTime start(d, t, Qt::UTC);
-    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    //start = start.toLocalTime().addSecs(start_parking_time * 60);
-    QDateTime end(start);
+    //QDateTime end(start);
     if (start.isValid()) {
         double cost = Calculator::GetInstance().GetCostFromDuration(
                     tariff,
@@ -721,7 +770,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     QDateTime start_parking_time(start_parking_time_);
 
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    }
+
+    tariff->getPaymentOptions(paymentOptionIndex).pop_max_price
+        = tariff->getPaymentOptions(paymentOptionIndex).pop_max_price_save;
 
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
@@ -776,42 +831,97 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
             int weekDay = start_parking_time.date().dayOfWeek();
             int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-            qCritical() << __func__ << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
+            int pop_prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 
             std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+            int period_id = -1;
             if (yperiod.has_value()) {
                 ATBPeriodYear const &period = yperiod.value();
+                period_id = period.pye_id;
                 pop_carry_over_option_id = period.pye_id;
-                qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                pop_prepaid_option_id = period.pye_id;
+                qCritical() << __func__ << ":" << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                qCritical() << __func__ << ":" << __LINE__ << "   re-computed prepaid-id" << pop_prepaid_option_id;
             }
 
-            QTime const carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+            QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+            int carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
 
-            qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
+            qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+
+            QDateTime effectiveStartTime(start_parking_time);
+
+            // handle special days
+            int const specialDayId = tariff->specialDayId(start_parking_time);
+            if (specialDayId > 0) { // found special day
+                for (auto[itr, rangeEnd] = tariff->SpecialDaysWorktime.equal_range(specialDayId); itr != rangeEnd; ++itr) {
+                    ATBSpecialDaysWorktime const &wt = itr->second;
+                    switch(period_id) {
+                    case 1: // summer term
+                        if ((wt.pedwt_paid & 1) == 0) {
+                            // does not have to be paid, move to next midnight
+
+                            // better: start of next day (falls kein vorkauf besteht)
+                            effectiveStartTime = effectiveStartTime.addDays(1);
+                            effectiveStartTime.setTime(QTime(0, 0, 0));
+                        }
+                        break;
+                    case 2: // winter term
+                        if ((wt.pedwt_paid & 2) == 0) {
+                            // does not have to be paid, move to next midnight
+
+                            // better: start of next day (falls kein vorkauf besteht)
+                            effectiveStartTime = effectiveStartTime.addDays(1);
+                            effectiveStartTime.setTime(QTime(0, 0, 0));
+                        }
+                        break;
+                    default:;
+                    }
+                }
+            }
 
             // handle prepaid option
-            QDateTime effectiveStartTime(start_parking_time);
             int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
             std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
             if (prepaidOption.has_value()) {
                 ATBPrepaid const &p = prepaidOption.value();
                 if (p.never) {
-                    qCritical() << __func__ << __LINE__ << "prepaid: no";
+                    qCritical() << __func__ << ":" << __LINE__ << "prepaid: no";
                 } else {
-                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                    qCritical() << __func__ << ":" << __LINE__ << "    prepaidStart" << p.prepaid[weekDay].static_start.toString(Qt::ISODate);
-                        effectiveStartTime.setTime(p.static_end);
+                    qCritical() << __func__ << ":" << __LINE__ << "      prepaidEnd" << p.prepaid[weekDay].static_end.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "prepaid duration" << p.prepaid[weekDay].duration;
+
+                    if (start_parking_time.time() < p.prepaid[weekDay].static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_end);
                     } else
-                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
+                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
-                        effectiveStartTime.setTime(p.static_start);
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_start);
                     }
                 }
             }
 
+            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
+                                             effectiveStartTime.time().minute(), 0));
+
+            qCritical() << __func__ << ":" << __LINE__ << "effectiveStartTime:" << effectiveStartTime.toString(Qt::ISODate);
+
+            int const carryOver = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+
+            qCritical() << __func__ << ":" << __LINE__ << "   carryOver flag" << carryOver;
+
+            if (carryOver == 1) {
+                QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                int carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+                qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+
                 // handle carry over
                 int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-            if (netto_parking_time > minutesUntilCarryOver) {
+                if ((minutesUntilCarryOver > 0) && (netto_parking_time > minutesUntilCarryOver)) {
                     int const rest = netto_parking_time - minutesUntilCarryOver;
                     QDateTime s(effectiveStartTime);
                     s = s.addSecs(minutesUntilCarryOver * 60);
@@ -821,6 +931,68 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                     end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
                 }
 
+                qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+
+                weekDay = end_parking_time.date().dayOfWeek();
+
+                // musste man in einer schleife machen
+                carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+                carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+                if (end_parking_time.time() > carryOverStart) {
+                    end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
+                } else
+                if (end_parking_time.time() == carryOverStart) {
+                    qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                    ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
+                    if (po.pop_apply_carry_over_to_ticket_endtime) {
+                        end_parking_time = end_parking_time.addSecs(carryOverDuration * 60);
+                        qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+                    }
+                }
+            } else {
+                qCritical() << __func__ << ":" << __LINE__ << "NO carryOver configured";
+                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
+            }
+
+            end_parking_time.setTime(QTime(end_parking_time.time().hour(),
+                                           end_parking_time.time().minute(), 0));
+
+            qCritical() << __func__ << ":" << __LINE__ << "end-parking-time:" << end_parking_time.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "        week-day:" << weekDay;
+
+            for (auto[itr, rangeEnd] = tariff->WeekDays.equal_range((Qt::DayOfWeek)weekDay); itr != rangeEnd; ++itr) {
+                ATBWeekDay const &wd = itr->second;
+                bool const parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(effectiveStartTime,
+                                                                                                            end_parking_time,
+                                                                                                            paymentOptionIndex);
+                if (parkTimeLimitViolated) {
+                    //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                    //end_parking_time.setTime(tlimit);
+
+                    // max_price neu berechnen
+
+                    calcState.setDesc(QString("line=%1 endTime=%2: park-time-limit violated").arg(__LINE__)
+                                        .arg(end_parking_time.time().toString(Qt::ISODate)));
+                    return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+                }
+            }
+        } else
+        if (tariff->getPaymentOptions(0).pop_payment_method_id == PaymentMethod::Unified) {
+            std::pair<CalcState, std::optional<int>> p =
+                Calculator::GetInstance().ComputeCostFromDuration(tariff, start_parking_time, end_parking_time, netto_parking_time);
+            CalcState const cs = p.first;
+
+            if ((cs.getStatus() == CalcState::State::SUCCESS ||
+                 cs.getStatus() == CalcState::State::SUCCESS_MAXPRICE ||
+                 cs.getStatus() == CalcState::State::OVERPAID)) {
+                if (p.second.has_value()) {
+                    cost = p.second.value();
+                }
+            } else {
+                return cs;
+            }
         } else {
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
@@ -830,7 +1002,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                         netto_parking_time,         // minutes, netto
                         false, prepaid);
         }
-        // qCritical() << __func__ << __LINE__;
+
         double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
@@ -864,6 +1036,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         double price,
         QString &duration,
         PermitType permitType) {
+
+    tariff->getPaymentOptions(0).pop_max_price
+        = tariff->getPaymentOptions(0).pop_max_price_save;
+
     CalcState calcState;
     QDate const d(1970, 1, 1);
     QTime const t(0, 0, 0);
@@ -873,7 +1049,12 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         QString cs = start.toString(Qt::ISODate);
 
         bool prepaid = true;
-        int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+        int paymentOptionIndex = getPaymentOptionIndex(*tariff, start);
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        if (paymentOptionIndex == -1) {
+            paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+        }
+
         int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
         if (prepaid_option_id == 2) { // see tariff03.json for 502: 2 means no prepaid-option
             prepaid = false;
@@ -887,10 +1068,14 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "           start (cs): " << cs;
         qCritical() << "                price: " << price;
 
-        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
+        std::pair<std::string, QDateTime> p_duration
+                = Calculator::GetInstance().GetDurationFromCost(tariff,
                     tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
                                               cs.toLocal8Bit().constData(),
-                                                  price, permitType, nextDay, prepaid).c_str();
+                                              price, permitType, nextDay, prepaid);
+        duration = p_duration.first.c_str();
+
+
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -910,11 +1095,23 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         QDateTime &ticketEndTime,
         PermitType permitType)
 {
+    tariff->getPaymentOptions(0).pop_max_price
+        = tariff->getPaymentOptions(0).pop_max_price_save;
+
     CalcState calcState;
 
     bool prepaid = true;
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+
+    int paymentOptionIndex = getPaymentOptionIndex(*tariff, start_parking_time);
+    qCritical() << __func__ << ":" << __LINE__ << "payment option index: " << paymentOptionIndex;
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    }
+
+    qCritical() << __func__ << ":" << __LINE__ << " payment option index: " << paymentOptionIndex;
+
     int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+
     if (prepaid_option_id == 2) {
         prepaid = false;
     }
@@ -929,16 +1126,57 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     }
 
     if (start_parking_time.isValid()) {
-        QString cs = start_parking_time.toString(Qt::ISODate);
+
-        QString endTime = Calculator::GetInstance().GetDurationFromCost(
+        int const pop_time_step_config = tariff->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
+        if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+            // handle prepaid option
+            QDateTime effectiveStartTime(start_parking_time);
+
+            effectiveStartTime.setTime(QTime(effectiveStartTime.time().hour(),
+                                             effectiveStartTime.time().minute(), 0));
+
+            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
+            if (prepaidOption.has_value()) {
+                ATBPrepaid const &p = prepaidOption.value();
+                if (p.never) {
+                    qCritical() << __func__ << __LINE__ << "prepaid: no";
+                } else {
+                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.static_end);
+                    } else
+                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.static_start);
+                    }
+                }
+            }
+        }
+        QDateTime start(start_parking_time);
+        start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
+        QString cs = start.toString(Qt::ISODate);
+
+        std::pair<std::string, QDateTime> p_endTime
+                = Calculator::GetInstance().GetDurationFromCost(
                     tariff,
                     tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
-                    price, permitType, nextDay, prepaid).c_str();
+                    price, permitType, nextDay, prepaid);
+
+        QString endTime = p_endTime.first.c_str();
+        ticketEndTime = p_endTime.second;
+
+        qCritical() << __func__ << ":" << __LINE__ << endTime;
+        qCritical() << __func__ << ":" << __LINE__ << ticketEndTime.toString(Qt::ISODate);
 
         if (endTime == CalcState::SUCCESS) {
             calcState.setDesc(QString("SUCCESS"));
             calcState.setStatus(endTime);
+            qCritical() << __func__ << ":" << __LINE__ << "SUCCESS";
+        } else
+        if (endTime == CalcState::SUCCESS_MAXPRICE) {
+            calcState.setDesc(QString("SUCCESS_MAXPRICE"));
+            calcState.setStatus(endTime);
+            qCritical() << __func__ << ":" << __LINE__ << "SUCCESS_MAXPRICE";
         } else
         if (endTime == CalcState::ERROR_PARSING_ZONE_NR) {
             calcState.setStatus(endTime);
@@ -996,33 +1234,200 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         } else {
             ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
+            ticketEndTime.setTime(QTime(ticketEndTime.time().hour(),
+                                        ticketEndTime.time().minute(), 0));
+
+            int netto_parking_time = start_parking_time.secsTo(ticketEndTime) / 60;
+
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "step-config:" << pop_time_step_config;
+            qCritical() << __func__ << ":" << __LINE__ << "netto-parking-time" << netto_parking_time;
+
             if (!ticketEndTime.isValid()) {
                 calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
                 return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
             }
 
+            if (tariff->getPaymentOptions().pop_payment_method_id != PaymentMethod::Unified) {
+
+                if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+                    // handle carry over for ticket-end-time
+                    qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+
+                    int weekDay = start_parking_time.date().dayOfWeek();
+                    int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                    qCritical() << __func__ << ":" << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
+
+                    std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+                    if (yperiod.has_value()) {
+                        ATBPeriodYear const &period = yperiod.value();
+                        pop_carry_over_option_id = period.pye_id;
+                        qCritical() << __func__ << ":" << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                    }
+
+                    QTime carryOverStart;
+                    QTime carryOverEnd;
+                    int carryOverDuration = -1;
+
+                    // using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+                    std::multimap<int, ATBCarryOver>::const_iterator it;
+                    if ((it = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)) !=
+                        tariff->TariffCarryOverOptions.cend()) {
+                        carryOverStart = it->second.carryover[weekDay].static_start;
+                        carryOverEnd = it->second.carryover[weekDay].static_end;
+                        carryOverDuration = it->second.carryover[weekDay].duration;
+                    }
+
+                    if (carryOverStart.isValid() && carryOverEnd.isValid()) {
+                        qCritical() << __func__ << ":" << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                        qCritical() << __func__ << ":" << __LINE__ << "carryOverEnd" << carryOverEnd.toString(Qt::ISODate);
+                        qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+                    }
+
+                    if (carryOverStart.isValid() && carryOverEnd.isValid() && carryOverDuration != -1) {
+
+                        // note: in such a case (direct coins) carry-over has been handled
+                        // already in GetDurationFromCost()
+                        netto_parking_time -= carryOverDuration;
+                        qCritical() << __func__ << ":" << __LINE__ << "netto-parking-time" << netto_parking_time;
+
+                        // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        if (ticketEndTime.time() > carryOverStart) {
+                            // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                        } else
+                        if (ticketEndTime.time() == carryOverStart) {
+                            qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                            ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
+                            if (po.pop_apply_carry_over_to_ticket_endtime) {
+                                ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                                qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            }
+                        } else {
+                            // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            if (ticketEndTime.time() < carryOverEnd) {
+                                // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                                ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                            }
+                        }
+                    } else {
+                        qCritical() << __func__ << ":" << __LINE__ << "WARNING: wrong carry-over-settings";
+                    }
+                }
+
+                qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+
+                for (auto[itr, rangeEnd] = tariff->WeekDays.equal_range((Qt::DayOfWeek)(ticketEndTime.date().dayOfWeek()));
+                     itr != rangeEnd;
+                     ++itr) {
+                    ATBWeekDay const &wd = itr->second;
+                    bool parkTimeLimitViolated = wd.getTariffCarryOverSettings().parkingTimeLimitExceeded(start_parking_time,
+                                                                                                          ticketEndTime,
+                                                                                                          paymentOptionIndex);
+                    if (parkTimeLimitViolated) {
+                        //QTime const &tlimit = wd.getTariffCarryOverSettings().parkingTimeLimit();
+                        //ticketEndTime.setTime(tlimit);
+
+                        QList<int> const &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+
+                        QDateTime newTicketEndTime = ticketEndTime;
+
+                        qCritical() << __func__ << ":" << __LINE__ << "PARK-TIME VIOLATED";
+
+                        for (int i = stepList.size() - 1; i > 0; --i) {
+                            // qCritical() << __func__ << ":" << __LINE__ << "step[" << i << "]" << stepList.at(i);
+
+                            if (netto_parking_time > 0 && stepList.at(i) <= netto_parking_time) {
+                                int const diff = stepList.at(i-1) - stepList.at(i);
+                                newTicketEndTime = newTicketEndTime.addSecs(diff * 60);
+
+                                // qCritical() << __func__ << ":" << __LINE__ << "new-ticket-end-time" << newTicketEndTime.toString(Qt::ISODate);
+
+                                parkTimeLimitViolated
+                                    = wd.getTariffCarryOverSettings()
+                                        .parkingTimeLimitExceeded(start_parking_time, newTicketEndTime, paymentOptionIndex);
+
+                                if (!parkTimeLimitViolated) {
+
+                                    qCritical() << __func__ << ":" << __LINE__
+                                                << "PARK-TIME NOT VIOLATED FOR" << newTicketEndTime.toString(Qt::ISODate);
+
+                                    int duration = stepList.at(i-1);
+
+                                    // qCritical() << __func__ << ":" << __LINE__ << "duration" << duration;
+
+                                    std::multimap<int, ATBDuration>::const_iterator it;
+                                    for (it = tariff->Duration.cbegin();
+                                         it != tariff->Duration.cend();
+                                         ++it) {
+                                        if (duration == it->second.pun_duration) {
+
+                                            // qCritical() << __func__ << ":" << __LINE__ << "duration" << duration;
+
+                                            ATBPaymentOption &po = tariff->getPaymentOptions(paymentOptionIndex);
+                                            int const pop_id = po.pop_id;
+                                            for (auto[itr, rangeEnd] = tariff->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                                int const durationId = itr->second.pra_payment_unit_id;
+
+                                                // qCritical() << __func__ << ":" << __LINE__ << "durationId" << durationId << it->second.pun_id;
+
+                                                // note: for this to work, Duration and PaymentRate must have
+                                                // exactly the same structure
+                                                if (durationId == it->second.pun_id) {
+                                                    int const pra_price = itr->second.pra_price;
+                                                    po.pop_max_price = pra_price;
+
+                                                    qCritical() << __func__ << ":" << __LINE__ << "new max-price" << po.pop_max_price;
+
+                                                    // note: ABOVE_MAX_PARKING_TIME would also be possible
+                                                    // but here max-parking-time is dynamic. And for
+                                                    // this dynamic value, opverpaid is actually correct
+
+                                                    calcState.setDesc(CalcState::OVERPAID);
+                                                    calcState.setStatus(CalcState::OVERPAID);
+                                                    return calcState;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        calcState.setDesc(QString("line=%1 endTime=%2: park-time-limit violated").arg(__LINE__)
+                                          .arg(ticketEndTime.time().toString(Qt::ISODate)));
+                        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+                    }
+                }
+            }
+
             if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
                 ticketEndTime = ticketEndTime.addDays(-1);
                 ticketEndTime.setTime(QTime(23, 59, 0));
             }
 
             // DEBUG
-            qCritical() << "compute_duration_for_parking_ticket(): ";
+            qCritical() << __func__ << ":" << __LINE__ << "      endTime:" << endTime;
-            qCritical() << "                 endTime: " << endTime;
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
-            qCritical() << "           ticketEndTime: " << ticketEndTime;
         }
     } else {
         return calcState.set(CalcState::State::INVALID_START_DATE);
     }
 
-    return calcState.set(CalcState::State::SUCCESS);
+    //return calcState.set(CalcState::State::SUCCESS);
+    qCritical() << __func__ << ":" << __LINE__ << "  calcState" << calcState.toString();
+    return calcState;
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,
                                                                   QDateTime const &start_parking_time,
                                                                   QDateTime &ticketEndTime,
-                                                                  PermitType PermitType)
+                                                                  PermitType /* PermitType */)
 {
+    tariff->getPaymentOptions(0).pop_max_price
+        = tariff->getPaymentOptions(0).pop_max_price_save;
+
     CalcState calcState;
     if (start_parking_time.isValid()) {
 
@@ -1054,8 +1459,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                     QDateTime &endDatetime,
                                     PERMIT_TYPE permitType,
                                     struct price_t *price) {// return value
-    CalcState calcState;
 
+    tariff->getPaymentOptions(0).pop_max_price
+        = tariff->getPaymentOptions(0).pop_max_price_save;
+
+    CalcState calcState;
 
     if (startDatetime.isValid()) {
         if (std::optional<struct price_t> p =

library/src/calculate_price.cpp.stashed

@@ -0,0 +1,762 @@
+#include "calculate_price.h"
+#include "configuration.h"
+#include "calculator_functions.h"
+#include "payment_option.h"
+#include "utilities.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QDateTime>
+#include <QDebug>
+#include <QList>
+
+QString const CalcState::SUCCESS = "SUCCESS";
+QString const CalcState::ERROR_PARSING_ZONE_NR = "ERROR_PARSING_ZONE_NR";
+QString const CalcState::ERROR_LOADING_TARIFF = "ERROR_LOADING_TARIFF";
+QString const CalcState::ERROR_PARSING_TARIFF = "ERROR_PARSING_TARIFF";
+QString const CalcState::NEGATIVE_PARKING_TIME = "NEGATIVE_PARKING_TIME";
+QString const CalcState::INVALID_START_DATE = "INVALID_START_DATE";
+QString const CalcState::WRONG_PARAM_VALUES = "WRONG_PARAM_VALUES";
+QString const CalcState::WRONG_ISO_TIME_FORMAT = "WRONG_ISO_TIME_FORMAT";
+QString const CalcState::ABOVE_MAX_PARKING_TIME = "ABOVE_MAX_PARKING_TIME";
+QString const CalcState::BELOW_MIN_PARKING_TIME = "BELOW_MIN_PARKING_TIME";
+QString const CalcState::BELOW_MIN_PARKING_PRICE = "BELOW_MIN_PARKING_PRICE";
+QString const CalcState::ABOVE_MAX_PARKING_PRICE = "ABOVE_MAX_PARKING_PRICE";
+QString const CalcState::OVERPAID = "OVERPAID";
+QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
+
+QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
+    return Calculator::GetInstance().GetTimeSteps(cfg);
+}
+
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
+                                                  PERMIT_TYPE permitType,
+                                                  int paymentOptionIndex) {
+    int minTime = 0;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        QList<int> const tsteps = Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        Q_UNUSED(tsteps);
+        minTime = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    default:
+        // for each new sell-procedure, recomute the timesteps. implicitly, set
+        // the minimal parking time.
+        Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
+        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
+    }
+
+    return minTime;
+}
+
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
+                                                  PERMIT_TYPE permitType,
+                                                  int paymentOptionIndex) {
+    int maxTime = 0;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    default: ;
+    }
+
+    return maxTime;
+
+}
+
+int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
+                                                   PERMIT_TYPE permitType,
+                                                   int paymentOptionIndex,
+                                                   QDateTime const &start) {
+    int minPrice = -1;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET: {
+        minPrice = compute_product_price(cfg, permitType, start);
+    } break;
+    default: ;
+    }
+
+    return minPrice;
+}
+
+int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
+                                                PERMIT_TYPE permitType,
+                                                QDateTime const &start,
+                                                QDateTime *productStart,
+                                                QDateTime *productEnd) {
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_TEEN:
+        // [[fallthrough]];
+    case PERMIT_TYPE::FOOD_STAMP:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            QVector<ATBTariffProduct> product = products.value();
+            if (product.size() > 0) {
+                ATBTariffProduct const &p = product[0];
+                return p.m_tariff_product_price;
+#if 0
+                // in case we do not have prepaid-option
+                QTime const &currentTime = QDateTime::currentDateTime().time();
+
+                if (p.m_tariff_product_start <= currentTime && currentTime <= p.m_tariff_product_end) {
+                    return p.m_tariff_product_price;
+                } else {
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "ERROR currentTime"
+                                << currentTime.toString(Qt::ISODate)
+                                << "INVALID ("
+                                << p.m_tariff_product_start.toString(Qt::ISODate)
+                                << p.m_tariff_product_end.toString(Qt::ISODate) << ")";
+                }
+#endif
+            }
+        }
+    } break;
+    case PERMIT_TYPE::INVALID:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            QVector<ATBTariffProduct> product = products.value();
+            int product_price = 0;
+
+            if (productStart && productEnd) {
+                *productStart = start;
+                *productEnd = start;
+                if (product.size() > 0) {
+                    productStart->setTime(product[0].getTimeStart());
+                    productEnd->setTime(product[0].getTimeEnd());
+                }
+            }
+
+            for (QVector<ATBTariffProduct>::size_type i=0; i<product.size(); ++i) {
+                ATBTariffProduct const &p = product[i];
+                QTime const &startTime = p.getTimeStart();
+                QTime const &endTime = p.getTimeEnd();
+
+                // qCritical() << __LINE__ << startTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << endTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << start.toString(Qt::ISODate);
+
+                if (start.time() >= startTime && start.time() < endTime) {
+                    product_price = p.getProductPrice();
+                    if (productStart && productEnd) {
+                        productStart->setTime(startTime);
+                        productEnd->setTime(endTime);
+                    }
+                }
+            }
+
+            return product_price;
+        } else {
+            // SZEGED
+            int const pop_daily_card_price = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qDebug() << QString("(%1:%2) no products defined in tariff-file").arg(__func__).arg(__LINE__);
+            qDebug() << QString("(%1:%2) pop_daily_card_price=%3").arg(__func__).arg(__LINE__).arg(pop_daily_card_price);
+
+            // static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+            // return Utilities::getDailyTicketCardPrice(cfg, paymentMethodId);
+
+            return pop_daily_card_price;
+        }
+    } break;
+    case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            int product_price = 0;
+            QVector<ATBTariffProduct> product = products.value();
+
+            if (product.size() > 0) {
+                if (productStart && productEnd) {
+                    int pop_min_time = get_minimal_parkingtime(cfg); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg); // in minutes
+                    if (pop_max_time >= pop_min_time) {
+                        *productStart = start;
+                        *productEnd = start.addSecs(pop_max_time*60);
+                        product_price = product[0].getProductPrice();
+                    }
+                }
+            }
+
+            return product_price;
+        }
+
+    } break;
+    default:
+      break;
+    }
+
+    return 0;
+}
+
+int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
+                                                   PERMIT_TYPE permitType,
+                                                   int paymentOptionIndex) {
+    int maxPrice = -1;
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
+            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+        } else { // PaymentMethod::Linear -> e.g. szeged
+            int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+            int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
+            std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
+            if (pv) {
+                QVector<ATBPaymentRate> const &paymentRate = pv.value();
+                if (paymentRate.size() > 0) {
+                    int const price = paymentRate.last().pra_price; // price is given per hour
+                    maxPrice = qRound((maxTime * price) / 60.0f);
+                }
+            }
+        }
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD:
+        break;
+    default: ;
+    }
+
+    return maxPrice;
+}
+
+int CALCULATE_LIBRARY_API get_zone_nr(int zone)
+{
+    if(zone > -1) return zone;
+    else
+    {
+        QFile zone("/etc/zone_nr");
+        if (zone.exists()) {
+            QFileInfo finfo(zone);
+            if (finfo.size() <= 4) { // decimal 000\n
+                if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                    QTextStream in(&zone);
+                    return in.readLine(100).toInt();
+                }
+            }
+        }
+        return -1;
+    }
+}
+
+CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
+    *tariff = new Configuration();
+
+    CalcState calcState;
+#if __linux__
+
+    int const zone = get_zone_nr();
+
+    // DEBUG
+    qCritical() << "init_tariff:";
+    qCritical() << "      ... zone = " << zone;
+
+    if (zone <= 0) {
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_PARSING_ZONE_NR);
+    }
+
+    QString confFile(config_file);
+    if (!confFile.endsWith(QChar('/'))) {
+        confFile += "/";
+    }
+
+    char buffer[32];
+    memset(buffer, 0x00, sizeof(buffer));
+    snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone);
+    confFile += buffer;
+#else // windows
+    QString confFile(config_file);
+#endif
+
+    // DEBUG
+    qCritical() << "      ... confFile = " << confFile;
+
+    QFile fname(confFile);
+    if (fname.exists() &&
+            fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        // DEBUG
+        qCritical() << "      ... confFile is open";
+
+        QString json = fname.readAll();
+        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
+            delete *tariff;
+            *tariff = nullptr;
+            return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
+        }
+    } else {
+        delete *tariff;
+        *tariff = nullptr;
+        return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
+    }
+
+    qCritical() << "init_tariff: Parsing tariff config (" << confFile << ")";
+
+    return calcState;
+}
+
+void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
+    if (tariff != nullptr) {
+        delete 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;
+    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+
+    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) ||
+        // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
+        (paymentMethodId == PaymentMethod::Progressive))
+    {
+        const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
+        qCritical() << "   compute_next_timestep()     timeSteps:" << stepList;
+
+        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(
+        parking_tariff_t *tariff,
+        time_t start_parking_time, // in minutes
+        time_t end_parking_time,   // netto time in minutes
+        struct price_t *price) {
+    CalcState calcState;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
+
+    if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
+        calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
+        return calcState.set(CalcState::State::WRONG_PARAM_VALUES);
+    }
+
+    int const duration = end_parking_time - start_parking_time;
+    if (duration < 0) {
+        calcState.setDesc(QString("end=%1, start=%2")
+                          .arg(end_parking_time, start_parking_time));
+        return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
+    }
+    if (duration > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration).arg(maxMin));
+        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+    }
+    if (duration < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration).arg(minMin));
+        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+    }
+    if (duration == 0) {
+        return calcState.set(CalcState::State::SUCCESS);
+    }
+
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    QDateTime end(start);
+    if (start.isValid()) {
+        double cost = Calculator::GetInstance().GetCostFromDuration(
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
+                    start,
+                    end,
+                    duration, false, true);
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
+        if (cost < minCost) {
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
+        }
+        price->units = cost;
+        price->netto = cost;
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+        parking_tariff_t *tariff,
+        QDateTime &start_parking_time,
+        int netto_parking_time,
+        QDateTime &end_parking_time,
+        struct price_t *price,
+        bool prepaid)
+{
+    CalcState calcState;
+
+    int paymentOptionIndex = tariff->getPaymentOptionIndex(start_parking_time);
+
+    double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
+    double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
+
+    // DEBUG
+    qCritical() << "compute_price_for_parking_ticket() " << endl
+                << "          paymentOptionIndex: " << paymentOptionIndex << endl
+                << "          start_parking_time: " << start_parking_time << endl
+                << "          netto_parking_time: " << netto_parking_time << endl
+                << "                      minMin: " << minMin << endl
+                << "                      maxMin: " << maxMin;
+
+
+    if (netto_parking_time < 0) {
+        calcState.setDesc(QString("end=%1, start=%2")
+                          .arg(end_parking_time.toString(Qt::ISODate),
+                               start_parking_time.toString(Qt::ISODate)));
+        return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
+    }
+    if (netto_parking_time > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
+        return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
+    }
+    if (netto_parking_time < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
+        return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
+    }
+    if (netto_parking_time == 0) {
+        return calcState.set(CalcState::State::SUCCESS);
+    }
+
+    double cost = -1;
+    if (start_parking_time.isValid()) {
+        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps) {
+            // hier muesste man unterscheiden: uebertrag oder nicht?
+            calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
+                                                                   netto_parking_time, paymentOptionIndex);
+            if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
+                // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                //             << calcState.toString();
+                return calcState;
+            }
+            cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
+            end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
+
+            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
+        } else {
+            cost = Calculator::GetInstance().GetCostFromDuration(
+                        tariff,
+                        tariff->getPaymentOptions().pop_payment_method_id,
+                        start_parking_time,         // starting time
+                        end_parking_time,           // return value: end time
+                        netto_parking_time,         // minutes, netto
+                        false, prepaid);
+        }
+        double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
+        if (cost < minCost) {
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
+            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
+        }
+
+        // DEBUG
+        qCritical() << "            end_parking_time: " << end_parking_time;
+        qCritical() << "  -> calculated cost (netto): " << cost;
+
+        price->brutto = price->vat = price->vat_percentage = 0;
+        price->units = cost;
+        price->netto = cost;
+
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+        parking_tariff_t *tariff,
+        time_t start_parking_time,
+        double price,
+        QString &duration) {
+    CalcState calcState;
+    QDate const d(1970, 1, 1);
+    QTime const t(0, 0, 0);
+    QDateTime start(d, t, Qt::UTC);
+    start = start.toLocalTime().addSecs(start_parking_time * 60);
+    if (start.isValid()) {
+        QString cs = start.toString(Qt::ISODate);
+
+        // DEBUG
+        qCritical() << "compute_duration_for_parking_ticket(): ";
+        qCritical() << "      start (cs): " << cs;
+        qCritical() << "           price: " << price;
+
+        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
+                                                  cs.toLocal8Bit().constData(),
+                                                  price, false, true).c_str();
+        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
+        if (!d.isValid()) {
+            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
+            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+        }
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+        parking_tariff_t *tariff,
+        QDateTime const &start_parking_time,
+        double price,
+        QDateTime &ticketEndTime)
+{
+    CalcState calcState;
+    if (start_parking_time.isValid()) {
+        QString cs = start_parking_time.toString(Qt::ISODate);
+        QString endTime = Calculator::GetInstance().GetDurationFromCost(
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
+                    cs.toLocal8Bit().constData(),
+                    price, false, true).c_str();
+
+        if (endTime == CalcState::SUCCESS) {
+            calcState.setDesc(QString("SUCCESS"));
+            calcState.setStatus(endTime);
+        } else
+        if (endTime == CalcState::ERROR_PARSING_ZONE_NR) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ERROR_LOADING_TARIFF) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ERROR_PARSING_TARIFF) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::NEGATIVE_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::INVALID_START_DATE) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::WRONG_PARAM_VALUES) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::WRONG_ISO_TIME_FORMAT) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ABOVE_MAX_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::BELOW_MIN_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::BELOW_MIN_PARKING_PRICE) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else
+        if (endTime == CalcState::ABOVE_MAX_PARKING_PRICE) {
+            calcState.setDesc(CalcState::ABOVE_MAX_PARKING_PRICE);
+            calcState.setStatus(CalcState::ABOVE_MAX_PARKING_PRICE);
+            return calcState;
+        } else
+        if (endTime == CalcState::OVERPAID) {
+            calcState.setDesc(CalcState::OVERPAID);
+            calcState.setStatus(CalcState::OVERPAID);
+            return calcState;
+        } else
+        if (endTime == CalcState::OUTSIDE_ALLOWED_PARKING_TIME) {
+            calcState.setStatus(endTime);
+            return calcState;
+        } else {
+            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
+
+            // DEBUG
+            //qCritical() << "compute_duration_for_parking_ticket(): ";
+            //qCritical() << "                 endTime: " << endTime;
+            //qCritical() << "           ticketEndTime: " << ticketEndTime;
+
+            if (!ticketEndTime.isValid()) {
+                calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
+                return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+            }
+        }
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
+{
+    CalcState calcState;
+    if (start_parking_time.isValid()) {
+
+        ticketEndTime = Calculator::GetInstance().GetDailyTicketDuration(tariff,
+                                                            start_parking_time,
+                                                            tariff->getPaymentOptions().pop_payment_method_id,
+                                                            false);    // carry over
+
+        // DEBUG
+        qCritical() << "compute_duration_for_daily_ticket(): ";
+        qCritical() << "           ticketEndTime: " << ticketEndTime;
+
+        if (!ticketEndTime.isValid()) {
+            calcState.setDesc(QString("ticketEndTime=%1").arg(ticketEndTime.toString(Qt::ISODate)));
+            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+        }
+
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
+                                    parking_tariff_t *tariff,
+                                    QDateTime const &startDatetime,
+                                    QDateTime &endDatetime,
+                                    PERMIT_TYPE permitType,
+                                    struct price_t *price) {// return value
+    CalcState calcState;
+
+
+    if (startDatetime.isValid()) {
+        if (std::optional<struct price_t> p =
+            Calculator::GetInstance().GetDailyTicketPrice(tariff,
+                                                          startDatetime,
+                                                          endDatetime,
+                                                          permitType)) {
+           *price = p.value();
+        }
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+    return calcState.set(CalcState::State::SUCCESS);
+}
+

library/src/configuration.cpp

@@ -8,6 +8,11 @@
 #include "tariff_global_defines.h"
 #include "tariff_carryover.h"
 #include "tariff_global_defines.h"
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"
+#include "atb_time.h"
+#include "tariff_prepaid.h"
+#include "tariff_carryover.h"
 
 #include <QString>
 #include <QDebug>
@@ -21,7 +26,13 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
     if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
     if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
-    //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Monday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Tuesday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Wednesday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Thursday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Friday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Saturday") == 0) return MemberType::WeekDaysType;
+    if (strcmp(member_name, "Sunday") == 0) return MemberType::WeekDaysType;
     if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
     if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
     if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
@@ -38,6 +49,697 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     else return MemberType::UnknownType;
 }
 
+ATBWeekDay parseWeekDay(Configuration &cfg,
+                        rapidjson::GenericMemberIterator<false,
+                                                         rapidjson::UTF8<char>,
+                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
+                        QString const &innerObjName,
+                        Qt::DayOfWeek weekDay,
+                        QString const &weekDayName) {
+    int max_price = 0;
+    int min_price = 0;
+    int min_time = 0;
+    int max_time = 0;
+    int duration = 0;
+    ATBWeekDay WeekDay;
+    QTime start, end, parking_time_limit, about_to_exceed_limit;
+    ATBTariffCarryOverSettings::ParkingTimeLimitChecker parkTimeLimitChecker;
+    QDate const &d = QDate::fromString(innerObjName, Qt::ISODate);
+    if (innerObjName == QString("default") ||
+       (!d.isNull() && d.isValid())) { // special day, given in date-format
+        // start with new implementation of tariff-calculator
+        // see for instance: bad neuenahr (249), Zone5
+
+        // qCritical() << __func__ << ":" << __LINE__ << innerObjName;
+
+        if (k->value.IsObject()) {
+            auto obj = k->value.GetObject();
+            for (auto m = obj.MemberBegin(); m != obj.MemberEnd(); ++m) {
+                QString const &name = m->name.GetString();
+                if (name == "payment_settings") {
+                    if (m->value.IsArray()) {
+                        auto payment = m->value.GetArray();
+                        if (payment.Size() == 0) {
+                            qCritical() << __func__ << ":" << __LINE__ << "no payment settings for" << weekDayName;
+                        } else {
+                            for (rapidjson::SizeType j = 0; j < payment.Size(); ++j) {
+                                if (payment[j].IsObject()) {
+                                    auto paymentSetting = payment[j].GetObject();
+                                    for (auto n = paymentSetting.MemberBegin(); n != paymentSetting.MemberEnd(); ++n) {
+                                        QString const &name = QString::fromStdString(n->name.GetString());
+                                        if (name == "min_time") {
+                                            if (n->value.IsInt()) { min_time = n->value.GetInt(); }
+                                        } else if (name == "max_time") {
+                                            if (n->value.IsInt()) { max_time = n->value.GetInt(); }
+                                        } else if (name == "min_price") {
+                                            if (n->value.IsInt()) { min_price = n->value.GetInt(); }
+                                        } else if (name == "max_price") {
+                                            if (n->value.IsInt()) { max_price = n->value.GetInt(); }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                } else
+                if (name == "prepaid_settings") {
+                    if (m->value.IsArray()) {
+                        auto prepaid = m->value.GetArray();
+                        if (prepaid.Size() == 0) {
+                            qCritical() << __func__ << ":" << __LINE__ << "no prepaid-settings for" << weekDayName;
+                        } else {
+                            ATBTariffPrepaid TariffPrepaid;
+                            for (rapidjson::SizeType j = 0; j < prepaid.Size(); ++j) {
+                                if (prepaid[j].IsObject()) {
+                                    auto prepaidSetting = prepaid[j].GetObject();
+                                    for (auto n = prepaidSetting.MemberBegin(); n != prepaidSetting.MemberEnd(); ++n) {
+                                        QString const &name = QString::fromStdString(n->name.GetString());
+                                        if (name == "prepaid_ranges") {
+                                            if (n->value.IsArray()) {
+                                                auto prepaidRanges = n->value.GetArray();
+                                                if (prepaidRanges.Size() == 0) {
+                                                    qCritical() << __func__ << ":" << __LINE__ << "no prepaid-ranges for" << weekDayName;
+                                                } else {
+                                                    QString prepaidStartStr;
+                                                    QString prepaidEndStr;
+                                                    QString prepaidIf;
+                                                    int prepaidDuration = -1;
+                                                    for (rapidjson::SizeType i = 0; i < prepaidRanges.Size(); ++i) {
+                                                        if (prepaidRanges[j].IsObject()) {
+                                                            auto prepaidRange = prepaidRanges[i].GetObject();
+                                                            for (auto r = prepaidRange.MemberBegin(); r != prepaidRange.MemberEnd(); ++r) {
+                                                                QString const &memName = QString::fromStdString(r->name.GetString());
+                                                                if (memName == "prepaid_id") {
+                                                                    if (r->value.IsInt()) {
+                                                                        TariffPrepaid.m_id = r->value.GetInt();
+                                                                    } else {
+                                                                        qCritical() << __func__ << ":" << __LINE__ << "prepaidId not an integer";
+                                                                    }
+                                                                } else
+                                                                if (memName == "prepaid_duration") {
+                                                                    if (r->value.IsInt()) {
+                                                                        prepaidDuration = r->value.GetInt();
+                                                                    }
+                                                                } else
+                                                                if (memName == "prepaid_start") {
+                                                                    if (r->value.IsString()) {
+                                                                        prepaidStartStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "prepaid_end") {
+                                                                    if (r->value.IsString()) {
+                                                                        prepaidEndStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "prepaid_if") {
+                                                                    if (r->value.IsString()) {
+                                                                        prepaidIf = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else {
+                                                                    qCritical() << __func__ << ":" << __LINE__ << "WARNING unknown prepaid setting" << memName;
+                                                                }
+                                                            }
+                                                        }
+
+                                                        if (!prepaidStartStr.isEmpty() && !prepaidEndStr.isEmpty() && prepaidDuration != -1) {
+                                                            ATBTime prepaidStart(prepaidStartStr);
+                                                            ATBTime prepaidEnd(prepaidEndStr);
+                                                            if (prepaidStart.isValid() && prepaidEnd.isValid()) {
+                                                                TariffPrepaid.m_range = TimeRange(prepaidStart, prepaidEnd, prepaidDuration);
+                                                                TariffPrepaid.m_weekDay = weekDayName;
+                                                                if (!d.isNull() && d.isValid()) {
+                                                                    TariffPrepaid.m_date = d;
+                                                                }
+                                                                TariffPrepaid.setPrepaidIf(prepaidIf);
+
+                                                                qCritical() << TariffPrepaid;
+
+                                                                cfg.TariffPrepaids.insert(std::pair<int, ATBTariffPrepaid>(weekDay, TariffPrepaid));
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else {
+
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else
+                if (name == "carry_over_settings") {
+                    if (m->value.IsArray()) {
+                        auto carryOver = m->value.GetArray();
+                        if (carryOver.Size() == 0) {
+                            qCritical() << __func__ << ":" << __LINE__ << "no carry-over-settings for" << weekDayName;
+                        } else {
+                            ATBTariffCarryOver TariffCarryOver;
+                            for (rapidjson::SizeType j = 0; j < carryOver.Size(); ++j) {
+                                if (carryOver[j].IsObject()) {
+                                    auto carryOverSetting = carryOver[j].GetObject();
+                                    for (auto n = carryOverSetting.MemberBegin(); n != carryOverSetting.MemberEnd(); ++n) {
+                                        QString const &name = QString::fromStdString(n->name.GetString());
+                                        if (name == "carry_over_ranges") {
+                                            if (n->value.IsArray()) {
+                                                auto carryOverRanges = n->value.GetArray();
+                                                if (carryOverRanges.Size() == 0) {
+                                                    qCritical() << __func__ << ":" << __LINE__ << "no carry-over-ranges for" << weekDayName;
+                                                } else {
+                                                    QString carryOverStartStr;
+                                                    QString carryOverEndStr;
+                                                    QString carryOverIf;
+                                                    int carryOverDuration = -1;
+                                                    for (rapidjson::SizeType i = 0; i < carryOverRanges.Size(); ++i) {
+                                                        if (carryOverRanges[j].IsObject()) {
+                                                            auto carryOverRange = carryOverRanges[i].GetObject();
+                                                            for (auto r = carryOverRange.MemberBegin(); r != carryOverRange.MemberEnd(); ++r) {
+                                                                QString const &memName = QString::fromStdString(r->name.GetString());
+                                                                if (memName == "carry_over_id") {
+                                                                    if (r->value.IsInt()) {
+                                                                        TariffCarryOver.m_id = r->value.GetInt();
+                                                                    } else {
+                                                                        qCritical() << __func__ << ":" << __LINE__ << "carryOverId not an integer";
+                                                                    }
+                                                                } else
+                                                                if (memName == "carry_over_duration") {
+                                                                    if (r->value.IsInt()) {
+                                                                        carryOverDuration = r->value.GetInt();
+                                                                    }
+                                                                } else
+                                                                if (memName == "carry_over_start") {
+                                                                    if (r->value.IsString()) {
+                                                                        carryOverStartStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "carry_over_end") {
+                                                                    if (r->value.IsString()) {
+                                                                        carryOverEndStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "carry_over_if") {
+                                                                    if (r->value.IsString()) {
+                                                                        carryOverIf = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else {
+                                                                    qCritical() << __func__ << ":" << __LINE__ << "WARNING unknown carry-over setting" << memName;
+                                                                }
+                                                            }
+                                                        }
+
+                                                        if (!carryOverStartStr.isEmpty() && !carryOverEndStr.isEmpty() && carryOverDuration != -1) {
+                                                            ATBTime carryOverStart(carryOverStartStr);
+                                                            ATBTime carryOverEnd(carryOverEndStr);
+                                                            if (carryOverStart.isValid() && carryOverEnd.isValid()) {
+                                                                TariffCarryOver.m_range = TimeRange(carryOverStart, carryOverEnd, carryOverDuration);
+                                                                TariffCarryOver.m_weekDay = weekDayName;
+                                                                if (!d.isNull() && d.isValid()) {
+                                                                    TariffCarryOver.m_date = d;
+                                                                }
+                                                                if (!carryOverIf.isEmpty()) {
+                                                                    TariffCarryOver.setCarryOverIf(carryOverIf);
+                                                                }
+
+                                                                // qCritical() << TariffCarryOver;
+
+                                                                cfg.TariffCarryOvers.insert(std::pair<int, ATBTariffCarryOver>(weekDay, TariffCarryOver));
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else {
+
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else
+                if (name == "service_settings") {
+                    ATBTariffService TariffService;
+                    if (m->value.IsArray()) {
+                        auto service = m->value.GetArray();
+                        if (service.Size() == 0) {
+                            qCritical() << __func__ << ":" << __LINE__ << "no service settings for" << weekDayName;
+                        } else {
+                            for (rapidjson::SizeType j = 0; j < service.Size(); ++j) {
+                                if (service[j].IsObject()) {
+                                    auto serviceSetting = service[j].GetObject();
+                                    for (auto n = serviceSetting.MemberBegin(); n != serviceSetting.MemberEnd(); ++n) {
+                                        QString const &name = QString::fromStdString(n->name.GetString());
+                                        if (name == "service_ranges") {
+                                            if (n->value.IsArray()) {
+                                                auto serviceRanges = n->value.GetArray();
+                                                if (serviceRanges.Size() == 0) {
+                                                    qCritical() << __func__ << ":" << __LINE__ << "no service ranges for" << weekDayName;
+                                                } else {
+                                                    QString serviceStartStr;
+                                                    QString serviceEndStr;
+                                                    QString serviceIf;
+                                                    int serviceDuration = -1;
+                                                    for (rapidjson::SizeType i = 0; i < serviceRanges.Size(); ++i) {
+                                                        if (serviceRanges[j].IsObject()) {
+                                                            auto serviceRange = serviceRanges[i].GetObject();
+                                                            for (auto r = serviceRange.MemberBegin(); r != serviceRange.MemberEnd(); ++r) {
+                                                                QString const &memName = QString::fromStdString(r->name.GetString());
+                                                                if (memName == "service_id") {
+                                                                    if (r->value.IsInt()) {
+                                                                        TariffService.m_id = r->value.GetInt();
+                                                                    } else {
+                                                                        qCritical() << __func__ << ":" << __LINE__ << "serviceId not an integer";
+                                                                    }
+                                                                } else
+                                                                if (memName == "service_duration") {
+                                                                    if (r->value.IsInt()) {
+                                                                        serviceDuration = r->value.GetInt();
+                                                                    }
+                                                                } else
+                                                                if (memName == "service_start") {
+                                                                    if (r->value.IsString()) {
+                                                                        serviceStartStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "service_end") {
+                                                                    if (r->value.IsString()) {
+                                                                        serviceEndStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "service_if") {
+                                                                    if (r->value.IsString()) {
+                                                                        serviceIf = QString::fromStdString(r->value.GetString());
+                                                                    }
+
+                                                                } else {
+                                                                    qCritical() << __func__ << ":" << __LINE__ << "WARNING unknown service setting" << memName;
+                                                                }
+                                                            }
+                                                        }
+
+                                                        if (!serviceStartStr.isEmpty() && !serviceEndStr.isEmpty() && serviceDuration != -1) {
+                                                            ATBTime serviceStart(serviceStartStr);
+                                                            ATBTime serviceEnd(serviceEndStr);
+                                                            if (serviceStart.isValid() && serviceEnd.isValid()) {
+                                                                TariffService.m_range = TimeRange(serviceStart, serviceEnd, serviceDuration);
+                                                                TariffService.m_weekDay = weekDayName;
+                                                                if (!d.isNull() && d.isValid()) {
+                                                                    TariffService.m_date = d;
+                                                                }
+                                                                if (!serviceIf.isEmpty()) {
+                                                                    TariffService.setServiceIf(serviceIf);
+                                                                }
+
+                                                                // qCritical() << TariffService;
+
+                                                                cfg.TariffServices.insert(std::pair<int, ATBTariffService>(weekDay, TariffService));
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else {
+
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else
+                if (name == "out_of_service_settings") {
+                    ATBTariffOutOfService TariffOutOfService;
+                    if (m->value.IsArray()) {
+                        auto outOfService = m->value.GetArray();
+                        if (outOfService.Size() == 0) {
+                            qCritical() << __func__ << ":" << __LINE__ << "no out of service settings for" << weekDayName;
+                        } else {
+                            for (rapidjson::SizeType j = 0; j < outOfService.Size(); ++j) {
+                                if (outOfService[j].IsObject()) {
+                                    auto outOfServiceSetting = outOfService[j].GetObject();
+                                    for (auto n = outOfServiceSetting.MemberBegin(); n != outOfServiceSetting.MemberEnd(); ++n) {
+                                        QString const &name = QString::fromStdString(n->name.GetString());
+                                        if (name == "out_of_service_ranges") {
+                                            if (n->value.IsArray()) {
+                                                auto outOfServiceRanges = n->value.GetArray();
+                                                if (outOfServiceRanges.Size() == 0) {
+                                                    qCritical() << __func__ << ":" << __LINE__ << "no out of service ranges for" << weekDayName;
+                                                } else {
+                                                    QString outOfServiceStartStr;
+                                                    QString outOfServiceEndStr;
+                                                    QString outOfServiceIf;
+                                                    int outOfServiceDuration = -1;
+                                                    for (rapidjson::SizeType i = 0; i < outOfServiceRanges.Size(); ++i) {
+                                                        if (outOfServiceRanges[j].IsObject()) {
+                                                            auto outOfServiceRange = outOfServiceRanges[i].GetObject();
+                                                            for (auto r = outOfServiceRange.MemberBegin(); r != outOfServiceRange.MemberEnd(); ++r) {
+                                                                QString const &memName = QString::fromStdString(r->name.GetString());
+                                                                if (memName == "out_of_service_id") {
+                                                                    if (r->value.IsInt()) {
+                                                                        TariffOutOfService.m_id = r->value.GetInt();
+                                                                    } else {
+                                                                        qCritical() << __func__ << ":" << __LINE__ << "outOfServiceId not an integer";
+                                                                    }
+                                                                } else
+                                                                if (memName == "out_of_service_duration") {
+                                                                    if (r->value.IsInt()) {
+                                                                        outOfServiceDuration = r->value.GetInt();
+                                                                    }
+                                                                } else
+                                                                if (memName == "out_of_service_start") {
+                                                                    if (r->value.IsString()) {
+                                                                        outOfServiceStartStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "out_of_service_end") {
+                                                                    if (r->value.IsString()) {
+                                                                        outOfServiceEndStr = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else
+                                                                if (memName == "out_of_service_if") {
+                                                                    if (r->value.IsString()) {
+                                                                        outOfServiceIf = QString::fromStdString(r->value.GetString());
+                                                                    }
+                                                                } else {
+                                                                    qCritical() << __func__ << ":" << __LINE__ << "WARNING unknown out of service setting" << memName;
+                                                                }
+                                                            }
+                                                        }
+
+                                                        if (!outOfServiceStartStr.isEmpty() && !outOfServiceEndStr.isEmpty() && outOfServiceDuration != -1) {
+                                                            ATBTime outOfServiceStart(outOfServiceStartStr);
+                                                            ATBTime outOfServiceEnd(outOfServiceEndStr);
+                                                            if (outOfServiceStart.isValid() && outOfServiceEnd.isValid()) {
+                                                                TariffOutOfService.m_range = TimeRange(outOfServiceStart, outOfServiceEnd, outOfServiceDuration);
+                                                                TariffOutOfService.m_weekDay = weekDayName;
+                                                                if (!d.isNull() && d.isValid()) {
+                                                                    TariffOutOfService.m_date = d;
+                                                                }
+                                                                if (!outOfServiceIf.isEmpty()) {
+                                                                    TariffOutOfService.setOutOfServiceIf(outOfServiceIf);
+                                                                }
+
+                                                                // qCritical() << TariffOutOfService;
+
+                                                                cfg.TariffOutOfServices.insert(std::pair<int, ATBTariffOutOfService>(weekDay, TariffOutOfService));
+                                                            }
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        } else {
+
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } else {
+
+                }
+            }
+        }
+    } else
+    if (innerObjName == QString("week_day_default")) {
+        if (k->value.IsObject()) {
+            auto obj = k->value.GetObject();
+            for (auto m = obj.MemberBegin(); m != obj.MemberEnd(); ++m) {
+                QString const &name = m->name.GetString();
+                if (name == "week_day_type") {
+                    //
+                } else
+                if (name == "tariff_settings") {
+                    if (m->value.IsObject()) {
+                        auto obj = m->value.GetObject();
+                        for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                            QString const &name = QString::fromStdString(n->name.GetString());
+                            if (name == "min_time") {
+                                if (n->value.IsInt()) { min_time = n->value.GetInt(); }
+                            } else if (name == "max_time") {
+                                if (n->value.IsInt()) { max_time = n->value.GetInt(); }
+                            } else if (name == "min_price") {
+                                if (n->value.IsInt()) { min_price = n->value.GetInt(); }
+                            } else if (name == "max_price") {
+                                if (n->value.IsInt()) { max_price = n->value.GetInt(); }
+                            }
+                        }
+                    }
+                } else
+                if (name == "carry_over_settings") {
+                    if (m->value.IsObject()) {
+                        auto obj = m->value.GetObject();
+                        for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                            QString const &name = QString::fromStdString(n->name.GetString());
+                            if (name == "duration") {
+                                if (n->value.IsInt()) {
+                                    duration = n->value.GetInt();
+                                }
+                            } else
+                            if (name == "start") {
+                                if (n->value.IsString()) {
+                                    start = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                }
+                            } else
+                            if (name == "end") {
+                                if (n->value.IsString()) {
+                                    end = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                }
+                            } else
+                            if (name == "parking_time_limit") {
+                                if (n->value.IsObject()) {
+                                    auto o = n->value.GetObject();
+                                    for (auto l = o.MemberBegin(); l != o.MemberEnd(); ++l) {
+                                        if (l->name.IsString()) {
+                                            QString const &member = QString::fromStdString(l->name.GetString());
+                                            if (member == "prev_day_sunday?") {
+                                                if (l->value.IsArray()) {
+                                                    auto limits = l->value.GetArray();
+                                                    if (limits.Size() >= 2) {
+                                                        about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                        parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg, weekDay, weekDayName](ATBTariffCarryOverSettings const& cs,
+                                                                                                        QDateTime const &startTime,
+                                                                                                        QDateTime const &endTime,
+                                                                                                        int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2 end-time=%3], but time-limit=%4")
+                                                                                        .arg(weekDayName)
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            } else
+                                            if (member == "prev_day_holiday?") {
+                                                if (l->value.IsArray()) {
+                                                    auto limits = l->value.GetArray();
+                                                    if (limits.Size() >= 2) {
+                                                        about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                        parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg, weekDayName](ATBTariffCarryOverSettings const& cs,
+                                                                                               QDateTime const &startTime,
+                                                                                               QDateTime const &endTime,
+                                                                                               int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (previousDayHoliday(cfg, endTime)) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: [%1, %2, end-time=%3], but time-limit=%4")
+                                                                                        .arg(weekDayName)
+                                                                                        .arg(endTime.date().toString(Qt::ISODate))
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            ATBTariffSettings ts(max_price, min_price, max_time, min_time);
+            ATBTariffCarryOverSettings cs(duration, start, end, parking_time_limit, about_to_exceed_limit,
+                                          parkTimeLimitChecker);
+            WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::USUAL_WEEKDAY, QDate(), ts, cs);
+
+        } // if (k->value.IsObject()) {
+    } else {
+        QDate date(QDate::fromString(innerObjName, Qt::ISODate));
+        if (date.isValid()) {
+            if (k->value.IsObject()) {
+                auto obj = k->value.GetObject();
+                for (auto m = obj.MemberBegin(); m != obj.MemberEnd(); ++m) {
+                    QString const &name = m->name.GetString();
+                    if (name == "week_day_type") {
+                        // TODO
+                    } else
+                    if (name == "tariff_settings") {
+                        if (m->value.IsObject()) {
+                            auto obj = m->value.GetObject();
+                            for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                                QString const &name = QString::fromStdString(n->name.GetString());
+                                if (name == "min_time") {
+                                    if (n->value.IsInt()) { min_time = n->value.GetInt(); }
+                                } else if (name == "max_time") {
+                                    if (n->value.IsInt()) { max_time = n->value.GetInt(); }
+                                } else if (name == "min_price") {
+                                    if (n->value.IsInt()) { min_price = n->value.GetInt(); }
+                                } else if (name == "max_price") {
+                                    if (n->value.IsInt()) { max_price = n->value.GetInt(); }
+                                }
+                            }
+                        }
+                    } else
+                    if (name == "carry_over_settings") {
+                        if (m->value.IsObject()) {
+                            auto obj = m->value.GetObject();
+                            for (auto n = obj.MemberBegin(); n != obj.MemberEnd(); ++n) {
+                                QString const &name = QString::fromStdString(n->name.GetString());
+                                if (name == "duration") {
+                                    if (n->value.IsInt()) {
+                                        duration = n->value.GetInt();
+                                    }
+                                } else
+                                if (name == "start") {
+                                    if (n->value.IsString()) {
+                                        start = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                    }
+                                } else
+                                if (name == "end") {
+                                    if (n->value.IsString()) {
+                                        end = QTime::fromString(QString::fromStdString(n->value.GetString()), Qt::ISODate);
+                                    }
+                                } else
+                                if (name == "parking_time_limit") {
+                                    if (n->value.IsObject()) {
+                                        auto o = n->value.GetObject();
+                                        for (auto l = o.MemberBegin(); l != o.MemberEnd(); ++l) {
+                                            if (l->name.IsString()) {
+                                                QString const &member = QString::fromStdString(l->name.GetString());
+                                                if (member == "default") {
+                                                    if (l->value.IsArray()) {
+                                                        auto limits = l->value.GetArray();
+                                                        if (limits.Size() >= 2) {
+                                                            about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                            parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                        }
+                                                    }
+
+                                                    parkTimeLimitChecker = [&cfg, weekDay](ATBTariffCarryOverSettings const& cs,
+                                                                                           QDateTime const &startTime,
+                                                                                           QDateTime const &endTime,
+                                                                                           int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (endTime.date().dayOfWeek() == (int)weekDay) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                } else
+                                                if (member == "prev_day_holiday?") {
+                                                    if (l->value.IsArray()) {
+                                                        auto limits = l->value.GetArray();
+                                                        if (limits.Size() >= 2) {
+                                                            about_to_exceed_limit = QTime::fromString(QString::fromStdString(limits[0].GetString()), Qt::ISODate);
+                                                            parking_time_limit = QTime::fromString(QString::fromStdString(limits[1].GetString()), Qt::ISODate);
+                                                        }
+                                                    }
+                                                    parkTimeLimitChecker = [&cfg](ATBTariffCarryOverSettings const& cs,
+                                                                                  QDateTime const &startTime,
+                                                                                  QDateTime const &endTime,
+                                                                                  int paymentOptionIndex) {
+                                                        if (startTime.date() < endTime.date()) { // start end end on different days
+                                                            if (previousDayHoliday(cfg, endTime)) {
+                                                                if (endTime.time() > cs.m_parking_time_limit) {
+                                                                    qCritical() << __func__ << ":" << __LINE__
+                                                                                << QString("ERROR time limit for end-time violated: end-time=%1, but time-limit=%2")
+                                                                                        .arg(endTime.time().toString(Qt::ISODate))
+                                                                                        .arg(cs.m_parking_time_limit.toString(Qt::ISODate));
+                                                                    return true;
+                                                                }
+                                                                if (endTime.time() >= cs.m_about_to_exceed_parking_time_limit) {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps = 1;
+                                                                } else {
+                                                                    cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps =
+                                                                        cfg.getPaymentOptions(paymentOptionIndex).pop_plus_steps_saved;
+                                                                }
+                                                            }
+                                                        }
+                                                        return false;
+                                                    };
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                ATBTariffSettings ts(max_price, min_price, max_time, min_time);
+                ATBTariffCarryOverSettings cs(duration, start, end, parking_time_limit,
+                                              about_to_exceed_limit, parkTimeLimitChecker);
+                WeekDay = ATBWeekDay(weekDay, weekDayName, ATBWeekDay::HOLIDAY, date, ts, cs);
+
+            } else {// if (k->value.IsObject()) {
+                qCritical() << __func__ << ":" << __LINE__ << "ERROR: no object";
+            }
+
+        } else {
+            qCritical() << __func__ << __LINE__
+                        << "ERROR: invalid date for" << weekDayName << "," << innerObjName;
+        }
+    }
+
+    return WeekDay;
+}
+
 /// <inheritdoc/>
 bool Configuration::ParseJson(Configuration* cfg, const char* json)
 {
@@ -96,7 +798,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
             ATBPaymentRate PaymentRate;
             ATBSpecialDaysWorktime SpecialDaysWorktime;
             ATBSpecialDays SpecialDays;
-            ATBWeekDays  WeekDays;
+            //ATBWeekDay WeekDay;
             ATBWeekDaysWorktime  WeekDaysWorktime;
             ATBPeriodYear YearPeriod;
             ATBDailyTicket DailyTicket;
@@ -171,6 +873,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     {
                     case MemberType::UnknownType:
                         break;
+                    case MemberType::WeekDaysType: {
+                        ATBWeekDay WeekDay;
+                        if (QString(mb_name) == "Monday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Monday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Tuesday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Tuesday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Wednesday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Wednesday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Thursday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Thursday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Friday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Friday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Saturday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Saturday, mb_name);
+                        } else
+                        if (QString(mb_name) == "Sunday") {
+                            WeekDay = parseWeekDay(*cfg, k, inner_obj_name, Qt::Sunday, mb_name);
+                        } else {
+                            qCritical() << "ERROR: unknown week day" << mb_name;
+                        }
+
+                        cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay));
+                        // qCritical() << WeekDay;
+
+                    } break;
                     case MemberType::CarryOverType: {
                         if (QString(inner_obj_name) == QString("carry_over_id")) {
                             if (k->value.IsInt()) {
@@ -261,6 +993,49 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                                 QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
                                 TariffPrepaidOption.static_end = t;
                             }
+                        } else
+                        if (QString(inner_obj_name) == QString("prepaid_week")) {
+                            if (k->value.IsArray()) {
+                                auto days = k->value.GetArray();
+                                for (rapidjson::SizeType j=0; j < days.Size(); ++j) {
+                                    if (days[j].IsObject()) {
+                                        auto weekday = days[j].GetObject();
+                                        for (auto w = weekday.MemberBegin(); w != weekday.MemberEnd(); ++w) {
+                                            int day = j+1; // 8 entries
+
+                                            TariffPrepaidOption.prepaid[day].day = 0;
+
+                                            QString member(QString::fromStdString(w->name.GetString()));
+                                            if (member == "prepaid_day") {
+                                                if (w->value.IsInt()) {
+                                                    rapidjson::SizeType const d = w->value.GetInt();
+                                                    if (d != (j+1)) {
+                                                        qCritical() << "ERROR: misconfigured jsonfile" << d << "!=" << (j+1);
+                                                    }
+                                                    TariffPrepaidOption.prepaid[day].day = day;
+                                                }
+                                            } else
+                                            if (member == "prepaid_duration") {
+                                                if (w->value.IsInt()) {
+                                                    TariffPrepaidOption.prepaid[day].duration = w->value.GetInt();
+                                                }
+                                            } else
+                                            if (member == "prepaid_static_start") {
+                                                if (w->value.IsString()) {
+                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
+                                                    TariffPrepaidOption.prepaid[day].static_start = t;
+                                                }
+                                            } else
+                                            if (member == "prepaid_static_end") {
+                                                if (w->value.IsString()) {
+                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
+                                                    TariffPrepaidOption.prepaid[day].static_end = t;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
                         }
                     } break;
                     case MemberType::InterpolationType: {
@@ -601,11 +1376,20 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         } else if (strcmp(inner_obj_name, "pop_plus_steps") == 0) {
                             if (k->value.IsInt()) {
                                 this->currentPaymentOptions.last().pop_plus_steps = k->value.GetInt();
+                                this->currentPaymentOptions.last().pop_plus_steps_saved = k->value.GetInt();
                             }
                         } else if (strcmp(inner_obj_name, "pop_minus_steps") == 0) {
                             if (k->value.IsInt()) {
                                 this->currentPaymentOptions.last().pop_minus_steps = k->value.GetInt();
                             }
+                        } else if (strcmp(inner_obj_name, "pop_allow_overpay") == 0) {
+                            if (k->value.IsBool()) {
+                                this->currentPaymentOptions.last().pop_allow_overpay = k->value.GetBool();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_apply_carry_over_to_ticket_endtime") == 0) {
+                            if (k->value.IsBool()) {
+                                this->currentPaymentOptions.last().pop_apply_carry_over_to_ticket_endtime = k->value.GetBool();
+                            }
                         } else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
                             this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
@@ -618,6 +1402,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_min_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_max_price") == 0) {
                             this->currentPaymentOptions.last().pop_max_price = k->value.GetDouble();
+                            this->currentPaymentOptions.last().pop_max_price_save = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_max_time") == 0) {
                             this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
@@ -728,6 +1513,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pedwt_paid") == 0) SpecialDaysWorktime.pedwt_paid = k->value.GetInt();
                         break;
                 /*case MemberType::WeekDaysType:
                         if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
@@ -770,6 +1556,11 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                 switch (mb_type) {
                 case MemberType::UnknownType:
                     break;
+                case MemberType::WeekDaysType:
+                    // qCritical() << "INSERT" << (int)WeekDay.m_id << WeekDay.m_date.toString(Qt::ISODate);
+                    // cfg->WeekDays.insert(pair<Qt::DayOfWeek, ATBWeekDay>(WeekDay.m_id, WeekDay));
+                    // qCritical() << WeekDay;
+                    break;
                 case MemberType::PaymentMethodType:
                     cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
                     break;
@@ -1090,7 +1881,6 @@ bool Configuration::isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime
 
     if (isSpecialDay(dt)) {
         bool const &r = ((businessHours & BusinessHours::OFFICIAL_HOLIDAY) == BusinessHours::OFFICIAL_HOLIDAY);
-        qCritical() << "XXXXXXXXXXXXXXXXXX r" << r << businessHours;
         return r;
     }
 
@@ -1180,7 +1970,6 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
     std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
     if (paymentOptions) {
 
-
         QVector<ATBPaymentOption> const vec = paymentOptions.value();
         PermitType const p(permitType);
 
@@ -1194,6 +1983,73 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
     return 0;
 }
 
+int getPaymentOptionIndex(Configuration const &cfg, QDateTime const &dt) {
+
+    int const numOptions = cfg.getAllPaymentOptions().size();
+
+    // qCritical() << __func__ << ":" << __LINE__ << "numOptions" << numOptions;
+
+    for (int opt=0; opt < numOptions; ++opt) {
+        uint64_t const pop_business_hours = cfg.getPaymentOptions(opt).pop_business_hours;
+
+        if (pop_business_hours == 0) { // 0 == 24/7
+            return opt;
+        }
+
+        // QDateTime const dt = QDateTime::currentDateTime();
+        int const dayOfWeek = dt.date().dayOfWeek();
+
+        // qCritical() << __func__ << ":" << __LINE__ << "dayOfWeek" << dayOfWeek;
+
+        if (isHoliday(cfg, dt)) {
+            if (pop_business_hours & BusinessHours::OFFICIAL_HOLIDAY) {
+                return opt;
+            }
+        } else {
+            switch (dayOfWeek) {
+            case (int)Qt::Monday: {
+                if (pop_business_hours & BusinessHours::MON) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Tuesday: {
+                if (pop_business_hours & BusinessHours::TUE) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Wednesday: {
+                if (pop_business_hours & BusinessHours::WED) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Thursday: {
+                if (pop_business_hours & BusinessHours::THU) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Friday: {
+                if (pop_business_hours & BusinessHours::FRI) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Saturday: {
+                if (pop_business_hours & BusinessHours::SAT) {
+                    return opt;
+                }
+            } break;
+            case (int)Qt::Sunday: {
+                if (pop_business_hours & BusinessHours::SUN) {
+        qCritical() << __func__ << ":" << __LINE__ << "opt" << opt;
+                    return opt;
+                }
+            } break;
+            }
+        }
+    }
+
+    return -1;
+}
+
 std::optional<QVector<ATBTariffProduct>>
 Configuration::getTariffProductForProductId(PermitType permitType) const {
     QString permitTypeName(permitType);
@@ -1448,3 +2304,43 @@ Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
 
     return value;
 }
+
+bool isHoliday(Configuration const &cfg, QDateTime const &t) {
+    int const weekDay = t.date().dayOfWeek();
+
+    for (auto[iter, rEnd] = cfg.WeekDays.equal_range(static_cast<Qt::DayOfWeek>(weekDay));
+         iter != rEnd;
+         ++iter) {
+
+        if (iter->second.m_type == ATBWeekDay::WeekDayType::HOLIDAY) {
+            QDate const &d = iter->second.m_date;
+            if (!d.isNull() && d.isValid()) {
+                if (t.date() == d) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool previousDayHoliday(Configuration const &cfg, QDateTime const &t) {
+    int const weekDay = t.date().dayOfWeek();
+    int const previousWeekDay = (weekDay == static_cast<int>(Qt::Monday)) ?
+                static_cast<int>(Qt::Sunday) : (weekDay - 1);
+
+    for (auto[iter, rEnd] = cfg.WeekDays.equal_range(static_cast<Qt::DayOfWeek>(previousWeekDay));
+         iter != rEnd;
+         ++iter) {
+
+        if (iter->second.m_type == ATBWeekDay::WeekDayType::HOLIDAY) {
+            QDate const &d = iter->second.m_date;
+            if (!d.isNull() && d.isValid()) {
+                if (t.addDays(-1).date() == d) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}

library/src/tariff_comp_step.cpp

@@ -0,0 +1,17 @@
+#include "tariff_comp_step.h"
+
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QString>
+
+uint64_t TariffCompStep::hash() {
+    QString const str(QString("%1%2%3").arg(m_duration).arg(m_start.toString(Qt::ISODate)).arg(m_end.toString(Qt::ISODate)));
+    QByteArray const hash = QCryptographicHash::hash(
+      QByteArray::fromRawData(reinterpret_cast<char const*>(str.utf16()), str.length()*2),
+      QCryptographicHash::Md5
+    );
+
+    uint64_t const &i = hash.left(8).toULongLong(nullptr, 16);
+    uint64_t const &j = hash.right(8).toULongLong(nullptr, 16);
+    return i ^ j;
+}

library/src/utilities.cpp

@@ -207,7 +207,13 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
                               dt.date().day());
                 QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
                 QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
+                //qCritical() << __func__ << __LINE__ << "    d" << d.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "start" << s.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "  end" << e.toString(Qt::ISODate);
+                if (s <= e) {
                     return (d >= s && d <= e);
+                }
+                return (d >= s || d <= e);
             })) {
         qCritical() << "NO VALID YEAR PERIOD";
         return false;
@@ -421,6 +427,8 @@ PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
             return PaymentMethod::Degressive;
         case PaymentMethod::Progressive:
             return PaymentMethod::Progressive;
+        case PaymentMethod::Unified:
+            return PaymentMethod::Unified;
         }
     }
 

main/main.cpp

@@ -42,7 +42,7 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
-#define NEUHAUSER_BILEXA_GALTUER                (0)
+#define NEUHAUSER_BILEXA_GALTUER                (1)
 #define BAD_NEUENAHR_AHRWEILER                  (0)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
@@ -51,7 +51,9 @@ extern "C" char* strptime(const char* s,
 #define SEXTEN                                  (0)
 #define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
-#define VALSER_ALM                              (1)
+#define VALSER_ALM                              (0)
+#define NEUHAUSER_FORCHACH                      (0)
+#define STADT_WEIDEN                            (0)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -220,10 +222,17 @@ int main() {
     //  490         "pra_price":"840"
     //>>491     }
 
-    //for (int i = 1; i < 85; ++i) {
+    // {
-    //printf("{\n    \"\pra_payment_option_id\": 1049,\n    \"\pra_payment_unit_id\": %d,\n    \"pra_price\": %d\n},\n",
+    //      "pun_duration": 0,
-    //       i, i*10);
+    //      "pun_id": 0,
+    //      "pun_label": "0 min"
     // }
+
+    //for (int i = 0; i <= 140; ++i) {
+    //printf("{\n    \"\pun_duration\": %d,\n    \"\pun_id\": %d,\n    \"pun_label\": \"%d min\"\n},\n",
+    //       i*6, i, i*6);
+    //}
+
     //return 0;
 #if 0
     MessageHelper msgHelp;
@@ -339,20 +348,20 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
+        //pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
+        //pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
+        //pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
+        //pop_max_price = get_maximal_parkingprice(&cfg);
-        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
-        qCritical() << "        pop_min_time: " << pop_min_time;
+        //qCritical() << "        pop_min_time: " << pop_min_time;
-        qCritical() << "        pop_max_time: " << pop_max_time;
+        //qCritical() << "        pop_max_time: " << pop_max_time;
-        qCritical() << "       pop_min_price: " << pop_min_price;
+        //qCritical() << "       pop_min_price: " << pop_min_price;
-        qCritical() << "       pop_max_price: " << pop_max_price;
+        //qCritical() << "       pop_max_price: " << pop_max_price;
 
 
-        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-        qCritical() << "TimeSteps" << timeSteps;
+        //qCritical() << "TimeSteps" << timeSteps;
 
         // return 0;
 
@@ -363,8 +372,7 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 7, 29 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime s(QDate(2024, 8, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
-            QDateTime end;
 
             switch (day) {
             case (int)Qt::Monday:
@@ -390,6 +398,30 @@ int main() {
                 break;
             }
 
+            QDateTime start(s);
+            start.setTime(QTime(21, 30, 0));
+
+            QDateTime end;
+            int netto_parking_time = 14 * 60;
+            struct price_t costs;
+            PermitType pt(PERMIT_TYPE::SHORT_TERM_PARKING);
+
+            double cost = 150;
+
+            //cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time,
+            //                                      end, &costs, pt);
+
+
+
+            //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << costs.netto
+            //            << "> end" << end.toString(Qt::ISODate);
+
+            cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
+            //}
+
+            exit(0);
 
             /*
             CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
@@ -732,7 +764,7 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    int zone = 3;
+    int zone = 1;
 
     if (zone == 1) {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
@@ -821,7 +853,7 @@ int main() {
             CalcState calcState;
             QDateTime s(QDateTime::currentDateTime());
 
-            s.setTime(QTime(12, 0, 0));
+            // s.setTime(QTime(12, 0, 0));
 
             //calcState = compute_duration_for_parking_ticket(&cfg, s,
             //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
@@ -829,9 +861,26 @@ int main() {
             //qCritical() << calcState.toString();
 
             calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+                                                (double)9000, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
             qCritical() << end.toString(Qt::ISODate);
             qCritical() << calcState.toString();
+
+            struct price_t costs;
+
+            CalcState cs;
+
+            for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+                qCritical() << "XXXXX end" << end.toString(Qt::ISODate);
+
+                cs = compute_price_for_parking_ticket(&cfg, s, timeSteps.at(i), end, &costs,
+                                                      PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                if (cs.getStatus() != CalcState::State::SUCCESS) {
+                    qCritical() << "ERROR STATUS" << costs.netto;
+                    exit(-1);
+                }
+            }
         }
 
         if (zone == 2) {
@@ -1346,6 +1395,29 @@ int main() {
             }
         }
 
+#endif
+#if NEUHAUSER_FORCHACH==1
+    std::ifstream input;
+    input.open("/opt/ptu5/opt/customer_749/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) {
+        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_PKW));
+        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_CAMPER));
+
+        QDateTime start = QDateTime::currentDateTime();
+        QDateTime ticketEndTime;
+        compute_duration_for_daily_ticket(&cfg, start, ticketEndTime, PermitType(PERMIT_TYPE::DAY_TICKET));
+    }
+
 #endif
 #if BAD_NEUENAHR_AHRWEILER==1
     std::ifstream input;
@@ -1357,7 +1429,7 @@ int main() {
     int pop_carry_over;
     int pop_carry_over_time_range_id;
 
-    for (int zone=1; zone < 2; ++zone) {
+    for (int zone=2; zone < 3; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
@@ -1366,8 +1438,10 @@ int main() {
             //pop_max_time = 6*60;
         } break;
         case 2: {
+            qCritical() << "        ZONE 2: KURZZEIT 1";
             // kuzzeit-1-tarif
-            input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
+            //input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
+            input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json");
             //pop_max_time = 5*60;
         } break;
         case 3: {
@@ -1408,6 +1482,7 @@ int main() {
         cout << endl;
 
         if (isParsed) {
+
             // test library functions
 
             if (zone == 1) {
@@ -1434,10 +1509,10 @@ int main() {
                 static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
                 qCritical() << "TimeSteps" << timeSteps;
 
-                if (stepsConfigured != timeSteps) {
+                //if (stepsConfigured != timeSteps) {
-                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                //    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
-                    return -1;
+                //    return -1;
-                }
+                //}
 
                 QDateTime start = QDateTime::currentDateTime();
 
@@ -1445,7 +1520,8 @@ int main() {
                 double price1 = 0;
                 double price2 = 0;
 
-                for (int m=0; m < 1440; ++m) {
+                //for (int m=0; m < 1440; ++m) {
+                for (int m=480; m < 481; ++m) {
                     start.setTime(QTime(0, 0, 0));
                     start = start.addSecs(m*60);
 
@@ -1462,7 +1538,7 @@ int main() {
                     //}
 
                     CalcState cs;
-
+#if 1
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
@@ -1497,6 +1573,21 @@ int main() {
                         //                                                                     cost[i], false, true);
                         //qCritical() << "duration" << duration.c_str();
                     }
+#else
+
+                    double cost = 80;
+                    qCritical() << "START" << start.toString(Qt::ISODate) << "cost" << cost;
+                    QDateTime end;
+
+                    cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        qCritical() << __LINE__ << cs.toString()
+                                    << "START" << start.toString(Qt::ISODate)
+                                    << "<duration" << start.secsTo(end) / 60
+                                    << "cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
+                    //}
+#endif
                 }
             } // zone == 1
             if (zone == 2) {
@@ -1534,18 +1625,20 @@ int main() {
                 bool fail;
                 QDateTime start;
 
-                for (int i=0; i < 4; ++i) {
+                for (int i=1; i < 2; ++i) {
                     switch (i) {
                     case 0:
                         start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0)); // holiday
                         fail = false;
                     break;
                     case 1:
-                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        //start = QDateTime(QDate(2024, 10, 3), QTime(17, 0, 0)); // sunday
+                        //start = QDateTime(QDate(2025, 4, 20), QTime(18, 0, 0)); // sunday
+                        start = QDateTime(QDate(2024, 9, 27), QTime(17, 0, 0)); // friday
                         fail = false;
                     break;
                     case 2:
-                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0)); // monday
+                        start = QDateTime(QDate(2024, 4, 22), QTime(17, 30, 0)); // monday
                         fail = false;
                     break;
                     case 3:
@@ -1569,18 +1662,52 @@ int main() {
 
                         QList<int>::const_iterator step;
                         for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+                            //qCritical() << __LINE__
+                            //            << "START" << start.toString(Qt::ISODate)
+                            //            << "<duration" << *step;
+
+                            if (*step != 180)
+                                continue;
+
 
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                            QDateTime s(start);
+
+                            qCritical() << __LINE__
+                                        << "START" << start.toString(Qt::ISODate)
+                                        << "<duration" << *step;
+
+#if 1
+                            if ((cs = compute_price_for_parking_ticket(&cfg, s, *step, end, &price,
+                                                                       PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
-                                qCritical() << "step" << *step << ": cost" << cost;
+                                qCritical() << __LINE__
+                                            << "START" << start.toString(Qt::ISODate)
+                                            << "<duration" << *step
+                                            << "cost" << cost
+                                            << "> end" << end.toString(Qt::ISODate);
                             } else {
                                 if (fail == false) {
                                     qCritical() << "<<<ERROR>>> cs =" << QString(cs);
                                 }
                             }
+#else
+                            cost = 200;
+                            qCritical() << "START" << start.toString(Qt::ISODate) << "cost" << cost;
+
+                            cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                                         PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                                qCritical() << __LINE__ << cs.toString()
+                                            << "START" << start.toString(Qt::ISODate)
+                                            << "<duration" << start.secsTo(end) / 60
+                                            << "cost" << cost
+                                            << "> end" << end.toString(Qt::ISODate);
+                            break;
+                            //}
+#endif
+
                         }
                     } else {
                         qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
@@ -2554,7 +2681,7 @@ int main() {
         int Up = 1;
         //compute_next_timestep(&cfg, )
 
-        QDateTime const start = QDateTime::currentDateTime();
+        QDateTime const start = QDateTime::fromString("2024-10-13T12:00:00");
         int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
 
         if (paymentOptionIndex < 0) {
@@ -2566,7 +2693,7 @@ int main() {
         QSet<uint32_t> const prices{700, 1400, 2100, 2800, 3500, 4200, 4900};
 
         for (int i=0; i<timeSteps.size(); ++i) {
-            int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
+            int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
             qCritical() << "nextTimeStep" << nextTimeStep;
 
             uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i), paymentOptionIndex);
@@ -2666,6 +2793,66 @@ int main() {
     }
 #endif
 
+#if STADT_WEIDEN==1
+    std::ifstream input("/opt/ptu5/opt/customer_6/etc/psa_tariff/tariff01.json");
+    int pop_max_time;
+
+    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) {
+        qCritical() << __func__ << ":" << __LINE__ << "parsed";
+
+        QDateTime s(QDate(2024, 10, 14), QTime());
+        QDateTime end;
+
+        static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        qCritical() << "TimeSteps" << timeSteps;
+
+        int offset = 1150;
+        QDateTime start = s.addSecs(offset * 60);
+
+
+        CalcState cs;
+#if 0
+        struct price_t costs;
+        for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+            QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+            // if (i != 2) continue;
+
+            cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            int price1 = costs.netto;
+
+            qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
+                        << timeSteps.at(i) << "ZZZZZZZZZZZZZ PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
+        }
+        exit(0);
+    }
+#else
+        double cost = 220;
+        qCritical() << "XXXXXXXX START" << start.toString(Qt::ISODate) << "cost" << cost;
+
+        cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            qCritical() << __LINE__ << cs.toString()
+                        << "START" << start.toString(Qt::ISODate)
+                        << "<duration" << start.secsTo(end) / 60
+                        << "cost" << cost
+                        << "> end" << end.toString(Qt::ISODate);
+        //}
+
+        exit(0);
+    }
+#endif
+#endif // STADT WEIDEN
+
 #if NEUHAUSER_KORNEUBURG==1
     std::ifstream input("/opt/ptu5/opt/customer_714/etc/psa_tariff/tariff01.json");
     int pop_max_time;
@@ -2685,24 +2872,62 @@ int main() {
             bool nextDay = false;
             bool prePaid = true;
             // zone 1 (lila)
-            QDateTime s(QDate(2023, 11, 30), QTime());
+            QDateTime s(QDate(2024, 10, 8), QTime());
             QDateTime end;
+
+            static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << "TimeSteps" << timeSteps;
+
             for (int duration = 30; duration <= pop_max_time; duration += 5) {
-                for (int offset = 420; offset < 1140; ++offset) {
+                int offset = 600;
-                    if (offset > 720 && offset < 840) {
+                //for (int offset = 720; offset < 601; ++offset) {
-                        continue;
+                    //if (offset > 720 && offset < 840) {
-                    }
+                    //    continue;
+                    //}
                     QDateTime start = s.addSecs(offset * 60);
                     //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                    double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
+                    CalcState cs;
+#if 1
+                    struct price_t costs;
+                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                        QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+                        // if (i != 2) continue;
+
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        int price1 = costs.netto;
+
+                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
+                                    << timeSteps.at(i) << "ZZZZZZZZZZZZZ PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
+                    }
+                    exit(0);
+#else
+
+                    double cost = 360;
+                    qCritical() << "XXXXXXXX START" << start.toString(Qt::ISODate) << "cost" << cost;
+                    QDateTime end;
+
+                    cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        qCritical() << __LINE__ << cs.toString()
+                                    << "START" << start.toString(Qt::ISODate)
+                                    << "<duration" << start.secsTo(end) / 60
+                                    << "cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
+                    //}
+
+                    exit(0);
+#endif
+
+                    //double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "";
-                    qCritical() << "start" << start.toString(Qt::ISODate)
+                    //qCritical() << "start" << start.toString(Qt::ISODate)
-                                << "end" << end.toString(Qt::ISODate)
+                    //            << "end" << end.toString(Qt::ISODate)
-                                << "duration" << duration
+                    //            << "duration" << duration
-                                << "cost" << cost;
+                    //            << "cost" << cost;
-
+#if 0
                     switch(duration) {
                     case 30:
                         if (cost == 60.0) {
@@ -2866,15 +3091,17 @@ int main() {
                                     << "cost" << cost;
                         exit(-1);
                     }
+#endif
 
                     //std::string duration = Calculator::GetInstance().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;
-                }
+                //}
             }
 
+#if 0
             Configuration::SpecialDaysType specialDays = cfg.SpecialDays;
             for (Configuration::SpecialDaysType::const_iterator it = specialDays.cbegin();
                  it != specialDays.cend(); ++it) {
@@ -2895,7 +3122,7 @@ int main() {
                             << "duration" << duration
                             << "cost" << cost;
             }
-
+#endif
         }
     }
     return 0;

main/main.pro

@@ -30,9 +30,16 @@ SOURCES += main.cpp
 # HEADERS +=
 
 OTHER_FILES += \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff01.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff02.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff04.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff06.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff07.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff08.json