Fix: copy header files

compute_duration_for_parking_ticket():
Recompute pop_max_price using netto-parking-time. Search Duration for the time-step with time-step == netto-parking-time, then search for the corresponding price in PaymentRate. The result is the new pop_max_price.
2024-09-19 14:10:05 +02:00 · 2024-09-17 17:05:23 +02:00 · 2024-09-17 17:04:27 +02:00 · 2024-09-17 17:03:29 +02:00 · 2024-09-17 17:01:32 +02:00 · 2024-09-17 16:59:07 +02:00
20 changed files with 1650 additions and 174 deletions
--- a/library/include/mobilisis/atb_time.h
+++ b/library/include/mobilisis/atb_time.h
@@ -0,0 +1,59 @@
+#ifndef ATB_TIME_H_INCLUDED
+#define ATB_TIME_H_INCLUDED
+
+#include <QDateTime>
+
+class ATBTime {
+    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);
+
+    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(QTime t) const { return m_time.time().secsTo(t); }
+    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 QDataStream &operator<<(QDataStream &out, ATBTime time);
+    friend QDataStream &operator>>(QDataStream &in, ATBTime &time);
+};
+
+
+#endif // ATB_TIME_H_INCLUDED
--- a/library/include/mobilisis/calculate_price.h
+++ b/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;
@@ -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
--- a/library/include/mobilisis/calculator_functions.h
+++ b/library/include/mobilisis/calculator_functions.h
@@ -3,6 +3,7 @@

 #include <iostream>
 #include <optional>
+#include <utility>

 #include "configuration.h"
 #include "calculate_price.h"
@@ -70,8 +71,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
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -36,6 +36,7 @@
 using namespace std;
 using namespace rapidjson;

+
 class Calculator;
 class Configuration
 {
@@ -59,7 +60,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;
@@ -126,3 +127,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);
--- a/library/include/mobilisis/payment_opt.h
+++ b/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;
--- a/library/include/mobilisis/spec_days_worktime.h
+++ b/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
+};
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@@ -15,6 +15,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 +44,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 +71,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";

--- a/library/include/mobilisis/tariff_carryover_settings.h
+++ b/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
--- a/library/include/mobilisis/tariff_log.h
+++ b/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
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@@ -4,14 +4,37 @@
 #include <QTime>
 #include <QString>

+#include "atb_time.h"
+
 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 +43,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;
    }
--- a/library/include/mobilisis/tariff_settings.h
+++ b/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
--- a/library/include/mobilisis/weekdays.h
+++ b/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;
+    }
+};
--- a/library/library.pro
+++ b/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,8 @@ 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

 OTHER_FILES += src/main.cpp \
    ../tariffs/tariff_korneuburg.json \
--- a/library/src/atb_time.cpp
+++ b/library/src/atb_time.cpp
@@ -0,0 +1,115 @@
+#include "atb_time.h"
+
+
+ATBTime::ATBTime()
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00", Qt::ISODate))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+}
+
+ATBTime::ATBTime(int h, int m, int s, int ms)
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00", Qt::ISODate))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00", Qt::ISODate)) {
+
+    QTime t(h, m, s, ms);
+    m_time.setTime(t);
+}
+
+ATBTime::ATBTime(QString const &t)
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00"))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+
+    if (t == "24:00:00") {
+        m_time = m_end;
+    } else {
+        m_time.setTime(QTime::fromString(t, Qt::ISODate));
+    }
+}
+
+
+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 {
+    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 {
+    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();
+}
+
+bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() == rhs.m_time.time();
+}
+
+QDataStream &operator<<(QDataStream &out, ATBTime time) {
+    out << time.m_time.time();
+    return out;
+}
+
+QDataStream &operator>>(QDataStream &in, ATBTime &time) {
+    QTime t;
+    in >> t;
+    time.m_time.setTime(t);
+    return in;
+}
--- a/library/src/calculate_price.cpp
+++ b/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 = cfg->getPaymentOptionIndex(permitType);
+    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 = cfg->getPaymentOptionIndex(permitType);
+    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;
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+
+    if ((paymentOptionIndex = getPaymentOptionIndex(*cfg, start)) == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    }

    int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;

@@ -321,12 +332,16 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
    int maxPrice = -1;
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+    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) {
-            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            //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
@@ -474,7 +489,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;

@@ -539,7 +558,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 +673,19 @@ 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());
+    }
+
+    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 +713,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        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);
+    //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,
@@ -721,7 +752,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,51 +813,153 @@ 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;
-            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+            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;
+            qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+            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
-                        effectiveStartTime.setTime(p.static_end);
+                    qCritical() << __func__ << ":" << __LINE__ << "    prepaidStart" << p.prepaid[weekDay].static_start.toString(Qt::ISODate);
+                    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
-                        effectiveStartTime.setTime(p.static_start);
+                    if (start_parking_time.time() > p.prepaid[weekDay].static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.prepaid[weekDay].static_start);
                    }
                }
            }

-            // handle carry over
-            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-            if (netto_parking_time > minutesUntilCarryOver) {
-                int const rest = netto_parking_time - minutesUntilCarryOver;
-                QDateTime s(effectiveStartTime);
-                s = s.addSecs(minutesUntilCarryOver * 60);
-                s = s.addSecs(carryOverDuration * 60);
-                end_parking_time = s.addSecs(rest * 60);
+            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 ((minutesUntilCarryOver > 0) && (netto_parking_time > minutesUntilCarryOver)) {
+                    int const rest = netto_parking_time - minutesUntilCarryOver;
+                    QDateTime s(effectiveStartTime);
+                    s = s.addSecs(minutesUntilCarryOver * 60);
+                    s = s.addSecs(carryOverDuration * 60);
+                    end_parking_time = s.addSecs(rest * 60);
+                } else {
+                    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 {
            cost = Calculator::GetInstance().GetCostFromDuration(
                        tariff,
@@ -873,7 +1012,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 +1031,14 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        qCritical() << "           start (cs): " << cs;
        qCritical() << "                price: " << price;

-        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
-                                                  cs.toLocal8Bit().constData(),
-                                                  price, permitType, nextDay, prepaid).c_str();
+        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);
+        duration = p_duration.first.c_str();
+
+
        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
        if (!d.isValid()) {
            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -913,8 +1061,17 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    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 +1086,54 @@ 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;

        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,27 +1191,193 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        } else {
            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);

-            // DEBUG
-            //qCritical() << "compute_duration_for_parking_ticket(): ";
-            //qCritical() << "                 endTime: " << endTime;
-            //qCritical() << "           ticketEndTime: " << ticketEndTime;
+            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 (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() << __func__ << ":" << __LINE__ << "      endTime:" << endTime;
+            qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
        }
    } 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 */)
 {
    CalcState calcState;
    if (start_parking_time.isValid()) {
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
@@ -118,13 +118,14 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
    return QDateTime();
 }
 /// <inheritdoc/>
-std::string Calculator::GetDurationFromCost(Configuration* cfg,
-                                            uint8_t payment_option,
-                                            char const *startDatetimePassed, // given in local time
-                                            double cost,
-                                            PermitType permitType,
-                                            bool nextDay,
-                                            bool prepaid)
+std::pair<std::string, QDateTime>
+Calculator::GetDurationFromCost(Configuration* cfg,
+                                uint8_t payment_option,
+                                char const *startDatetimePassed, // given in local time
+                                double cost,
+                                PermitType /*permitType*/,
+                                bool nextDay,
+                                bool prepaid)
 {
    Q_UNUSED(payment_option);
    Q_UNUSED(nextDay);
@@ -133,7 +134,16 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    QDateTime inputDate = QDateTime::fromString(startDatetimePassed, Qt::ISODate);
    inputDate.setTime(QTime(inputDate.time().hour(), inputDate.time().minute(), 0));
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+
+    bool overPaid = false;
+    bool successMaxPrice = false; // max-price and cost match
+
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, inputDate);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(QDateTime::fromString(startDatetimePassed, Qt::ISODate));
+    }
+
+    qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;

    if (DBG_LEVEL >= DBG_DEBUG) {
        qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
@@ -156,7 +166,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
            // minimal price is set by GetTimeSteps()
            qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
            qCritical() << DBG_HEADER << "configured minimal price:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
-            return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
+            return std::make_pair(CalcState::BELOW_MIN_PARKING_PRICE.toStdString(), QDateTime());
        }

        if (prepaid == false) {
@@ -181,8 +191,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    price = pra_price;
                }

-                //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
-                //qCritical() << DBG_HEADER << "  duration id" << durationId;
+                // qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+                // qCritical() << DBG_HEADER << "  duration id" << durationId;

                auto search = cfg->Duration.find(durationId);
                if (search != cfg->Duration.end()) {
@@ -207,16 +217,21 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            //found = true;
                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
-                            QDateTime d(inputDate.addSecs(duration_previous * 60));
+                            QDateTime d;
+                            if (pop_accumulate_durations) {
+                                d = inputDate.addSecs(durationInMinutes * 60);
+                            } else {
+                                d = inputDate.addSecs(duration_previous * 60);
+                            }

                            qCritical() << DBG_HEADER << "                    provided price (cost):" << cost;
                            qCritical() << DBG_HEADER << "        computed time for price (minutes):" << duration_previous;
-                            qCritical() << DBG_HEADER << "configured minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                            qCritical() << DBG_HEADER << "           minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;

                            if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
-                                return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
+                                return std::make_pair(CalcState::BELOW_MIN_PARKING_TIME.toStdString(), d); // minimal parking time is set by GetTimeSteps()
                            }
-                            return d.toString(Qt::ISODate).toStdString();
+                            return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
                        }
                    }

@@ -229,7 +244,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                        qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
                        qCritical() << DBG_HEADER << "      duration for price:" << durationStr;

-                        return durationStr.toStdString();
+                        return std::make_pair(durationStr.toStdString(), d);
                    }
                }
            }
@@ -243,30 +258,41 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
            // use tariff with structure as for instance Schoenau, Koenigsee:
            // without given YearPeriod, SpecialDays and SpecialDaysWorktime
            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
-            return inputDate.toString(Qt::ISODate).toStdString();
+            return std::make_pair(inputDate.toString(Qt::ISODate).toStdString(), inputDate);
        } else {
            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
                if (!prepaid) {
                    CalcState cs = isParkingAllowed(cfg, inputDate);
                    if (cs) {
                        inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
-                        return inputDate.toString(Qt::ISODate).toStdString();
+                        return std::make_pair(inputDate.toString(Qt::ISODate).toStdString(), inputDate);
                    }
                }

                int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+                int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
+
+                if (cost == pop_max_price) {
+                    qCritical() << DBG_HEADER << "SUCCESS MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
+                    successMaxPrice = true;
+                }

                if (cost > pop_max_price) {
-                    cost = pop_max_price;
                    qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
-                    //return CalcState::OVERPAID.toStdString();
+                    if (pop_allow_overpay == false) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), QDateTime());
+                    }
+                    cost = pop_max_price;
+                    overPaid = true;
+                    qCritical() << DBG_HEADER << "OVERPAID, MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
+                    // return CalcState::OVERPAID.toStdString();
                }

                if (cost < pop_min_price) {
                    qCritical() << DBG_HEADER << "MIN-PARKING-PRICE" << pop_min_price << ", COST" << cost;
-                    return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
+                    return std::make_pair(CalcState::BELOW_MIN_PARKING_PRICE.toStdString(), QDateTime());
                }

                // int const pop_pre_paid = 1;
@@ -351,7 +377,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    qCritical() << DBG_HEADER
                                << "ERROR" << inputDate.toString(Qt::ISODate)
                                << "NOT IN VALID WORKING TIME-RANGE";
-                    return "";
+                    return std::make_pair("", QDateTime());
                }

                //qCritical() << __func__ << __LINE__;
@@ -376,7 +402,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    qCritical() << DBG_HEADER
                                << "ERROR" << inputDate.toString(Qt::ISODate)
                                << "NOT IN VALID WORKING TIME-RANGE";
-                    return "";
+                    return std::make_pair("", QDateTime());
                }

 #if DEBUG_GET_DURATION_FROM_COST==1
@@ -390,7 +416,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                int new_price = 0;
                int durationInSecs = 0;
                uint32_t duration_previous = 0;
-                bool found = false;
+                // bool found = false;

                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                    int const pra_price = itr->second.pra_price;
@@ -419,13 +445,19 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                               duration_previous = durationUnit;
                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") ZZZZZZ duration_previous" << duration_previous;
                            } else {
-                                found = true;
+                               //found = true;
                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") WWWWWW duration_previous" << duration_previous;
                                QString s = inputDate.toString(Qt::ISODate);
                                QDateTime d(QDateTime::fromString(s, Qt::ISODate));
                                d = d.addSecs(duration_previous * 60);
                                //qCritical() << DBG_HEADER << "XXXXXXXXXXXXXXXXXXXXX" << d;
-                                return d.toString(Qt::ISODate).toStdString();
+                                if (overPaid) {
+                                    return std::make_pair(CalcState::OVERPAID.toStdString(), d);
+                                }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), d);
+                                }
+                                return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
                            }
                        } else {
                            durationInSecs = cfg->Duration.find(durationId)->second.pun_duration * 60;
@@ -501,6 +533,16 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,

                                                //qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);

+                                                int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+                                                if (pop_carry_over) {
+                                                    int weekDay = inputDate.date().dayOfWeek();
+                                                    int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                                                    if (pop_carry_over_option_id != -1) {
+                                                        int const carryOverDuration = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+                                                        inputDate = inputDate.addSecs(carryOverDuration * 60);
+                                                    }
+                                                }
+
                                                inputDate = inputDate.addSecs(durationInSecs);
 #if DEBUG_GET_DURATION_FROM_COST==1
                                                qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
@@ -536,7 +578,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            qCritical() << DBG_HEADER << "TICKET-END" << s;
 #endif

-                            return s.toStdString();
+                            if (overPaid) {
+                                return std::make_pair(CalcState::OVERPAID.toStdString(), inputDate);
+                            }
+                            if (successMaxPrice) {
+                                return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), inputDate);
+                            }
+                            return std::make_pair(s.toStdString(), inputDate);
                        } // if ((double)price == cost) {
                        else {
                            //qCritical() << DBG_HEADER;
@@ -546,7 +594,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    }
                }

-                return "";
+                return std::make_pair("", QDateTime());
            }
        }
    } else
@@ -563,7 +611,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,

        if (cost < minParkingPrice) {
            qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
-            return QDateTime().toString(Qt::ISODate).toStdString();
+            return std::make_pair(QDateTime().toString(Qt::ISODate).toStdString(), QDateTime());
        }

        if (cost > maxParkingPrice) {
@@ -602,7 +650,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                weekdayId = current.date().dayOfWeek();
                if (weekdayId == weekdayIdLast) {
                    qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
-                    return QDateTime().toString(Qt::ISODate).toStdString();
+                    return std::make_pair(QDateTime().toString(Qt::ISODate).toStdString(), QDateTime());
                }
            }

@@ -620,7 +668,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,

            if (current.time() >= to) {
                if (carryOverNotSet) {
-                    return end_datetime.toString(Qt::ISODate).toStdString();
+                    if (overPaid) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                    }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                    }
+                    return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                } else {
                    QDateTime const dt = start;
                    start = start.addDays(1);
@@ -667,7 +721,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                << "price" << price;
 #endif
                    end_datetime = current;
-                    return end_datetime.toString(Qt::ISODate).toStdString();
+                    if (overPaid) {
+                        return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                    }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                    }
+                    return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                }

                QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
@@ -762,7 +822,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }
                }

@@ -803,7 +869,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-                                return end_datetime.toString(Qt::ISODate).toStdString();
+                                if (overPaid) {
+                                    return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                                }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                                }
+                                return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                            }

                            // price has been updated; use next time range
@@ -834,7 +906,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "price" << price;
 #endif

-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }

                    if (moveToNextTimeRange) {
@@ -950,8 +1028,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
                                    << "price" << price;
 #endif
-
-                        return end_datetime.toString(Qt::ISODate).toStdString();
+                        if (overPaid) {
+                            return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                        }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
+                        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                    }
                }

@@ -964,7 +1047,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            << "final price" << std::max(price, minParkingPrice);
 #endif

-                return end_datetime.toString(Qt::ISODate).toStdString();
+                if (overPaid) {
+                    return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
+                }
+                return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
            } // while (timeRangeIt != cfg->TimeRange.cend()) {
        }

@@ -973,7 +1059,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                            << "INVALID END TIME";
 #endif
        end_datetime = QDateTime();
-        return end_datetime.toString(Qt::ISODate).toStdString();
+        return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
    }

    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);
@@ -981,7 +1067,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    // qCritical().noquote() << t;

    // TODO: im fehlerfall
-    return t.getValidUntil().toString(Qt::ISODate).toStdString();
+    return std::make_pair(t.getValidUntil().toString(Qt::ISODate).toStdString(), t.getValidUntil());
 }
 #undef _DEBUG_

@@ -1411,7 +1497,10 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
    Q_UNUSED(payment_option);
    Q_UNUSED(nextDay);

-    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+    int paymentOptionIndex = getPaymentOptionIndex(*cfg, start_datetime);
+    if (paymentOptionIndex == -1) {
+        paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+    }
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
@@ -2563,7 +2652,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,

                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;

-                        int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
+                        // int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;

                        // TODO: auslagern
                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
@@ -2588,7 +2677,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                            auto search = cfg->Duration.find(durationId);
                            if (search != cfg->Duration.end()) {
                                ATBDuration duration = search->second;
-                                ATBDuration &previous = search->second;
+                                // ATBDuration &previous = search->second;

                                if (duration.pun_interpolation_id == -1) {

@@ -2618,7 +2707,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         interpolation dynamic end:" << interpolationEnd.toString(Qt::ISODate);
                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")    interpolation dynamic end time:" << end_time;

-                                        int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                                        // int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;

                                        runtimeInMinutes += duration.pun_duration;
                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
@@ -2695,7 +2784,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;

                                        QDateTime s = start.addSecs(runtimeInMinutes * 60);
-                                        int const minutes = s.time().secsTo(carryOverStart) / 60;
+                                        // int const minutes = s.time().secsTo(carryOverStart) / 60;

 #if 0
                                        if (minutes > 0) {
--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@@ -8,6 +8,8 @@
 #include "tariff_global_defines.h"
 #include "tariff_carryover.h"
 #include "tariff_global_defines.h"
+#include "tariff_settings.h"
+#include "tariff_carryover_settings.h"

 #include <QString>
 #include <QDebug>
@@ -21,7 +23,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 +46,298 @@ 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;
+    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 +396,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;
@@ -112,29 +412,29 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
            MemberType mb_type = MemberType::UnknownType;
            this->currentPaymentOptions.clear();

-                // Get all JSON object members
-                // This code should run only once (to load JSON variables into memory)
-                for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
-                {
-                        // Get name of all general members of JSON, don't print name if NULL
-                        const char* mb_name = i->name.GetString();
-            if (mb_name == NULL) continue;
+            // Get all JSON object members
+            // This code should run only once (to load JSON variables into memory)
+            for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
+            {
+                // Get name of all general members of JSON, don't print name if NULL
+                const char* mb_name = i->name.GetString();
+                if (mb_name == NULL) continue;

-            if (document[mb_name].IsString()) {
-                QString const _mb_name(mb_name);
-                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
-                    cfg->project.project = document[mb_name].GetString();
-                    continue;
-                 }
-                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
-                    cfg->project.version = document[mb_name].GetString();
-                    continue;
+                if (document[mb_name].IsString()) {
+                    QString const _mb_name(mb_name);
+                    if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                        cfg->project.project = document[mb_name].GetString();
+                        continue;
+                     }
+                    if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                        cfg->project.version = document[mb_name].GetString();
+                        continue;
+                    }
+                    if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                        cfg->project.info = document[mb_name].GetString();
+                        continue;
+                    }
                }
-                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
-                    cfg->project.info = document[mb_name].GetString();
-                    continue;
-                }
-            }

            // ... everything else should be an array
            if (!document[mb_name].IsArray()) {
@@ -171,6 +471,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 +591,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 +974,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 +1000,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 +1111,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 +1154,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 +1479,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 +1568,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 +1581,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 +1902,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;
+}
--- a/library/src/utilities.cpp
+++ b/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;
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -43,7 +43,7 @@ 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)
@@ -51,7 +51,7 @@ 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)

 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -339,20 +339,20 @@ 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;

@@ -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, 7, 29 + 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(
@@ -1357,7 +1380,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,6 +1389,7 @@ 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");
            //pop_max_time = 5*60;
@@ -1408,6 +1432,7 @@ int main() {
        cout << endl;

        if (isParsed) {
+
            // test library functions

            if (zone == 1) {
@@ -1434,10 +1459,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();

@@ -1445,7 +1470,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 +1488,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 +1523,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 +1575,19 @@ 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(2024, 9, 8), QTime(16, 2, 0)); // sunday
                        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 +1611,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;
--- a/main/main.pro
+++ b/main/main.pro
@@ -30,9 +30,15 @@ SOURCES += main.cpp
 # HEADERS +=

 OTHER_FILES += \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.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
Author	SHA1	Message	Date
Siegfried Siegert	1b716c48d2	Fix: copy header files	2024-09-19 14:10:05 +02:00
Gerhard Hoffmann	77e1414c13	compute_duration_for_parking_ticket(): Recompute pop_max_price using netto-parking-time. Search Duration for the time-step with time-step == netto-parking-time, then search for the corresponding price in PaymentRate. The result is the new pop_max_price.	2024-09-17 17:05:23 +02:00
Gerhard Hoffmann	d95275a72d	Compute real netto_parking_time. This time will be used to find the real time-step, and from here the actual price to pay.	2024-09-17 17:04:27 +02:00
Gerhard Hoffmann	577a17dc6a	Set seconds of serveral date-times to 0. Compute netto_parking_time (which includes carry-over duration).	2024-09-17 17:03:29 +02:00
Gerhard Hoffmann	d8d32820a3	compute_price_for_parking_ticket(): Reset pop_max_price to original value using pop_max_price_saved.	2024-09-17 17:01:32 +02:00
Gerhard Hoffmann	2ce0aeef1d	Minor: include atb_time.h	2024-09-17 16:59:07 +02:00
Gerhard Hoffmann	0cba85eafb	Set pop_max_price_saved	2024-09-17 16:58:20 +02:00
Gerhard Hoffmann	4030a4b165	Add pop_max_price_save in case pop_max_price has to be re-computed dynamically, so it can be reset	2024-09-17 16:57:34 +02:00
Gerhard Hoffmann	8c7afdfcb1	Add additional constructor.	2024-09-17 16:53:45 +02:00
Gerhard Hoffmann	932d4e8cb9	check it ticket-end-time hits carry-over-start. if configured, move to end of carry-over.	2024-09-16 16:56:48 +02:00
Gerhard Hoffmann	38abc65425	compute_price_for_parking_ticket(): Check if minutesUntilCarryOver is positive (usually must be).	2024-09-16 16:54:25 +02:00
Gerhard Hoffmann	205896903b	Handle SUCCESS_MAXPRICE (calc-state).	2024-09-16 16:53:44 +02:00
Gerhard Hoffmann	dbedfd094f	Add some OTHER files	2024-09-16 16:52:00 +02:00
Gerhard Hoffmann	57b9d16abc	GetDurationFromCost(): Handle carry-over for direct coin insertion. Carefully check if this might be a problem for other projects.	2024-09-16 16:50:16 +02:00
Gerhard Hoffmann	48afbc071c	Added new calc-state: SUCCESS_MAXPRICE. Return whenever cost (=price) equals max-price.	2024-09-16 16:49:00 +02:00
Gerhard Hoffmann	7a7b10260a	Add untracked(!) files	2024-09-16 16:47:01 +02:00
Gerhard Hoffmann	1874b08210	Merge branch 'kleipeda-experimental-snapshot-2024-09-12' into kleipeda-experimental	2024-09-16 10:49:23 +02:00
Gerhard Hoffmann	88a0ebb688	Add atb-time.	2024-09-16 10:42:56 +02:00
Gerhard Hoffmann	a8ae9fc602	Add own Time class (similar QTime)	2024-09-16 10:42:08 +02:00
Gerhard Hoffmann	7c0514e241	save current state	2024-09-13 10:42:45 +02:00
Gerhard Hoffmann	f53e9ceaae	Some testing added	2024-09-11 12:11:49 +02:00
Gerhard Hoffmann	dffc6e2a03	Minor: removed some debug output.	2024-09-11 11:56:06 +02:00
Gerhard Hoffmann	f9cc3af473	ParseJson(): Add parsing of "pop_apply_carry_over_to_ticket_endtime".	2024-09-11 11:55:03 +02:00
Gerhard Hoffmann	9dd0108731	ParseJson(): Add parsing for prepaid-options.	2024-09-11 11:54:16 +02:00
Gerhard Hoffmann	fa10ea4b89	compute_price_for_parking_ticket(): In case parking-time-limit is violated, return with an error. Commented out: use another possiblity: cut max-parking-time so that parking-time-limit is not violated.	2024-09-11 11:49:31 +02:00
Gerhard Hoffmann	05f03a623b	compute_price_for_parking_ticket(): If after crossing a carry-over-time range (taking several days) check if we have to carry over again on the target day.	2024-09-11 11:47:50 +02:00
Gerhard Hoffmann	03e9076962	compute_price_for_parking_ticket(): Minor: add some debug output.	2024-09-11 11:46:36 +02:00
Gerhard Hoffmann	5dbd3645c6	compute_price_for_parking_ticket(): Fetch prepaid-option-id (possibly recalculating it depending on year-period), and fetch associated prepaid-options.	2024-09-11 11:44:09 +02:00
Gerhard Hoffmann	d21f69cb9b	get_maximal_parkingprice(): Fetch maxPrice directly instead of using utility function.	2024-09-11 11:42:15 +02:00
Gerhard Hoffmann	e38a1bfe12	Add default constructor, update debug output.	2024-09-11 11:40:19 +02:00
Gerhard Hoffmann	f38a8d528c	Minor: add getters for parking-time-limit.	2024-09-11 11:39:16 +02:00
Gerhard Hoffmann	08a593eb12	Add 'pop_apply_carry_over_to_ticket_endtime': If ticket-end-time exactly hits the start of a carry-over-time-range, the move to the end of the carry-over-time-range, even if this were not strictly necessary.	2024-09-11 11:36:57 +02:00
Gerhard Hoffmann	f322d30e36	Add default constructor, fix debug output.	2024-09-11 11:35:17 +02:00
Gerhard Hoffmann	7a53a68850	getPaymentOptionIndex(): add start-time parameter	2024-09-06 12:05:41 +02:00
Gerhard Hoffmann	275c3ec869	compute_price_for_parking_ticket(): Pass start-date-time to parking-time-checker.	2024-09-03 11:19:23 +02:00
Gerhard Hoffmann	6d2bde1fe9	getPaymentOptionIndex(): Fix: make sure only one payment option can be chosen.	2024-09-03 11:17:31 +02:00
Gerhard Hoffmann	f02521d3c2	parseWeekDay(): for the park-time-limit checking take into account that the start-date-time and end-date-time are on different days.	2024-09-03 11:15:08 +02:00
Gerhard Hoffmann	75f1c1bb76	Checking parking-time-limit: provide start-date-time as well, because the limit counts only from one day to following day (e.g. Sunday to Monday or from holiday to next day).	2024-09-03 11:10:24 +02:00
Gerhard Hoffmann	f47695de8b	Add pop_plus_steps_saved	2024-09-02 17:16:47 +02:00
Gerhard Hoffmann	cce3db301b	Minor: comment out some code to prevent compiler warnings (about some unused variables).	2024-09-02 17:15:33 +02:00
Gerhard Hoffmann	5cab0de9fb	Use free function getPaymentOptionIndex() to compute index of valid payment-option-section in tariff-file based on configured businessHours.	2024-09-02 17:14:20 +02:00
Gerhard Hoffmann	f92906f680	Minor: debug output.	2024-09-02 17:13:11 +02:00
Gerhard Hoffmann	8cdeef26fc	Check if computed ticket-end-time violates a carry-over-limit defined in tariff-file.	2024-09-02 17:11:48 +02:00
Gerhard Hoffmann	52ebbf7bc9	Use free function getPaymentOptionIndex() in serveral places to compute valid index of a payment-option-section within tariff file. If this is not possible, then try the already available functionality.	2024-09-02 17:09:26 +02:00
Gerhard Hoffmann	349e9d8b06	Add free functions isHoliday() to check if the current day is a holiday and previousDayHoliday() to check if previous day (relative to endtime) is a holiday.	2024-09-02 17:05:32 +02:00
Gerhard Hoffmann	68a1c24861	Add free function getPaymentOptionIndex(): Compute payment option index base on current start-date-time and businesshour-setiing in tariff-file. Returns -1 to indicate error.	2024-09-02 17:03:37 +02:00
Gerhard Hoffmann	c946c106d1	Configuration::ParseJson(): Save the pop_plus_steps setting: sometimes it is necessary to adapt the pop_plus_steps-variable in order to hit a time-limit-boundary exactly. Otherwise the next computed time-step might overshoot the time-limit, and when moving backwards (via Minus-Button) there is a better resolution: going backwards, the user could hit the exact time-limit, which he could not when going up.	2024-09-02 16:58:34 +02:00
Gerhard Hoffmann	f24f1fe646	Configuration::ParseJson(): Call parseWeekDay() to reading the week-day-settings.	2024-09-02 16:57:11 +02:00
Gerhard Hoffmann	c6b8a37263	ParseJson(): Minor: some reformatting of source code.	2024-09-02 16:55:48 +02:00
Gerhard Hoffmann	58d8f16681	ParseWeekDay(): Parsing "Monday" - "Sunday" section i a tariff-file. Each day has a memebr named "week_day_default". It contains the valid default tariff settings for a usual day (i.e. no holiday etc.) It also contains the carry-over-settings for the usual day. In case there is some holiday on this day (for instance on "Monday"), the the date of the holiday replaces the name "week_day_default". Otherwise the structure is the same as for a usual day.	2024-09-02 16:49:21 +02:00
Gerhard Hoffmann	431664d8b9	IdentifyJsonMember(): Add "Monday" - "Sunday" as level-1 sections in a tariff-file.	2024-09-02 16:47:46 +02:00
Gerhard Hoffmann	53cf9a7341	Add description for tariff-settings.w	2024-09-02 16:46:00 +02:00
Gerhard Hoffmann	3a18ee2d7c	Add description for carry-over-settings	2024-09-02 16:45:35 +02:00
Gerhard Hoffmann	929a8a4a27	Reuse of "class ATBWeekDays": Description of a weekday: Mon-Sun. For holidays contains a type-flag to indicate such a day. Each weekday has some tariff-settings and some carry-over-settings.	2024-09-02 16:41:26 +02:00
Gerhard Hoffmann	2b9657787d	add tests for bad-neuenahr	2024-09-02 16:40:38 +02:00
Gerhard Hoffmann	eca285cc25	remove obsolete print-function	2024-09-02 16:40:07 +02:00
Gerhard Hoffmann	bda8914f1a	Add free functions: previousDayHoliday(): Check if previous day was a holiday. Check is done relative to computed endtime. isHoliday(): Check if startDateTime is on a holiday. getPaymentOptionIndex(): Compute the index of the payment-options-section inside a tariff-file. This is done as workaround (and backward compatibility). parseWeekDay(): Parse new structure of tariff-file.	2024-09-02 16:35:25 +02:00
Gerhard Hoffmann	a3983ed427	check for time-step-config == STATIC	2024-08-21 17:46:35 +02:00
Gerhard Hoffmann	f8805e9e78	compute_duration_for_parking_ticket(): Fix: handle carry-over for coin-insertion.	2024-08-21 15:40:55 +02:00
Gerhard Hoffmann	7a6360f392	compute_duration_for_parking_ticket(): Fix: handle prepaid-setting for coin-insertion.	2024-08-21 15:39:44 +02:00
Gerhard Hoffmann	08a249f393	return OVERPAID in case overpay is not allowed	2024-08-21 15:39:05 +02:00
Gerhard Hoffmann	7c173ae292	parse for pop_allow_overpay	2024-08-21 15:38:06 +02:00
Gerhard Hoffmann	80637260f3	Utilities::IsYearPeriodActive(): Fix: take into account if start-date <= end-date or not. Otherwise check is wrong, and no valid year period is returned.	2024-08-21 15:35:03 +02:00
Gerhard Hoffmann	9b524d63e5	Add 'pop_allow_overpay' setting: set vai tariff-file if operpay is allowed.	2024-08-21 15:33:02 +02:00
Siegfried Siegert	25b3143d88	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 14:37:42 +02:00
Gerhard Hoffmann	0856f10ca9	GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.	2024-08-02 14:34:44 +02:00
Siegfried Siegert	88c703ecc2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 13:21:54 +02:00
Gerhard Hoffmann	465b2274a1	compute_duration_for_parking_ticket(): Adapt end-time in case it is midnight: 00:00 -> 23:59	2024-08-02 13:15:11 +02:00
Siegfried Siegert	f946cd13e4	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:55:12 +02:00
Siegfried Siegert	8d1cbe7337	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:29:10 +02:00
Siegfried Siegert	3a98a14eb0	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 10:50:03 +02:00
Siegfried Siegert	0d0d34cb87	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 08:06:45 +02:00
Siegfried Siegert	8fff7a76f6	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-30 10:02:57 +02:00
Siegfried Siegert	84d807930e	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:35:38 +02:00
Siegfried Siegert	18f4e74eea	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:05:45 +02:00
Siegfried Siegert	bfd9f3b80c	Fix: add missing parameter PermitType	2024-07-26 14:11:37 +02:00
Siegfried Siegert	cb69d3ca2f	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:35:56 +02:00
Siegfried Siegert	63043931c2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:12:56 +02:00
Siegfried Siegert	1ea03f522c	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:01:17 +02:00
Siegfried Siegert	ac20a767df	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 11:08:02 +02:00