Merge branch 'fuchs-muehlbach' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into fuchs-muehlbach

Fix: check not only if "current" is above carryOverStart, but also
	     if "current" is below carryOverEnd.

\

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

library/include/mobilisis/atb_time.h

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

library/include/mobilisis/calculate_price.h

@@ -56,7 +56,6 @@ 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,
@@ -72,8 +71,7 @@ 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;
@@ -90,9 +88,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         , m_desc(desc) {
     }
 
-    explicit CalcState(State state, QString desc,
+    explicit CalcState(State state, QString desc = "",
-                       QTime const &from,
+                       QTime const &from = QTime(),
-                       QTime const &until)
+                       QTime const &until = QTime())
         : m_status(state)
         , m_desc(desc)
         , m_allowedTimeRange(from, until) {
@@ -108,9 +106,6 @@ 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;
@@ -163,9 +158,6 @@ 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;
@@ -215,9 +207,6 @@ struct CALCULATE_LIBRARY_API CalcState {
         if (desc == SUCCESS) {
             m_status = State::SUCCESS;
         } else
-        if (desc == SUCCESS_MAXPRICE) {
-            m_status = State::SUCCESS_MAXPRICE;
-        }
         if (desc == ERROR_PARSING_ZONE_NR) {
             m_status = State::ERROR_PARSING_ZONE_NR;
         } else

library/include/mobilisis/calculator_functions.h

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

library/include/mobilisis/configuration.h

@@ -28,9 +28,8 @@
 #include "tariff_interpolation.h"
 #include "tariff_prepaid.h"
 #include "tariff_carryover.h"
+#include "tariff_prepay.h"
 #include "tariff_permit_type.h"
-#include "tariff_service.h"
-#include "tariff_out_of_service.h"
 
 #include <QVector>
 #include <optional>
@@ -38,7 +37,6 @@
 using namespace std;
 using namespace rapidjson;
 
-
 class Calculator;
 class Configuration
 {
@@ -50,23 +48,20 @@ public:
     using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
     using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
     using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
+    using TariffPrepayOptionType = std::multimap<int, ATBPrepay>;
     using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
     using TariffDurationType = std::multimap<int, ATBDuration>;
-    using TariffServiceType = std::multimap<int, ATBTariffService>;
-    using TariffOutOfServiceType = std::multimap<int, ATBTariffOutOfService>;
-    using ATBTariffPrepaidType = std::multimap<int, ATBTariffPrepaid>;
-    using ATBTariffCarryOverType = std::multimap<int, ATBTariffCarryOver>;
 
     ATBProject project;
     ATBCurrency Currency;
     ATBDuration duration;
 
-    TariffDurationType Duration;
+	TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;
 	SpecialDaysType SpecialDays;
-    multimap<Qt::DayOfWeek, ATBWeekDay> WeekDays;
+	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
 	ATBPaymentOptionType PaymentOption;
@@ -78,11 +73,8 @@ public:
 	TariffProductType TariffProduct;
 	TariffInterpolationType TariffInterpolations;
 	TariffPrepaidType TariffPrepaidOptions;
+	TariffPrepayOptionType TariffPrepayOptions;
 	TariffCarryOverType TariffCarryOverOptions;
-    TariffServiceType TariffServices;
-    TariffOutOfServiceType TariffOutOfServices;
-    ATBTariffPrepaidType TariffPrepaids;
-    ATBTariffCarryOverType TariffCarryOvers;
 
 	/// <summary>
 	/// Parse JSON string
@@ -137,15 +129,3 @@ private:
 
 	QVector<ATBPaymentOption> currentPaymentOptions;
 };
-
-bool previousDayHoliday(Configuration const &cfg, QDateTime const &t);
-bool isHoliday(Configuration const &cfg, QDateTime const &t);
-int getPaymentOptionIndex(Configuration const &cfg, QDateTime const& dt = QDateTime::currentDateTime());
-
-ATBWeekDay parseWeekDay(Configuration &cfg,
-                        rapidjson::GenericMemberIterator<false,
-                                                         rapidjson::UTF8<char>,
-                                                         rapidjson::MemoryPoolAllocator<rapidjson::CrtAllocator>> k,
-                        QString const &innerObjName,
-                        Qt::DayOfWeek weekDay,
-                        QString const &weekDayName);

library/include/mobilisis/duration.h

@@ -1,6 +1,7 @@
 #include <string>
 
 #include <QDebug>
+#include <QDateTime>
 
 class ATBDuration
 {
@@ -12,20 +13,35 @@ public:
       , pun_duration_saved(0)
       , pun_duration_min(0)
       , pun_duration_max(0)
-      , pun_interpolation_id(-1) {
+      , pun_interpolation_id(-1)
+      , pun_netto(false)
+      , pun_brutto(false)
+      , pun_fixed(false)
+      , pun_mutable(false)
+      , pun_round_to_next_24h_boundary(false)
+      , pun_round_to_prev_24h_boundary(false)
+      , pun_align_with_timepoint(QDateTime())
+      , pun_next_step_correction(0) {
     }
 
     friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
         QDebugStateSaver saver(debug);
 
         debug.nospace()
-            << "              pun_id: " << td.pun_id << "\n"
+            << "                        pun_id: " << td.pun_id << "\n"
-            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
+            << "                     pun_label: " << QString::fromStdString(td.pun_label) << "\n"
-            << "        pun_duration: " << td.pun_duration << "\n"
+            << "                  pun_duration: " << td.pun_duration << "\n"
-            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
+            << "            pun_duration_saved: " << td.pun_duration_saved << "\n"
-            << "    pun_duration_min: " << td.pun_duration_min << "\n"
+            << "              pun_duration_min: " << td.pun_duration_min << "\n"
-            << "    pun_duration_max: " << td.pun_duration_max << "\n"
+            << "              pun_duration_max: " << td.pun_duration_max << "\n"
-            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
+            << "          pun_interpolation_id: " << td.pun_interpolation_id << "\n"
+            << "                     pun_netto: " << td.pun_netto << "\n"
+            << "                    pun_brutto: " << td.pun_brutto << "\n"
+            << "                     pun_fixed: " << td.pun_fixed << "\n"
+            << "                   pun_mutable: " << td.pun_mutable << "\n"
+            << "pun_round_to_next_24h_boundary: " << td.pun_round_to_next_24h_boundary << "\n"
+            << "pun_round_to_prev_24h_boundary: " << td.pun_round_to_prev_24h_boundary << "\n"
+            << "      pun_align_with_timepoint: " << td.pun_align_with_timepoint << endl;
 
         return debug;
     }
@@ -33,8 +49,16 @@ public:
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
-    int pun_duration_saved;
+	int pun_duration_saved;
-    int pun_duration_min;
+	int pun_duration_min;
-    int pun_duration_max;
+	int pun_duration_max;
-    int pun_interpolation_id;
+	int pun_interpolation_id;
+	bool pun_netto;             // the timestep expressed by this duration is a netto timestep
+	bool pun_brutto;            // the timestep expressed by this duration is a brutto timestep
+	bool pun_fixed;             // the value given in tariff-file is fixed (constant)
+	bool pun_mutable;           // the value could change
+	bool pun_round_to_next_24h_boundary;
+	bool pun_round_to_prev_24h_boundary;
+	QDateTime pun_align_with_timepoint;
+	int pun_next_step_correction;
 };

library/include/mobilisis/member_type.h

@@ -13,16 +13,17 @@ enum MemberType
 	WeekDaysWorkTimeType = 0x06,
 	SpecialDaysWorktimeType = 0x07,
 	SpecialDaysType = 0x08,
-    PeriodYearType = 0x09,
+	PeriodYearType = 0x09,
-    DailyTicketType = 0x0A,
+	DailyTicketType = 0x0A,
-    CustomerType = 0x0B,
+	CustomerType = 0x0B,
-    TimeBaseType = 0x0C,
+	TimeBaseType = 0x0C,
-    TimeRangeType = 0x0D,
+	TimeRangeType = 0x0D,
-    TimeStepConfigType = 0x0E,
+	TimeStepConfigType = 0x0E,
-    ProductType = 0x0F,
+	ProductType = 0x0F,
-    InterpolationType = 0x10,
+	InterpolationType = 0x10,
-    PrepaidType = 0x11,
+	PrepaidType = 0x11, // deprecated
-    CarryOverType = 0x12
+	CarryOverType = 0x12,
+	PrepaidOptionType = 0x13,
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/payment_method.h

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

library/include/mobilisis/payment_opt.h

@@ -25,10 +25,10 @@ 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;
+        pop_prepay_option_id = -1;
         pop_truncate_last_interpolation_step = false;
         pop_accumulate_prices = false;
         pop_accumulate_durations = false;
@@ -42,10 +42,7 @@ 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;
@@ -62,11 +59,11 @@ 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;
-    int pop_prepaid_option_id;
+    int pop_prepaid_option_id; // deprecated
+    int pop_prepay_option_id;
     bool pop_carry_over_target;
     int pop_carry_over_time_range_id;
     int pop_carry_over_start_time_range;
@@ -77,10 +74,7 @@ public:
     bool pop_accumulate_prices;
     bool pop_accumulate_durations;
     int pop_plus_steps;
-    int pop_plus_steps_saved;
     int pop_minus_steps;
-    bool pop_allow_overpay;
-    bool pop_apply_carry_over_to_ticket_endtime;
 
     struct ATBMaxDateTime {
         int direction;

library/include/mobilisis/spec_days_worktime.h

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

library/include/mobilisis/tariff_carryover.h

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

library/include/mobilisis/tariff_carryover_settings.h

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

library/include/mobilisis/tariff_cfg.h

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

library/include/mobilisis/tariff_log.h

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

library/include/mobilisis/tariff_out_of_service.h

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

library/include/mobilisis/tariff_prepaid.h

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

library/include/mobilisis/tariff_prepay.h

@@ -0,0 +1,68 @@
+#ifndef TARIFF_PREPAY_H_INCLUDED
+#define TARIFF_PREPAY_H_INCLUDED
+
+#include <QTime>
+
+struct ATBPrepay {
+    struct week {
+        int day;
+        bool prepaid;       // yes/no
+        QTime start; // only valid if prepaid == true
+        QTime end;
+        int duration;
+    } prepay[8];
+
+    int id;
+
+    friend QDebug operator<<(QDebug debug, ATBPrepay const &pp) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "          id:" << pp.id << "\n"
+            << "        **** Monday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Monday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Monday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Monday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Monday].prepaid << "\n"
+            << "        **** Tuesday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Tuesday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Tuesday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Tuesday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Tuesday].prepaid << "\n"
+            << "        **** Wednesday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Wednesday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Wednesday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Wednesday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Wednesday].prepaid << "\n"
+            << "        **** Thursday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Thursday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Thursday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Thursday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Thursday].prepaid << "\n"
+            << "        **** Friday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Friday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Friday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Friday].end.toString(Qt::ISODate) << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Friday].prepaid << "\n"
+            << "        **** Saturday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Saturday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Saturday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Saturday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Saturday].prepaid << "\n"
+            << "        **** Sunday **** \n"
+            << "         day: " << pp.prepay[(int)Qt::Sunday].day << "\n"
+            << "       start: " << pp.prepay[(int)Qt::Sunday].start.toString(Qt::ISODate) << "\n"
+            << "         end: " << pp.prepay[(int)Qt::Sunday].end.toString(Qt::ISODate) << "\n"
+            << "    duration: " << pp.prepay[(int)Qt::Monday].duration << "\n"
+            << "     prepaid: " << pp.prepay[(int)Qt::Sunday].prepaid << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_CARRYOVER_H_INCLUDED

library/include/mobilisis/tariff_service.h

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

library/include/mobilisis/tariff_settings.h

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

library/include/mobilisis/tariff_timestep_config.h

@@ -6,7 +6,7 @@
 #include <QDebugStateSaver>
 
 struct ATBTimeStepConfig {
-    enum class TimeStepConfig {STATIC=1, DYNAMIC=2};
+    enum class TimeStepConfig {STATIC=1, DYNAMIC=2, RECOMPUTE_SOME=3};
 
     ATBTimeStepConfig() = default;
     int tsconfig_id;

library/include/mobilisis/time_range.h

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

library/include/mobilisis/weekdays.h

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

library/library.pro

@@ -35,28 +35,27 @@ 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 \
+    include/mobilisis/calculator_functions.h \
-	include/mobilisis/duration.h \
+    include/mobilisis/duration.h \
-	include/mobilisis/payment_opt.h \
+    include/mobilisis/payment_opt.h \
-	include/mobilisis/spec_days.h \
+    include/mobilisis/spec_days.h \
-	include/mobilisis/utilities.h \
+    include/mobilisis/utilities.h \
-	include/mobilisis/configuration.h \
+    include/mobilisis/configuration.h \
-	include/mobilisis/member_type.h \
+    include/mobilisis/member_type.h \
-	include/mobilisis/payment_option.h \
+    include/mobilisis/payment_option.h \
-	include/mobilisis/spec_days_worktime.h \
+    include/mobilisis/spec_days_worktime.h \
-	include/mobilisis/weekdays.h \
+    include/mobilisis/weekdays.h \
-	include/mobilisis/currency.h \
+    include/mobilisis/currency.h \
-	include/mobilisis/payment_method.h \
+    include/mobilisis/payment_method.h \
-	include/mobilisis/payment_rate.h \
+    include/mobilisis/payment_rate.h \
-	include/mobilisis/time_range.h \
+    include/mobilisis/time_range.h \
-	include/mobilisis/weekdays_worktime.h \
+    include/mobilisis/weekdays_worktime.h \
-	include/mobilisis/day_of_week.h \
+    include/mobilisis/day_of_week.h \
-	include/mobilisis/payment_mtd.h \
+    include/mobilisis/payment_mtd.h \
-	include/mobilisis/period_year.h \
+    include/mobilisis/period_year.h \
     include/mobilisis/time_range_header.h \
     include/mobilisis/tariff_cfg.h \
     include/mobilisis/tariff_calc.h \
@@ -90,15 +89,14 @@ 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_prepay.h \
-    include/mobilisis/atb_time.h \
+    include/mobilisis/tariff_global_defines.h
-    include/mobilisis/tariff_service.h \
-    include/mobilisis/tariff_out_of_service.h
 
-OTHER_FILES += src/main.cpp \
+# OTHER_FILES += src/main.cpp \
-    ../tariffs/tariff_korneuburg.json \
+#    ../tariffs/tariff_korneuburg.json \
-    ../tariffs/tariff_linsinger_maschinenbau.json \
+#    ../tariffs/tariff_linsinger_maschinenbau.json \
-    ../tariffs/tariff_naz.json
+#    ../tariffs/tariff_naz.json \
+#    /home/linux/customer_502/etc/psa_tariff/tariff03.json
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

library/src/atb_time.cpp

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

library/src/calculate_price.cpp

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

library/src/calculate_price.cpp.stashed

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

library/src/utilities.cpp

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

main/main.cpp

@@ -39,7 +39,7 @@ extern "C" char* strptime(const char* s,
 
 #define SZEGED                                  (0)
 #define SCHOENAU_KOENIGSEE                      (0)
-#define NEUHAUSER_KORNEUBURG                    (1)
+#define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
@@ -51,8 +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                              (0)
+#define VALSER_ALM                              (1)
-#define NEUHAUSER_FORCHACH                      (0)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -340,20 +339,20 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        //pop_min_time = get_minimal_parkingtime(&cfg);
+        pop_min_time = get_minimal_parkingtime(&cfg);
-        //pop_max_time = get_maximal_parkingtime(&cfg);
+        pop_max_time = get_maximal_parkingtime(&cfg);
-        //pop_min_price = get_minimal_parkingprice(&cfg);
+        pop_min_price = get_minimal_parkingprice(&cfg);
-        //pop_max_price = get_maximal_parkingprice(&cfg);
+        pop_max_price = get_maximal_parkingprice(&cfg);
-        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+        pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
-        //qCritical() << "        pop_min_time: " << pop_min_time;
+        qCritical() << "        pop_min_time: " << pop_min_time;
-        //qCritical() << "        pop_max_time: " << pop_max_time;
+        qCritical() << "        pop_max_time: " << pop_max_time;
-        //qCritical() << "       pop_min_price: " << pop_min_price;
+        qCritical() << "       pop_min_price: " << pop_min_price;
-        //qCritical() << "       pop_max_price: " << pop_max_price;
+        qCritical() << "       pop_max_price: " << pop_max_price;
 
 
-        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-        //qCritical() << "TimeSteps" << timeSteps;
+        qCritical() << "TimeSteps" << timeSteps;
 
         // return 0;
 
@@ -364,7 +363,8 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 8, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime s(QDate(2024, 7, 29 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime end;
 
             switch (day) {
             case (int)Qt::Monday:
@@ -390,30 +390,6 @@ 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(
@@ -756,7 +732,7 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    int zone = 1;
+    int zone = 3;
 
     if (zone == 1) {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
@@ -765,7 +741,14 @@ int main() {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json");
     }
     if (zone == 3) {
-        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json");
+        //input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json");
+        //input.open("/home/linux/customer_502/etc/psa_tariff/tariff01.json");
+
+        // schnals
+        // input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+
+        // muehlbach
+        input.open("/opt/ptu5/opt/customer_504/etc/psa_tariff/tariff01.json");
     }
 
     std::stringstream sstr;
@@ -845,7 +828,7 @@ int main() {
             CalcState calcState;
             QDateTime s(QDateTime::currentDateTime());
 
-            // s.setTime(QTime(12, 0, 0));
+            s.setTime(QTime(12, 0, 0));
 
             //calcState = compute_duration_for_parking_ticket(&cfg, s,
             //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
@@ -853,26 +836,9 @@ int main() {
             //qCritical() << calcState.toString();
 
             calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                (double)9000, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
             qCritical() << end.toString(Qt::ISODate);
             qCritical() << calcState.toString();
-
-            struct price_t costs;
-
-            CalcState cs;
-
-            for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
-                QDateTime end = start.addSecs(timeSteps.at(i)*60);
-
-                qCritical() << "XXXXX end" << end.toString(Qt::ISODate);
-
-                cs = compute_price_for_parking_ticket(&cfg, s, timeSteps.at(i), end, &costs,
-                                                      PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-                if (cs.getStatus() != CalcState::State::SUCCESS) {
-                    qCritical() << "ERROR STATUS" << costs.netto;
-                    exit(-1);
-                }
-            }
         }
 
         if (zone == 2) {
@@ -941,7 +907,7 @@ int main() {
             int Down = 0;
             int Up = 1;
 
-            QDateTime const start = QDateTime::currentDateTime();
+            QDateTime start = QDateTime::currentDateTime();
             int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
 
             if (paymentOptionIndex != 0) {
@@ -954,17 +920,61 @@ int main() {
             //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
 
             QDateTime end;
-            CalcState calcState;
 
             QDateTime s(QDateTime::currentDateTime());
-            s.setTime(QTime(12, 0, 0));
+            s.setTime(QTime(10, 0, 0));
-
+
-            int minimal_parking_price = get_minimal_parkingprice(&cfg,
+#if 0
-                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+
-                                                                 paymentOptionIndex, s);
+            pop_min_time = get_minimal_parkingtime(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
+            pop_max_time = get_maximal_parkingtime(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
+
+            pop_min_price = get_minimal_parkingprice(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex, s);
+            pop_max_price = get_maximal_parkingprice(&cfg, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING), paymentOptionIndex);
+
+            pop_daily_card_price = cfg.getPaymentOptions(paymentOptionIndex).pop_daily_card_price;
+
+            int h = pop_min_time / 60;
+            int m = pop_min_time % 60;
+            qCritical().noquote() << QString("         pop_min_time %1 (%2h, %3m)").arg(pop_min_time).arg(h).arg(m);
+
+            h = pop_max_time / 60;
+            m = pop_max_time % 60;
+            qCritical().noquote()
+               << QString("         pop_max_time %1 (%2h, %3m)").arg(pop_max_time).arg(h).arg(m);
+
+            qCritical() << "       pop_min_price " << pop_min_price;
+            qCritical() << "       pop_max_price " << pop_max_price;
+            qCritical() << "pop_daily_card_price " << pop_daily_card_price;
+#endif
+            CalcState calcState;
+
+#if 1
+            qCritical() << "start" << s.toString(Qt::ISODate);
+            //for (int i = 1; i < 11; ++i) {
+            for (int i = 0; i < 21; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)i*10,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << ": start" << s.toString(Qt::ISODate)
+                            << ": price" << i*10 << "->" << end.toString(Qt::ISODate) << calcState.toString();
+            }
+#else
+            struct price_t price;
+            int netto_parking_time = 1440;
+
+            start = s;
+            qCritical() << "RUN" << 0 << ": start" << s.toString(Qt::ISODate);
+
+            calcState = compute_price_for_parking_ticket(&cfg, start, netto_parking_time,
+                                                         end, &price,
+                                                         PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            qCritical() << "RUN" << 0 << ": start" << start.toString(Qt::ISODate)
+                        << ": price for netto-time" << netto_parking_time
+                        << "->" << price.netto << "->" << end.toString(Qt::ISODate) << calcState.toString();
+#endif
 
 #if 0
-            qCritical() << "minimal parking price" << minimal_parking_price;
 
             for (int i = 0; i < 8; ++i) {
                 calcState = compute_duration_for_parking_ticket(&cfg, s,
@@ -973,11 +983,11 @@ int main() {
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 
-#else
+// #else
-            s.setTime(QTime(15, 0, 0));
+            s.setTime(QTime(12, 0, 0));
 
             minimal_parking_price = get_minimal_parkingprice(&cfg,
-                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS),
                                                              paymentOptionIndex, s);
 
             qCritical() << "minimal parking price" << minimal_parking_price;
@@ -985,7 +995,7 @@ int main() {
             for (int i = 0; i < 8; ++i) {
                 calcState = compute_duration_for_parking_ticket(&cfg, s,
                                                     (double)minimal_parking_price + i*800,
-                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 #endif
@@ -1387,29 +1397,6 @@ int main() {
             }
         }
 
-#endif
-#if NEUHAUSER_FORCHACH==1
-    std::ifstream input;
-    input.open("/opt/ptu5/opt/customer_749/etc/psa_tariff/tariff01.json");
-
-    std::stringstream sstr;
-    while(input >> sstr.rdbuf());
-    std::string json(sstr.str());
-
-    Configuration cfg;
-
-    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
-    cout << endl;
-
-    if (isParsed) {
-        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_PKW));
-        compute_product_price(&cfg, PermitType(PERMIT_TYPE::DAY_TICKET_CAMPER));
-
-        QDateTime start = QDateTime::currentDateTime();
-        QDateTime ticketEndTime;
-        compute_duration_for_daily_ticket(&cfg, start, ticketEndTime, PermitType(PERMIT_TYPE::DAY_TICKET));
-    }
-
 #endif
 #if BAD_NEUENAHR_AHRWEILER==1
     std::ifstream input;
@@ -1421,7 +1408,7 @@ int main() {
     int pop_carry_over;
     int pop_carry_over_time_range_id;
 
-    for (int zone=2; zone < 3; ++zone) {
+    for (int zone=1; zone < 2; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
@@ -1430,10 +1417,8 @@ int main() {
             //pop_max_time = 6*60;
         } break;
         case 2: {
-            qCritical() << "        ZONE 2: KURZZEIT 1";
             // kuzzeit-1-tarif
-            //input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
+            input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
-            input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json");
             //pop_max_time = 5*60;
         } break;
         case 3: {
@@ -1474,7 +1459,6 @@ int main() {
         cout << endl;
 
         if (isParsed) {
-
             // test library functions
 
             if (zone == 1) {
@@ -1501,10 +1485,10 @@ int main() {
                 static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
                 qCritical() << "TimeSteps" << timeSteps;
 
-                //if (stepsConfigured != timeSteps) {
+                if (stepsConfigured != timeSteps) {
-                //    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
-                //    return -1;
+                    return -1;
-                //}
+                }
 
                 QDateTime start = QDateTime::currentDateTime();
 
@@ -1512,8 +1496,7 @@ 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);
 
@@ -1530,7 +1513,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);
 
@@ -1565,21 +1548,6 @@ 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) {
@@ -1617,20 +1585,18 @@ int main() {
                 bool fail;
                 QDateTime start;
 
-                for (int i=1; i < 2; ++i) {
+                for (int i=0; i < 4; ++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, 10, 3), QTime(17, 0, 0)); // sunday
+                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
-                        //start = QDateTime(QDate(2025, 4, 20), QTime(18, 0, 0)); // sunday
-                        start = QDateTime(QDate(2024, 9, 27), QTime(17, 0, 0)); // friday
                         fail = false;
                     break;
                     case 2:
-                        start = QDateTime(QDate(2024, 4, 22), QTime(17, 30, 0)); // monday
+                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0)); // monday
                         fail = false;
                     break;
                     case 3:
@@ -1654,52 +1620,18 @@ 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;
 
-                            QDateTime s(start);
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
-
-                            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() << __LINE__
+                                qCritical() << "step" << *step << ": cost" << cost;
-                                            << "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;
@@ -2804,62 +2736,24 @@ int main() {
             bool nextDay = false;
             bool prePaid = true;
             // zone 1 (lila)
-            QDateTime s(QDate(2024, 10, 8), QTime());
+            QDateTime s(QDate(2023, 11, 30), QTime());
             QDateTime end;
-
-            static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-            qCritical() << "TimeSteps" << timeSteps;
-
             for (int duration = 30; duration <= pop_max_time; duration += 5) {
-                int offset = 600;
+                for (int offset = 420; offset < 1140; ++offset) {
-                //for (int offset = 720; offset < 601; ++offset) {
+                    if (offset > 720 && offset < 840) {
-                    //if (offset > 720 && offset < 840) {
+                        continue;
-                    //    continue;
+                    }
-                    //}
                     QDateTime start = s.addSecs(offset * 60);
                     //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                    CalcState cs;
+                    double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
-#if 1
-                    struct price_t costs;
-                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
-                        QDateTime end = start.addSecs(timeSteps.at(i)*60);
-
-                        // if (i != 2) continue;
-
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-                        int price1 = costs.netto;
-
-                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "ZZZZZZZZZZZZZ PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
-                    }
-                    exit(0);
-#else
-
-                    double cost = 360;
-                    qCritical() << "XXXXXXXX START" << start.toString(Qt::ISODate) << "cost" << cost;
-                    QDateTime end;
-
-                    cs = compute_duration_for_parking_ticket(&cfg, start, cost, end,
-                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-                        qCritical() << __LINE__ << cs.toString()
-                                    << "START" << start.toString(Qt::ISODate)
-                                    << "<duration" << start.secsTo(end) / 60
-                                    << "cost" << cost
-                                    << "> end" << end.toString(Qt::ISODate);
-                    //}
-
-                    exit(0);
-#endif
-
-                    //double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "";
-                    //qCritical() << "start" << start.toString(Qt::ISODate)
+                    qCritical() << "start" << start.toString(Qt::ISODate)
-                    //            << "end" << end.toString(Qt::ISODate)
+                                << "end" << end.toString(Qt::ISODate)
-                    //            << "duration" << duration
+                                << "duration" << duration
-                    //            << "cost" << cost;
+                                << "cost" << cost;
-#if 0
+
                     switch(duration) {
                     case 30:
                         if (cost == 60.0) {
@@ -3023,17 +2917,15 @@ int main() {
                                     << "cost" << cost;
                         exit(-1);
                     }
-#endif
 
                     //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "start" << start.toString(Qt::ISODate)
                     //            << "cost" << cost
                     //            << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
-                //}
+                }
             }
 
-#if 0
             Configuration::SpecialDaysType specialDays = cfg.SpecialDays;
             for (Configuration::SpecialDaysType::const_iterator it = specialDays.cbegin();
                  it != specialDays.cend(); ++it) {
@@ -3054,7 +2946,7 @@ int main() {
                             << "duration" << duration
                             << "cost" << cost;
             }
-#endif
+
         }
     }
     return 0;

main/main.pro

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