If out-of-service, use start of out-of-service action as output-date.

Include opverpaid option in price-computation.

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 = "",
-                       QTime const &from = QTime(),
-                       QTime const &until = QTime())
+    explicit CalcState(State state, QString desc,
+                       QTime const &from,
+                       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,13 +47,19 @@ 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) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
             m_timeSteps[paymentOptionIndex].clear();
         }
     }
     QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
             return m_timeSteps[paymentOptionIndex];
         }
         return QList<int>();
@@ -70,8 +84,9 @@ 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,
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
+    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>
 	///  Gets cost from duration in seconds
@@ -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);
@@ -133,10 +151,10 @@ private:
                               int durationMinutes);
 
     //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
-    }
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
+    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+    //    return GetPriceForTimeStep(cfg, step, 0);
+    //}
     uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
     uint32_t GetStepForPrice(Configuration *cfg, int price) const {
         return GetDurationForPrice(cfg, price);

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
 {
@@ -48,17 +51,22 @@ public:
     using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
     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;
     ATBDuration duration;
 
-	multimap<int, ATBDuration> Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	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;
@@ -71,6 +79,10 @@ public:
 	TariffInterpolationType TariffInterpolations;
 	TariffPrepaidType TariffPrepaidOptions;
 	TariffCarryOverType TariffCarryOverOptions;
+    TariffServiceType TariffServices;
+    TariffOutOfServiceType TariffOutOfServices;
+    ATBTariffPrepaidType TariffPrepaids;
+    ATBTariffCarryOverType TariffCarryOvers;
 
 	/// <summary>
 	/// Parse JSON string
@@ -125,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;
@@ -38,8 +39,13 @@ public:
         pop_daily_card_price = -1;
         pop_business_hours = -1;
         pop_time_step_config = -1;
-        pop_use_only_upto_datetime = "";
-        pop_use_only_for_duration = 0;
+        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;
@@ -56,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;
@@ -69,6 +76,11 @@ public:
     int pop_time_step_config;
     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

@@ -8,5 +8,9 @@ public:
 	int pedwt_period_exc_day_id;
 	std::string pedwt_time_from;
 	std::string pedwt_time_to;
-	double pedwt_price;
-};
+    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,80 @@
 
 #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));
+    }
+
+    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 +89,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 +118,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 +145,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_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,39 @@
-#ifndef TIME_RANGE_H_INCLUDED
-#define TIME_RANGE_H_INCLUDED
-
-#include "time_range_header.h"
-
-struct TimeRange {
-public:
-	bool IsActive;
-	ATBTimeRange TimeRangeStructure;
-};
-
-#endif // TIME_RANGE_H_INCLUDED
+#ifndef TIME_RANGE_H_INCLUDED
+#define TIME_RANGE_H_INCLUDED
+
+#include "atb_time.h"
+
+#include <QString>
+
+struct TimeRange {
+    ATBTime m_start;
+    ATBTime m_end;
+    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;
+    }
+};
+
+#endif // TIME_RANGE_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -3,6 +3,7 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
+#include <optional>
 
 #include "day_of_week.h"
 #include "configuration.h"
@@ -62,6 +63,7 @@ namespace Utilities {
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
     bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
+    std::optional<ATBPeriodYear> GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
 
 	/// <summary>
 	/// Check permissions

library/include/mobilisis/weekdays.h

@@ -1,10 +1,57 @@
-#pragma once
-#include <string>
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"
 
-class ATBWeekDays
-{
-public:
-	int pdiw_id;
-	std::string pdiw_label;
-	int pdiw_index;
-};
+#include <QString>
+#include <Qt>
+#include <QDate>
+
+struct ATBWeekDay {
+    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,8 @@ 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
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -89,7 +90,10 @@ 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
 
 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/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);
-                return (d >= s && d <= e);
+                //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;
@@ -215,6 +221,43 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
     return true;
 }
 
+std::optional<ATBPeriodYear>
+Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
+
+    ATBPeriodYear period;
+    std::optional<ATBPeriodYear> value;
+
+    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
+         it != cfg->YearPeriod.cend();
+         ++it) {
+        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
+        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
+
+        QDateTime start(currentDateTime);
+        QDateTime end(currentDateTime);
+
+        start.setDate(s);
+        end.setDate(e);
+
+        if (start.date().dayOfYear() < end.date().dayOfYear()) {
+            // start and end in the same year
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        } else {
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        }
+    }
+
+    return value;
+}
+
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
@@ -384,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

@@ -43,13 +43,13 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define BAD_NEUENAHR_AHRWEILER                  (0)
+#define BAD_NEUENAHR_AHRWEILER                  (1)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
 #define NEUHAUSER_STOCKERAU                     (0)
 #define KLEIPEDA_LITAUEN                        (0)
 #define SEXTEN                                  (0)
-#define SCHNALS_LEITER_KIRCHL                   (1)
+#define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
 #define VALSER_ALM                              (0)
 
@@ -339,22 +339,22 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
-        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+        //pop_min_time = get_minimal_parkingtime(&cfg);
+        //pop_max_time = get_maximal_parkingtime(&cfg);
+        //pop_min_price = get_minimal_parkingprice(&cfg);
+        //pop_max_price = get_maximal_parkingprice(&cfg);
+        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
-        qCritical() << "        pop_min_time: " << pop_min_time;
-        qCritical() << "        pop_max_time: " << pop_max_time;
-        qCritical() << "       pop_min_price: " << pop_min_price;
-        qCritical() << "       pop_max_price: " << pop_max_price;
+        //qCritical() << "        pop_min_time: " << pop_min_time;
+        //qCritical() << "        pop_max_time: " << pop_max_time;
+        //qCritical() << "       pop_min_price: " << pop_min_price;
+        //qCritical() << "       pop_max_price: " << pop_max_price;
 
 
-        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-        qCritical() << "TimeSteps" << timeSteps;
+        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        //qCritical() << "TimeSteps" << timeSteps;
 
-        return 0;
+        // return 0;
 
         CalcState cs;
         double cost;
@@ -363,8 +363,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, 5, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
-            QDateTime end;
+            QDateTime s(QDate(2024, 8, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
 
             switch (day) {
             case (int)Qt::Monday:
@@ -390,6 +389,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(
@@ -401,9 +424,11 @@ int main() {
                                                         bool prepaid = true);
             */
 
-            for (int minutes = 0; minutes < 1440; ++minutes) {
-                QDateTime start = s.addSecs(minutes * 60);
-                QDateTime effectiveStart = start;
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
+            for (int minutes = 540; minutes <= 540; ++minutes) {
+                // QDateTime start = s.addSecs(minutes * 60);
+                QDateTime start(QDateTime::currentDateTime());
+                QDateTime effectiveStart(QDateTime::currentDateTime());
 
                 if (start.time() < QTime(8, 0, 0)) {
                     effectiveStart.setTime(QTime(8, 0, 0));
@@ -415,55 +440,18 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
-                for (int i = 0; i <= 2100; i += 10) {
+                for (int i = 30; i <= 30; i += 10) {
                 //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 600; // 22:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-                        qCritical() << cs.toString();
                     }
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
                 }
             }
         }
@@ -552,7 +540,7 @@ int main() {
             */
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 0; minutes < 1440; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
                 // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -569,66 +557,32 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
+/*
                 for (int i = 10; i <= 400; i += 10) {
-                //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
-
-
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
                         qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
                                     << "> end" << end.toString(Qt::ISODate);
-
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 780; // 19:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-#if 0
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
-#endif
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-//                        qCritical() << cs.toString();
                     }
+                }
+*/
+                int netto_parking_time = 60;
+                struct price_t price;
 
-#if 0
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
-#endif
+                qCritical() << "start" << start.toString(Qt::ISODate);
 
+                QDateTime const s = start;
+
+                if ((cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                        qCritical() << "start" << s.toString(Qt::ISODate)
+                                    << "netto_parking_time" << netto_parking_time
+                                    << "< price" << price.netto
+                                    << "> end" << end.toString(Qt::ISODate);
                 }
             }
         }
@@ -737,7 +691,7 @@ int main() {
                     effectiveStart.setTime(QTime(7, 0, 0)); // next day
                 }
 
-#if 1
+#if 0
                 PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
                 for (int i = 200; i <= 200; i += 10) {
                     cost = i;
@@ -760,7 +714,7 @@ int main() {
                 //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW)))) {      // return value
                     }
 
                     if (!cs) {
@@ -801,7 +755,7 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    int zone = 2;
+    int zone = 1;
 
     if (zone == 1) {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
@@ -823,22 +777,102 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
-        pop_max_time = get_maximal_parkingtime(&cfg);
-        pop_min_price = get_minimal_parkingprice(&cfg);
-        pop_max_price = get_maximal_parkingprice(&cfg);
-        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
-        qCritical() << "        pop_min_time: " << pop_min_time;
-        qCritical() << "        pop_max_time: " << pop_max_time;
-        qCritical() << "       pop_min_price: " << pop_min_price;
-        qCritical() << "       pop_max_price: " << pop_max_price;
+        if (zone == 1 || zone == 3) {
+/*
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_pkw: " << pop_min_time;
+            qCritical() << "        pop_max_time_pkw: " << pop_max_time;
+            qCritical() << "       pop_min_price_pkw: " << pop_min_price;
+            qCritical() << "       pop_max_price_pkw: " << pop_max_price;
+
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_bus: " << pop_min_time;
+            qCritical() << "        pop_max_time_bus: " << pop_max_time;
+            qCritical() << "       pop_min_price_bus: " << pop_min_price;
+            qCritical() << "       pop_max_price_bus: " << pop_max_price;
+*/
+        }
+        if (zone == 2) {
+            pop_min_time = get_minimal_parkingtime(&cfg);
+            pop_max_time = get_maximal_parkingtime(&cfg);
+            pop_min_price = get_minimal_parkingprice(&cfg);
+            pop_max_price = get_maximal_parkingprice(&cfg);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time: " << pop_min_time;
+            qCritical() << "        pop_max_time: " << pop_max_time;
+            qCritical() << "       pop_min_price: " << pop_min_price;
+            qCritical() << "       pop_max_price: " << pop_max_price;
+        }
 
         //QDateTime start = QDateTime::currentDateTime();
         //start.setTime(QTime(12, 0, 0));
         //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, start);
         //qCritical() << "TimeSteps" << timeSteps;
         //return 0;
+        if (zone == 1) {
+            //int minParkingTime = get_minimal_parkingtime(&cfg);
+            QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+
+            if (paymentOptionIndex < 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            QSet<uint32_t> const prices_pkw{600, 1200, 1800, 2400, 3000, 3600, 4200};
+            QSet<uint32_t> const prices_bus{3000, 6000, 9000, 12000, 15000, 18000, 21000};
+
+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            // s.setTime(QTime(12, 0, 0));
+
+            //calcState = compute_duration_for_parking_ticket(&cfg, s,
+            //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+            //qCritical() << end.toString(Qt::ISODate);
+            //qCritical() << calcState.toString();
+
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (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) {
             //int minParkingTime = get_minimal_parkingtime(&cfg);
@@ -858,6 +892,16 @@ int main() {
 
             QSet<uint32_t> const prices{600, 1200, 1800, 2400, 3000, 3600, 4200};
 
+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            s.setTime(QTime(18, 0, 0));
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (double)600, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            qCritical() << end.toString(Qt::ISODate);
+            qCritical() << calcState.toString();
+#if 0
 
             for (int i=0; i<timeSteps.size(); ++i) {
                 int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
@@ -882,89 +926,66 @@ int main() {
                             << "(price so far:" << price << ")";
 
             }
+#endif
         }
         if (zone == 3) {
-            int price;
-            QDateTime productStart;
-            QDateTime productEnd;
-            QDateTime start = QDateTime::currentDateTime();
+            //QDateTime xx(QDateTime::fromString("2024-07-31T00:00:00", Qt::ISODate));
+            //xx = xx.addSecs(-60); // -->  "2024-07-30T23:59:00"
+            //qCritical() << xx.toString(Qt::ISODate);
+
+            //QDateTime s(QDateTime::currentDateTime());
+            //s.setTime(QTime(12, 0, 0));
+            //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, s);
+            //qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+
+            if (paymentOptionIndex != 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            //QSet<uint32_t> const prices1{800, 1600, 2400, 3200, 4000, 4800, 5600};
+            //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
+
+            QDateTime end;
+            CalcState calcState;
+
+            QDateTime s(QDateTime::currentDateTime());
+            s.setTime(QTime(12, 0, 0));
+
+            int minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                                 paymentOptionIndex, s);
 
 #if 0
-            start.setTime(QTime(0, 0, 0));
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
-            qCritical() << QString("line=%1 price (%2) :")
-                           .arg(__LINE__)
-                           .arg(start.time().toString(Qt::ISODate)) << price;
+            qCritical() << "minimal parking price" << minimal_parking_price;
 
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(14, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__)
-                        << price;
-
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
-            qCritical() << QString("line=%1 price:").arg(__LINE__) << price;
-
-            start.setTime(QTime(15, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(16, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            start.setTime(QTime(17, 0, 0));
-            productStart = productEnd = QDateTime();
-            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-            qCritical() << QString("line=%1 price (%2-%3) :")
-                           .arg(__LINE__)
-                           .arg(productStart.time().toString(Qt::ISODate))
-                           .arg(productEnd.time().toString(Qt::ISODate))
-                        << price;
-
-            //price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
-            //qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
-
-            //price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET);
-            //qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
+            }
 
 #else
-            for (int h = 0; h < 24; ++h) {
-                start.setTime(QTime(h, 0, 0));
-                productStart = productEnd = QDateTime();
-                price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
-                qCritical() << QString("line=%1 %2 price (%3-%4) :")
-                               .arg(__LINE__)
-                               .arg(start.time().toString(Qt::ISODate))
-                               .arg(productStart.time().toString(Qt::ISODate))
-                               .arg(productEnd.time().toString(Qt::ISODate))
-                            << price;
+            s.setTime(QTime(15, 0, 0));
+
+            minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                             paymentOptionIndex, s);
+
+            qCritical() << "minimal parking price" << minimal_parking_price;
+
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 #endif
         }
@@ -1376,7 +1397,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: {
@@ -1385,8 +1406,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: {
@@ -1427,6 +1450,7 @@ int main() {
         cout << endl;
 
         if (isParsed) {
+
             // test library functions
 
             if (zone == 1) {
@@ -1453,10 +1477,10 @@ int main() {
                 static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
                 qCritical() << "TimeSteps" << timeSteps;
 
-                if (stepsConfigured != timeSteps) {
-                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
-                    return -1;
-                }
+                //if (stepsConfigured != timeSteps) {
+                //    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                //    return -1;
+                //}
 
                 QDateTime start = QDateTime::currentDateTime();
 
@@ -1464,7 +1488,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);
 
@@ -1481,11 +1506,11 @@ 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);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
@@ -1508,7 +1533,7 @@ int main() {
                         }
 
                         qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "PRICE=" << price1;
+                                    << timeSteps.at(i) << "PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
 
 
                         //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -1516,6 +1541,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) {
@@ -1553,18 +1593,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:
@@ -1588,18 +1630,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))) {
+                            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;
@@ -1676,7 +1752,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1761,7 +1837,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1819,7 +1895,7 @@ int main() {
                         double cost = 0;
                         CalcState cs;
 
-                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                             cost = price.netto;
                             qCritical() << "step" << *step << ": cost" << cost;
                         } else {
@@ -1922,7 +1998,7 @@ int main() {
                 CalcState cs;
                 for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                     QDateTime end = start.addSecs(timeSteps.at(i)*60);
-                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                     qCritical() << endl;
                 }
 
@@ -1947,7 +2023,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);

main/main.pro

@@ -30,7 +30,16 @@ SOURCES += main.cpp
 # HEADERS +=
 
 OTHER_FILES += \
-    /home/linux/customer_505/etc/psa_tariff/tariff01.json
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff02.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