Added test cases for Fuchs/Schnals

GetDurationFromCost():
Minor: changed some debug output.
2024-08-13 14:55:18 +02:00 · 2024-08-13 14:55:13 +02:00 · 2024-08-13 14:54:59 +02:00 · 2024-08-13 14:54:48 +02:00 · 2024-08-13 14:51:55 +02:00 · 2024-08-02 14:37:42 +02:00
23 changed files with 3317 additions and 1506 deletions
--- a/library/include/mobilisis/calculate_price.h
+++ b/library/include/mobilisis/calculate_price.h
@@ -266,7 +266,8 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);

-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
+                                                int UpDown, PermitType const &permitType);

 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);

@@ -297,7 +298,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            time_t end_parking_time,
-                                            struct price_t *price);
+                                            struct price_t *price,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            parking_tariff_t *tariff,
@@ -305,24 +307,28 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                            int netto_parking_time,
                                            QDateTime &end_parking_time,    // return value
                                            struct price_t *price,          // return value
+                                            PermitType permitType,
                                            bool prepaid = true);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                            parking_tariff_t *tariff,
                                            time_t start_parking_time,
                                            double cost,
-                                            QString &duration);
+                                            QString &duration,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
                                            double cost,
-                                            QDateTime &ticketEndTime);      // return value
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);      // return value

 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                            parking_tariff_t *tariff,
                                            QDateTime const &start_parking_time,
-                                            QDateTime &ticketEndTime);
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);

 CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                            parking_tariff_t *tariff,
--- a/library/include/mobilisis/calculator_functions.h
+++ b/library/include/mobilisis/calculator_functions.h
@@ -40,12 +40,12 @@ public:
    }

    void ResetTimeSteps(int paymentOptionIndex) {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            m_timeSteps[paymentOptionIndex].clear();
        }
    }
    QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0) {
+        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
            return m_timeSteps[paymentOptionIndex];
        }
        return QList<int>();
@@ -70,7 +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::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price, bool nextDay = false, bool prepaid = false);
+    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+                                    PermitType permitType, bool nextDay = false, bool prepaid = false);

 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -81,7 +82,8 @@ public:
    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
+                               PermitType permitType, bool nextDay = false, bool prepaid = false);

    // Daily ticket
    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
@@ -91,8 +93,10 @@ public:
    // helper function to find time steps for a tariff with PaymentMethod::Steps
    // (e.g. Schoenau/Koenigsee)
    //
-    QList<int> GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
+    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const;
+    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const {
+        return GetTimeSteps(cfg, paymentOptionIndex, start);
+    }

    QList<int> GetPriceSteps(Configuration *cfg) const;

@@ -129,10 +133,10 @@ private:
                              int durationMinutes);

    //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
-    }
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
+    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+    //    return GetPriceForTimeStep(cfg, step, 0);
+    //}
    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
        return GetDurationForPrice(cfg, price);
--- a/library/include/mobilisis/configuration.h
+++ b/library/include/mobilisis/configuration.h
@@ -25,6 +25,10 @@
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
 #include "tariff_product.h"
+#include "tariff_interpolation.h"
+#include "tariff_prepaid.h"
+#include "tariff_carryover.h"
+#include "tariff_permit_type.h"

 #include <QVector>
 #include <optional>
@@ -41,26 +45,33 @@ public:
    using TimeRangeType = std::multimap<int, ATBTimeRange>;
    using TariffProductType = std::multimap<int, ATBTariffProduct>;
    using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
+    using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
+    using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
+    using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+    using TariffDurationType = std::multimap<int, ATBDuration>;

    ATBProject project;
    ATBCurrency Currency;
-	ATBDuration duration;
+    ATBDuration duration;

-	multimap<int, ATBDuration> Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
-    SpecialDaysWorktimeType SpecialDaysWorktime;
-    SpecialDaysType SpecialDays;
+	SpecialDaysWorktimeType SpecialDaysWorktime;
+	SpecialDaysType SpecialDays;
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-    ATBPaymentOptionType PaymentOption;
-    multimap<int, ATBDailyTicket> DailyTicket;
-    TimeRangeType TimeRange;
-    multimap<int, ATBTimeStepConfig> TimeStepConfig;
-    multimap<int, ATBTimeBase> TimeBase;
-    multimap<int, ATBCustomer> Customer;
-    TariffProductType TariffProduct;
+	ATBPaymentOptionType PaymentOption;
+	multimap<int, ATBDailyTicket> DailyTicket;
+	TimeRangeType TimeRange;
+	multimap<int, ATBTimeStepConfig> TimeStepConfig;
+	multimap<int, ATBTimeBase> TimeBase;
+	multimap<int, ATBCustomer> Customer;
+	TariffProductType TariffProduct;
+	TariffInterpolationType TariffInterpolations;
+	TariffPrepaidType TariffPrepaidOptions;
+	TariffCarryOverType TariffCarryOverOptions;

 	/// <summary>
 	/// Parse JSON string
@@ -82,15 +93,28 @@ public:
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime const &dt) const;
    bool isDayIncludedAsSpecialDay(uint64_t businessHours, int specialDayId) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
+    std::optional<QVector<ATBPaymentOption>> getPaymentOptionsForAllKeys() const;
+    std::optional<ATBPaymentOption> getPaymentOptionForId(int key) const;
    std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(PERMIT_TYPE permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(int permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(QString const &permitType) const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<ATBInterpolation> getInterpolationType(int type) const;
+    std::optional<QDateTime> getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const;
+    std::optional<ATBPrepaid> getPrepaidType(int type) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
    std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
    std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
+    std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
+
+    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;

 private:
 	/// <summary>
@@ -100,5 +124,5 @@ private:
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);

-    QVector<ATBPaymentOption> currentPaymentOptions;
+	QVector<ATBPaymentOption> currentPaymentOptions;
 };
--- a/library/include/mobilisis/duration.h
+++ b/library/include/mobilisis/duration.h
@@ -1,11 +1,40 @@
 #include <string>

+#include <QDebug>
+
 class ATBDuration
 {
 public:
+    explicit ATBDuration()
+      : pun_id(0)
+      , pun_label("")
+      , pun_duration(0)
+      , pun_duration_saved(0)
+      , pun_duration_min(0)
+      , pun_duration_max(0)
+      , pun_interpolation_id(-1) {
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "              pun_id: " << td.pun_id << "\n"
+            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
+            << "        pun_duration: " << td.pun_duration << "\n"
+            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
+            << "    pun_duration_min: " << td.pun_duration_min << "\n"
+            << "    pun_duration_max: " << td.pun_duration_max << "\n"
+            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
+
+        return debug;
+    }
+
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
+    int pun_duration_saved;
    int pun_duration_min;
    int pun_duration_max;
+    int pun_interpolation_id;
 };
--- a/library/include/mobilisis/member_type.h
+++ b/library/include/mobilisis/member_type.h
@@ -19,7 +19,10 @@ enum MemberType
    TimeBaseType = 0x0C,
    TimeRangeType = 0x0D,
    TimeStepConfigType = 0x0E,
-    ProductType = 0x0F
+    ProductType = 0x0F,
+    InterpolationType = 0x10,
+    PrepaidType = 0x11,
+    CarryOverType = 0x12
 };

 #endif // MEMBER_TYPE_H_INCLUDED
--- a/library/include/mobilisis/payment_opt.h
+++ b/library/include/mobilisis/payment_opt.h
@@ -15,6 +15,8 @@ public:
    void reset() {
        pop_id = 0;
        pop_label = "";
+        pop_product_id = -1;
+        pop_product_name = "";
        pop_payment_method_id = 0;
        pop_day_end_time = "";
        pop_day_night_end_time = "";
@@ -24,6 +26,11 @@ public:
        pop_min_price = 0;
        pop_max_price = 0;
        pop_carry_over = -1;
+        pop_carry_over_option_id = -1;
+        pop_prepaid_option_id = -1;
+        pop_truncate_last_interpolation_step = false;
+        pop_accumulate_prices = false;
+        pop_accumulate_durations = false;
        pop_carry_over_target = false;
        pop_carry_over_time_range_id = -1;
        pop_carry_over_start_time_range = -1;
@@ -31,11 +38,19 @@ public:
        pop_daily_card_price = -1;
        pop_business_hours = -1;
        pop_time_step_config = -1;
+        pop_use_only_upto_datetime = ""; // deprecated
+        pop_use_only_for_duration = 0;   // deprecated
+        pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_minus_steps = 1; // -: jump <x=1> steps backward
    }

    int pop_id;
    std::string pop_label;
+    int pop_product_id;
+    QString pop_product_name;
    int pop_payment_method_id;
+    QString pop_use_only_upto_datetime;
+    int pop_use_only_for_duration;
    std::string pop_day_end_time;
    std::string pop_day_night_end_time;
    double pop_price_night;
@@ -44,6 +59,9 @@ public:
    double pop_min_price;
    double pop_max_price;
    int pop_carry_over;
+    int pop_carry_over_option_id;
+    bool pop_truncate_last_interpolation_step;
+    int pop_prepaid_option_id;
    bool pop_carry_over_target;
    int pop_carry_over_time_range_id;
    int pop_carry_over_start_time_range;
@@ -51,6 +69,10 @@ public:
    int pop_daily_card_price;
    uint64_t pop_business_hours;
    int pop_time_step_config;
+    bool pop_accumulate_prices;
+    bool pop_accumulate_durations;
+    int pop_plus_steps;
+    int pop_minus_steps;

    struct ATBMaxDateTime {
        int direction;
--- a/library/include/mobilisis/tariff_carryover.h
+++ b/library/include/mobilisis/tariff_carryover.h
@@ -0,0 +1,76 @@
+#ifndef TARIFF_CARRYOVER_H_INCLUDED
+#define TARIFF_CARRYOVER_H_INCLUDED
+
+#include <QTime>
+
+struct ATBCarryOver {
+    struct week {
+        int day;
+        bool seemless;
+        bool never;
+        QTime static_start;
+        QTime static_end;
+        int duration;
+    } carryover[8];
+
+    int id;
+
+    friend QDebug operator<<(QDebug debug, ATBCarryOver const &co) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id:" << co.id << "\n"
+            << "        **** Monday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Monday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Monday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Monday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Monday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Monday].never << "\n"
+            << "        **** Tuesday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Tuesday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Tuesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Tuesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Tuesday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Tuesday].never << "\n"
+            << "        **** Wednesday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Wednesday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Wednesday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Wednesday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Wednesday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Wednesday].never << "\n"
+            << "        **** Thursday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Thursday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Thursday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Thursday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Thursday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Thursday].never << "\n"
+            << "        **** Friday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Friday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Friday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Friday].static_end.toString(Qt::ISODate) << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Friday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Friday].never << "\n"
+            << "        **** Saturday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Saturday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Saturday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Saturday].never << "\n"
+            << "        **** Sunday **** \n"
+            << "                day: " << co.carryover[(int)Qt::Sunday].day << "\n"
+            << "       static_start: " << co.carryover[(int)Qt::Sunday].static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << co.carryover[(int)Qt::Sunday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::Monday].duration << "\n"
+            << "            anytime: " << co.carryover[(int)Qt::Sunday].seemless << "\n"
+            << "              never: " << co.carryover[(int)Qt::Sunday].never << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_CARRYOVER_H_INCLUDED
--- a/library/include/mobilisis/tariff_global_defines.h
+++ b/library/include/mobilisis/tariff_global_defines.h
@@ -3,4 +3,18 @@

 #define DBG_HEADER "(" << __func__ << ":" << __LINE__ << ")"

+#define DBG_EMERGENCY   (0) // System is unusable
+#define DBG_ALERT       (1) // Action must be taken immediately
+#define DBG_CRITICAL    (2) // Critical conditions
+#define DBG_ERROR       (3) // Error conditions
+#define DBG_WARNING     (4) // Warning conditions
+#define DBG_NOTICE      (5) // Normal but significant conditions
+                            // Conditions that are not error conditions, but that may require special handling
+#define DBG_INFORMATION (6) // Informational messages
+                            // Confirmation that the program is working as expected
+#define DBG_DEBUG       (7) // Debug-level messages
+                            // Messages that contain information normally of use only when debugging a program
+
+extern int DBG_LEVEL;
+
 #endif // TARIFF_GLOBAL_DEFINES_H_INCLUDED
--- a/library/include/mobilisis/tariff_interpolation.h
+++ b/library/include/mobilisis/tariff_interpolation.h
@@ -0,0 +1,95 @@
+#ifndef TARIFF_INTERPOLATION_H_INCLUDED
+#define TARIFF_INTERPOLATION_H_INCLUDED
+
+#include <QTime>
+#include <QString>
+
+struct ATBInterpolation {
+
+    enum Type {
+        NO_INTERPOLATION = 1,
+        STATIC_WALLCLOCK_TIME_VALUES = 2,
+        STATIC_TIMEPOINT_AND_DURATION = 3,
+        DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
+    };
+
+    static QString name(int i) {
+        switch(i) {
+        case (int)(NO_INTERPOLATION):
+            return QString("%1: NO_INTERPOLATION").arg(i);
+        case (int)(STATIC_WALLCLOCK_TIME_VALUES):
+            return QString("%1: STATIC_WALLCLOCK_TIME_VALUES").arg(i);
+        case (int)(STATIC_TIMEPOINT_AND_DURATION):
+            return QString("%1: STATIC_TIMEPOINT_AND_DURATION").arg(i);
+        case (int)(DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
+            return QString("%1: DYNAMIC_TIMEPOINT_AND_STATIC_DURATION").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE").arg(i);
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
+            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME").arg(i);
+        default:;
+        }
+        return "ERROR";
+    }
+
+    explicit ATBInterpolation()
+      : id(0)
+      , static_start(QTime())
+      , static_end(QTime())
+      , static_start_str(QString())
+      , static_end_str(QString())
+      , static_duration(0)
+      , dynamic_start(QTime())
+      , dynamic_end(QTime())
+      , dynamic_start_str(QString())
+      , dynamic_end_str(QString())
+      , dynamic_duration(0)
+      , dynamic_until_price(0)
+      , seemless(false)
+      , never(false) {
+    }
+
+    int id;
+    QTime static_start;
+    QTime static_end;
+    QString static_start_str;
+    QString static_end_str;
+    int static_duration;
+    QTime dynamic_start;
+    QTime dynamic_end;
+    QString dynamic_start_str;
+    QString dynamic_end_str;
+    int dynamic_duration;
+    int dynamic_until_price;
+    bool seemless;
+    bool never;
+
+    friend QDebug operator<<(QDebug debug, ATBInterpolation const &i) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id: " << name(i.id) << "\n"
+            << "       static_start: " << i.static_start.toString(Qt::ISODate) << "\n"
+            << "         static_end: " << i.static_end.toString(Qt::ISODate) << "\n"
+            << "   static_start_str: " << i.static_start_str << "\n"
+            << "     static_end_str: " << i.static_end_str << "\n"
+            << "    static_duration: " << i.static_duration << "\n"
+            << "      dynamic_start: " << i.dynamic_start.toString(Qt::ISODate) << "\n"
+            << "        dynamic_end: " << i.dynamic_end.toString(Qt::ISODate) << "\n"
+            << "  dynamic_start_str: " << i.dynamic_start_str << "\n"
+            << "    dynamic_end_str: " << i.dynamic_end_str << "\n"
+            << "   dynamic_duration: " << i.dynamic_duration << "\n"
+            << "dynamic_until_price: " << i.dynamic_until_price << "\n"
+            << "           seemless: " << i.seemless << "\n"
+            << "              never: " << i.never << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_INTERPOLATION_H_INCLUDED
--- a/library/include/mobilisis/tariff_permit_type.h
+++ b/library/include/mobilisis/tariff_permit_type.h
@@ -13,7 +13,13 @@ enum class PERMIT_TYPE : quint8 {
    DAY_TICKET_CHILD=6,
    INVALID=7,
    FOOD_STAMP=8,
-    TWENTY_FOUR_HOURS_TICKET=9
+    TWENTY_FOUR_HOURS_TICKET=9,
+    SHORT_TERM_PARKING_PKW=10,
+    SHORT_TERM_PARKING_BUS=11,
+    SHORT_TERM_PARKING_CAMPER=12,
+    DAY_TICKET_PKW=13,
+    DAY_TICKET_BUS=14,
+    DAY_TICKET_CAMPER=15
 };

 struct PermitType {
@@ -43,12 +49,30 @@ struct PermitType {
        case 6:
            m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
            break;
-        case 7:
+        case 8:
            m_permitType = PERMIT_TYPE::FOOD_STAMP;
            break;
-        case 8:
+        case 9:
            m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
            break;
+        case 10:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
+            break;
+        case 11:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
+            break;
+        case 12:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
+            break;
+        case 13:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_PKW;
+            break;
+        case 14:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_BUS;
+            break;
+        case 15:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
+            break;
        default:
            m_permitType = PERMIT_TYPE::INVALID;
        }
@@ -77,14 +101,78 @@ struct PermitType {
        case PERMIT_TYPE::DAY_TICKET_TEEN:
            return 6;
        case PERMIT_TYPE::FOOD_STAMP:
-            return 7;
-        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return 8;
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return 9;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return 10;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return 11;
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return 12;
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return 13;
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return 14;
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return 15;
        default:
            break;
        }
        return 7;
+    }

+    static PERMIT_TYPE toPermitType(QString const permitTypeStr) {
+        if (permitTypeStr == "DAY_TICKET") {
+            return PERMIT_TYPE::DAY_TICKET;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CHILD") {
+            return PERMIT_TYPE::DAY_TICKET_CHILD;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_TEEN") {
+            return PERMIT_TYPE::DAY_TICKET_TEEN;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING;
+        } else
+        if (permitTypeStr == "SZEGED_START") {
+            return PERMIT_TYPE::SZEGED_START;
+        } else
+        if (permitTypeStr == "SZEGED_STOP") {
+            return PERMIT_TYPE::SZEGED_STOP;
+        } else
+        if (permitTypeStr == "FOOD_STAMP") {
+            return PERMIT_TYPE::FOOD_STAMP;
+        } else
+        if (permitTypeStr == "TWENTY_FOUR_HOURS_TICKET") {
+            return PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_PKW") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_BUS") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_CAMPER") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
+        } else
+        if (permitTypeStr == "DAY_TICKET_PKW") {
+            return PERMIT_TYPE::DAY_TICKET_PKW;
+        } else
+        if (permitTypeStr == "DAY_TICKET_BUS") {
+            return PERMIT_TYPE::DAY_TICKET_BUS;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CAMPER") {
+            return PERMIT_TYPE::DAY_TICKET_CAMPER;
+        }
+
+        return PERMIT_TYPE::INVALID;
    }

    QString toString() {
@@ -107,6 +195,18 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return QString("SHORT_TERM_PARKING_PKW");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return QString("SHORT_TERM_PARKING_BUS");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return QString("SHORT_TERM_PARKING_CAMPER");
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return QString("DAY_TICKET_PKW");
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return QString("DAY_TICKET_BUS");
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
@@ -133,6 +233,18 @@ struct PermitType {
            return QString("FOOD_STAMP");
        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
            return QString("TWENTY_FOUR_HOURS_TICKET");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+            return QString("SHORT_TERM_PARKING_PKW");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+            return QString("SHORT_TERM_PARKING_BUS");
+        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+            return QString("SHORT_TERM_PARKING_CAMPER");
+        case PERMIT_TYPE::DAY_TICKET_PKW:
+            return QString("DAY_TICKET_PKW");
+        case PERMIT_TYPE::DAY_TICKET_BUS:
+            return QString("DAY_TICKET_BUS");
+        case PERMIT_TYPE::DAY_TICKET_CAMPER:
+            return QString("DAY_TICKET_CAMPER");
        default:
            break;
        }
--- a/library/include/mobilisis/tariff_prepaid.h
+++ b/library/include/mobilisis/tariff_prepaid.h
@@ -0,0 +1,29 @@
+#ifndef TARIFF_PREPAID_H_INCLUDED
+#define TARIFF_PREPAID_H_INCLUDED
+
+#include <QTime>
+#include <QString>
+
+struct ATBPrepaid {
+    explicit ATBPrepaid() = default;
+    int id;
+    bool anytime;
+    bool never;
+    QTime static_start;
+    QTime static_end;
+
+    friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                 id: " << pp.id << "\n"
+            << "       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";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_PREPAID_H_INCLUDED
--- a/library/include/mobilisis/utilities.h
+++ b/library/include/mobilisis/utilities.h
@@ -3,6 +3,7 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
+#include <optional>

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

 	/// <summary>
 	/// Check permissions
--- a/library/include/mobilisis/weekdays_worktime.h
+++ b/library/include/mobilisis/weekdays_worktime.h
@@ -4,8 +4,10 @@
 class ATBWeekDaysWorktime
 {
 public:
-	int pwd_id;
-	int pwd_period_week_day_id;
+    int pwd_id;
+    int pwd_pop_id;
+    int pwd_next_id;
+    int pwd_period_week_day_id;
 	int pwd_period_day_in_week_id;
 	std::string pwd_time_from;
 	std::string pwd_time_to;
--- a/library/library.pro
+++ b/library/library.pro
@@ -34,7 +34,8 @@ SOURCES += \
    src/configuration.cpp \
    src/tariff_log.cpp \
    src/calculate_price.cpp \
-    src/ticket.cpp
+    src/ticket.cpp \
+    src/tariff_global_defines.cpp

 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -84,6 +85,10 @@ HEADERS += \
    include/mobilisis/tariff_timestep_config.h \
    include/mobilisis/tariff_product.h \
    include/mobilisis/tariff_permit_type.h \
+    include/mobilisis/tariff_global_defines.h \
+    include/mobilisis/tariff_interpolation.h \
+    include/mobilisis/tariff_prepaid.h \
+    include/mobilisis/tariff_carryover.h \
    include/mobilisis/tariff_global_defines.h

 OTHER_FILES += src/main.cpp \
--- a/library/src/calculate_price.cpp
+++ b/library/src/calculate_price.cpp
@@ -3,6 +3,8 @@
 #include "calculator_functions.h"
 #include "payment_option.h"
 #include "utilities.h"
+#include "tariff_global_defines.h"
+#include "period_year.h"

 #include <QFile>
 #include <QFileInfo>
@@ -34,9 +36,17 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                  int paymentOptionIndex) {
    int minTime = 0;

+    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
+
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+
+    qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+
    switch(permitType) {
    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
        minTime = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+        qCritical() << __func__ << __LINE__ << minTime;
    } break;
    case PERMIT_TYPE::DAY_TICKET_ADULT: {
    } break;
@@ -48,16 +58,19 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
        // for each new sell-procedure, recomute the timesteps. implicitly, set
        // the minimal parking time.
        Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
-        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
        minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
    }

+    qCritical() << "minTime" << minTime;
    return minTime;
 }

 int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                  PERMIT_TYPE permitType,
                                                  int paymentOptionIndex) {
+
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
    int maxTime = 0;

    switch(permitType) {
@@ -71,10 +84,10 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
    case PERMIT_TYPE::DAY_TICKET_CHILD: {
    } break;
    default: ;
+        maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
    }

    return maxTime;
-
 }

 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
@@ -82,21 +95,58 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                   int paymentOptionIndex,
                                                   QDateTime const &start) {
    int minPrice = -1;
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);

-    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: ;
+    int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;
+
+    if (payment_method_id == PaymentMethod::Degressive) {
+        // Degressive: new for Fuchs Technik (500), ValserAlm (Fane):
+        // the minimal price has to be calculated, in cannot be hard coded into
+        // the tariff file.
+        // The working times have a reference into the payment rates. Two special
+        // entries (with the numbers 1000/1001) point to the respective prices.
+        switch(permitType) {
+            default: {
+                // find the correct work time range
+                int weekDay = start.date().dayOfWeek();
+                std::optional<QVector<ATBWeekDaysWorktime>> const &wd = cfg->getAllWeekDayWorkTimes();
+                if (wd.has_value()) {
+                    QVector<ATBWeekDaysWorktime> const &vec = wd.value();
+                    for (int i = 0; i < vec.size(); ++i) {
+                        ATBWeekDaysWorktime const &wt = vec[i];
+                        if (wt.pwd_period_day_in_week_id == weekDay) {
+                            if (start.time() >= QTime::fromString(QString::fromStdString(wt.pwd_time_from), Qt::ISODate)
+                             && start.time() <= QTime::fromString(QString::fromStdString(wt.pwd_time_to), Qt::ISODate)) {
+                                // found worktime range
+                                int pop_id = wt.pwd_pop_id; // 1000 or 1001
+                                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                    i = vec.size(); // to leave outer loop
+                                    minPrice = itr->second.pra_price; // this is now the minimal price
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    } else {
+        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:
+            minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+        }
    }

    return minPrice;
@@ -199,8 +249,8 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,

            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
+                    int pop_min_time = get_minimal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
                    if (pop_max_time >= pop_min_time) {
                        *productStart = start;
                        *productEnd = start.addSecs(pop_max_time*60);
@@ -213,6 +263,52 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
        }

    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "SHORT_TERM_PARKING_PKW: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
+    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
+        qCritical() << "TODO: SHORT_TERM_PARKING_BUS";
+    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER: {
+        qCritical() << "TODO: SHORT_TERM_PARKING_CAMPER";
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_PKW: {
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "DAY_TICKET_PKW: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_BUS: {
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "DAY_TICKET_BUS: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CAMPER: {
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "DAY_TICKET_CAMPER: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
+    } break;
    default:
      break;
    }
@@ -226,6 +322,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
    int maxPrice = -1;
    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+
    switch(permitType) {
    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
        if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
@@ -249,6 +347,28 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
        break;
    case PERMIT_TYPE::DAY_TICKET_CHILD:
        break;
+    case PERMIT_TYPE::DAY_TICKET_BUS:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_CAMPER:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_PKW:
+        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
+        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
+        if (po.has_value()) {
+            ATBPaymentOption option = po.value();
+            return option.pop_max_price;
+        }
+    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
+        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
+        if (po.has_value()) {
+            ATBPaymentOption option = po.value();
+            return option.pop_max_price;
+        }
+    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+        break;
    default: ;
    }

@@ -318,11 +438,13 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
        if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
            delete *tariff;
            *tariff = nullptr;
+            qCritical() << "      ... error parsing tariff";
            return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
        }
    } else {
        delete *tariff;
        *tariff = nullptr;
+            qCritical() << "      ... error loading tariff";
        return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
    }

@@ -339,10 +461,27 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {

 //
 // UpDown 1 -> up; 0 -> down
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
+                                                int UpDown, PermitType const &permitType)
 {
-    qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
-    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+
+    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+
+    // FIXME
+    //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
+    //if (!paymentOption.has_value()) {
+    //    qCritical() << "   compute_next_timestep() ERROR";
+    //    return currentTimeMinutes;
+    //}
+
+    int const 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;
+
+    qCritical() << __LINE__ << "compute_next_timestep()   payment option index: " << paymentOptionIndex;
+    qCritical() << __LINE__ << "compute_next_timestep()             plus steps: " << pop_plus_steps;
+    qCritical() << __LINE__ << "compute_next_timestep()            minus steps: " << pop_minus_steps;

    Configuration const *cfg = tariff;

@@ -350,19 +489,19 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
    PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
    switch (paymentMethodId) {
    case PaymentMethod::Progressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Progressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Progressive";
        break;
    case PaymentMethod::Degressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Degressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Degressive";
        break;
    case PaymentMethod::Linear:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Linear";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Linear";
        break;
    case PaymentMethod::Steps:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Steps";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Steps";
        break;
    case PaymentMethod::Undefined:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Undefined";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Undefined";
        break;
    }

@@ -370,34 +509,106 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
    if ((paymentMethodId == PaymentMethod::Steps) ||
        // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
-        (paymentMethodId == PaymentMethod::Progressive))
+        (paymentMethodId == PaymentMethod::Progressive) ||
+        // degressive tariff: e.g. Fuchs Technik (500)
+        (paymentMethodId == PaymentMethod::Degressive))
    {
-        const QList<int> stepList = Calculator::GetInstance().GetTimeSteps(tariff);
-        qCritical() << "   compute_next_timestep()     timeSteps:" << stepList;
+        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+
+        int const size = stepList.size();
+        if (size == 0) {
+            qCritical() << "compute_next_timestep() *ERROR empty step-list*";
+            return  currentTimeMinutes;
+        }
+
+        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << __LINE__ << "compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+
+        // consider time shift: the step-list might have been computed at a
+        // slightly different time point

        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        if (currentStepIndex == -1) {
+            unsigned minimalDistance = ~0;
+            int j = -1;
+            for (int i = 0; i < stepList.size(); ++i) {
+                unsigned distance = std::abs(stepList[i] - currentTimeMinutes);
+                if (distance < minimalDistance) {
+                    minimalDistance = distance;
+                    j = i;
+                }
+            }
+            // max. tolerance set to 3 minutes
+            unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
+            if (j != -1) {
+                stepList[j] = currentTimeMinutes;
+            }
+        }
+
+#if 0
+        int maxStep = -1;
+        if (size >= 2) {
+            maxStep = stepList[1] - stepList[0];
+        }
+        // max. tolerance set to 5 minutes
+        int const tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        for (int i=0; i < stepList.size(); ++i) {
+            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
+                qCritical().noquote()
+                    << __LINE__ << QString("compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                                    .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
+                stepList[i] = currentTimeMinutes;
+                qCritical() << __LINE__ << "compute_next_timestep()        NEW timeSteps:" << stepList;
+            }
+        }
+
+        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+#endif
+
+        currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";

        if (currentStepIndex == -1) {
-            qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            qCritical() << __LINE__ << "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 << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                return stepList[currentStepIndex + 1];
+                int const rest = currentStepIndex % pop_plus_steps;
+
+                if (rest) {
+                    currentStepIndex -= rest;
+                }
+
+                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
+
+                int const nextStepIndex = currentStepIndex + pop_plus_steps;
+
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
        if (UpDown == 0) { // DOWN
            if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                return  currentTimeMinutes;
            }
            else {
-                return stepList[currentStepIndex - 1];
+                int const nextStepIndex = currentStepIndex - pop_minus_steps;
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
    } else
@@ -437,12 +648,17 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
 // 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) {
+        time_t start_parking_time,  // in minutes
+        time_t end_parking_time,    // netto time in minutes
+        struct price_t *price,
+        PermitType permitType) {    // permitType maps to product
+
    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;
+
+    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+
+    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;

    if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
        calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -475,13 +691,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
    if (start.isValid()) {
        double cost = Calculator::GetInstance().GetCostFromDuration(
                    tariff,
-                    tariff->getPaymentOptions().pop_payment_method_id,
+                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
                    start,
                    end,
                    duration, false, true);
-        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_price;
        if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
        }
        price->units = cost;
@@ -495,27 +711,37 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        parking_tariff_t *tariff,
-        QDateTime &start_parking_time,
+        QDateTime &start_parking_time_,
        int netto_parking_time,
        QDateTime &end_parking_time,
        struct price_t *price,
+        PermitType permitType,
        bool prepaid)
 {
    CalcState calcState;

-    int paymentOptionIndex = tariff->getPaymentOptionIndex(start_parking_time);
+    QDateTime start_parking_time(start_parking_time_);
+
+    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+
+    QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+    //Q_UNUSED(tlist);

    double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
    double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;

+    // netto_parking_time = minMin;
+
    // 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
+                << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin;
-
+                << "                      maxMin: " << maxMin << endl
+                << "                     prepaid: " << prepaid << endl
+                << "                  permitType: " << permitType.toString();

    if (netto_parking_time < 0) {
        calcState.setDesc(QString("end=%1, start=%2")
@@ -523,34 +749,84 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                               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) {
+        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
+            tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Degressive) {
            // 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();
+                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);
+
+            // compute cost (price)
+            cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
+
+            int weekDay = start_parking_time.date().dayOfWeek();
+            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).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 const carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+            qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+            // 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";
+                } 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);
+                        effectiveStartTime == effectiveStartTime.addSecs(carryOverDuration * 60);
+                    }
+                }
+            }
+
+            // handle carry over
+            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
+            if (netto_parking_time >= minutesUntilCarryOver) {
+                int const rest = netto_parking_time - minutesUntilCarryOver;
+                QDateTime s(effectiveStartTime);
+                s = s.addSecs(minutesUntilCarryOver * 60);
+                s = s.addSecs(carryOverDuration * 60);
+                end_parking_time = s.addSecs(rest * 60);
+            } else {
+                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
+            }

        } else {
            cost = Calculator::GetInstance().GetCostFromDuration(
@@ -561,15 +837,16 @@ 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("minCost=%1, cost=%2").arg(minCost, cost));
+            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
            return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
        }

        // DEBUG
-        qCritical() << "            end_parking_time: " << end_parking_time;
-        qCritical() << "  -> calculated cost (netto): " << cost;
+        //qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
+        //qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;

        price->brutto = price->vat = price->vat_percentage = 0;
        price->units = cost;
@@ -579,6 +856,12 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        return calcState.set(CalcState::State::INVALID_START_DATE);
    }

+    if (end_parking_time.time().hour() == 0 && end_parking_time.time().minute() == 0) {
+        end_parking_time = end_parking_time.addDays(-1);
+        end_parking_time.setTime(QTime(23, 59, 0));
+    }
+    qCritical() << __func__ << __LINE__ << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
    return calcState.set(CalcState::State::SUCCESS);
 }

@@ -586,7 +869,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        parking_tariff_t *tariff,
        time_t start_parking_time,
        double price,
-        QString &duration) {
+        QString &duration,
+        PermitType permitType) {
    CalcState calcState;
    QDate const d(1970, 1, 1);
    QTime const t(0, 0, 0);
@@ -595,15 +879,25 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    if (start.isValid()) {
        QString cs = start.toString(Qt::ISODate);

+        bool prepaid = true;
+        int 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;
+        }
+        bool const nextDay = false;
+
        // DEBUG
-        qCritical() << "compute_duration_for_parking_ticket(): ";
-        qCritical() << "      start (cs): " << cs;
-        qCritical() << "           price: " << price;
+        qCritical() << "compute_duration_for_parking_ticket(1): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "           start (cs): " << cs;
+        qCritical() << "                price: " << price;

        duration = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  tariff->getPaymentOptions().pop_payment_method_id,
+                                                  tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
                                                  cs.toLocal8Bit().constData(),
-                                                  price, false, true).c_str();
+                                                  price, permitType, nextDay, prepaid).c_str();
        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
        if (!d.isValid()) {
            calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -620,16 +914,34 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        parking_tariff_t *tariff,
        QDateTime const &start_parking_time,
        double price,
-        QDateTime &ticketEndTime)
+        QDateTime &ticketEndTime,
+        PermitType permitType)
 {
    CalcState calcState;
+
+    bool prepaid = true;
+    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    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) {
+        qCritical() << "compute_duration_for_parking_ticket(2): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "                price: " << price;
+    }
+
    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();
+                    price, permitType, nextDay, prepaid).c_str();

        if (endTime == CalcState::SUCCESS) {
            calcState.setDesc(QString("SUCCESS"));
@@ -691,15 +1003,20 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
        } else {
            ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);

-            // DEBUG
-            //qCritical() << "compute_duration_for_parking_ticket(): ";
-            //qCritical() << "                 endTime: " << endTime;
-            //qCritical() << "           ticketEndTime: " << ticketEndTime;
-
            if (!ticketEndTime.isValid()) {
                calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
                return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
            }
+
+            if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
+                ticketEndTime = ticketEndTime.addDays(-1);
+                ticketEndTime.setTime(QTime(23, 59, 0));
+            }
+
+            // DEBUG
+            qCritical() << "compute_duration_for_parking_ticket(): ";
+            qCritical() << "                 endTime: " << endTime;
+            qCritical() << "           ticketEndTime: " << ticketEndTime;
        }
    } else {
        return calcState.set(CalcState::State::INVALID_START_DATE);
@@ -708,7 +1025,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    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 CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,
+                                                                  QDateTime const &start_parking_time,
+                                                                  QDateTime &ticketEndTime,
+                                                                  PermitType PermitType)
 {
    CalcState calcState;
    if (start_parking_time.isValid()) {
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
--- a/library/src/calculator_functions.cpp.kirchdorf
+++ b/library/src/calculator_functions.cpp.kirchdorf
@@ -115,8 +115,8 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                            uint8_t payment_option,
-                                            char const* start_datetime, // given in local time
-                                            double price,
+                                            char const *startDatetimePassed, // given in local time
+                                            double cost,
                                            bool nextDay,
                                            bool prepaid)
 {
@@ -124,14 +124,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
    Q_UNUSED(nextDay);

    // Get input date
-    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);

    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
    if (paymentMethodId == PaymentMethod::Steps) {
        if (tariffIs24_7(cfg)) {
            // use tariff with structure as for instance Schoenau, Koenigsee:
            // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
+            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, cost) * 60);
            return inputDate.toString(Qt::ISODate).toStdString();
        } else {
            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
@@ -147,9 +147,226 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                return "";
            }
        }
+    } else
+    if (paymentMethodId == PaymentMethod::Progressive) {
+        // started with Neuhauser, Kirchdorf: merge into main algo. later
+        // for now try out some ideas
+
+        // started with Neuhauser, Kirchdorf: merge into main algo. later
+        // for now try out some ideas
+
+        static const bool carryOverNotSet = Utilities::isCarryOverNotSet(cfg, paymentMethodId);
+        static const uint minParkingPrice = Utilities::getMinimalParkingPrice(cfg, paymentMethodId);
+        static const uint maxParkingPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+
+        if (cost < minParkingPrice) {
+            qCritical() << QString("ERROR: COST < MIN_PARKING_PRICE (%1 < %2)").arg(cost).arg(minParkingPrice);
+            return QDateTime().toString(Qt::ISODate).toStdString();
+        }
+
+        if (cost > maxParkingPrice) {
+            qCritical() << QString("WARN: COST > MAX_PARKING_PRICE (%1 > %2)").arg(cost).arg(maxParkingPrice);
+            cost = maxParkingPrice;
+        }
+
+        Q_ASSERT_X(carryOverNotSet, __func__, "CARRYOVER SET (FOR KIRCHDORF)");
+        Q_ASSERT_X(prepaid, __func__, "PREPAID NOT SET (FOR KIRCHDORF)");
+
+        QDateTime start_datetime = QDateTime::fromString(QString(startDatetimePassed), Qt::ISODate);
+        QDateTime start = start_datetime;
+        QDateTime end_datetime = QDateTime();
+
+        int weekdayId = -1;
+        int weekdayIdLast = -1;
+        int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
+        int durationMinutesBrutto = 0;
+
+        QDateTime current = start;
+
+        int days = 7;
+        while (--days > 0) {
+            weekdayId = current.date().dayOfWeek();
+            weekdayIdLast = weekdayId; // TODO: some end condition in json-file
+
+            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
+                current = current.addDays(1);
+                weekdayId = current.date().dayOfWeek();
+                if (weekdayId == weekdayIdLast) {
+                    qCritical() << "ERROR: NO VALID WORKDAY-TIMES DEFINED";
+                    return QDateTime().toString(Qt::ISODate).toStdString();
+                }
+            }
+
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+            QTime to = QTime(0, 0, 0);
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);
+
+                if (to < t) {
+                    to = t;
+                }
+            }
+
+            if (current.time() >= to) {
+                if (carryOverNotSet) {
+                    return end_datetime.toString(Qt::ISODate).toStdString();
+                } else {
+                    QDateTime const dt = start;
+                    start = start.addDays(1);
+                    start.setTime(QTime(0, 0, 0));
+
+                    durationMinutesBrutto += dt.secsTo(start) / 60;
+                    current = start;
+                }
+            } else {
+                break;
+            }
+        }
+
+        int durationMinutesNetto = 0;
+        uint price = 0;
+
+        if (carryOverNotSet) {
+            int range = 0;
+            int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
+            QDateTime lastCurrent = QDateTime();
+
+            auto timeRangeIt = cfg->TimeRange.cbegin();
+            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+                for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                    ++range;
+
+                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+
+                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+
+                    if (current.time() >= to) {
+                        continue; // try to use next available work-time
+                    } else
+                    if (current.time() <= from) {
+                        if (prepaid) {
+                            lastCurrent = current;
+                            current.setTime(from); // move current forward (range==1),
+                                                   // as prepaid is set
+                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+                            durationMinutesBrutto += minutesMoved;
+
+                            if (range == 1) {
+                                start_datetime = current;
+                            }
+                        }
+                    }
+
+                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                        ATBTimeRange timeRange = timeRangeIt->second;
+
+                        timeRange.computeQTimes(current.time());
+
+                        int duration = timeRange.time_range_to_in_minutes_from_start -
+                                       timeRange.time_range_from_in_minutes_from_start;
+
+                        if (minsUsed > 0) {
+                            duration -= minsUsed;
+                            minsUsed = 0;
+                        }
+
+                        if (current.addSecs(duration * 60).time() <= to) {
+                            if (minsToCarryOver > 0) {  // the price for this time range
+                                                        // has been is paid already
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
+                            } else {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                        price += (uint)rate.pra_price;
+
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
+                                        durationMinutes -= duration;
+                                        durationMinutesNetto += duration;
+                                        durationMinutesBrutto += duration;
+
+                                        current = current.addSecs(duration * 60);
+
+                                        if (price >= cost) {
+                                            end_datetime = current;
+                                            return end_datetime.toString(Qt::ISODate).toStdString();
+                                        }
+
+                                        break;
+                                    }
+                                }
+                            }
+
+                            if (durationMinutes <= 0) {
+                                end_datetime = current;
+                                return end_datetime.toString(Qt::ISODate).toStdString();
+                            }
+
+                            ++timeRangeIt;
+
+                        } else {
+
+                            lastCurrent = current;
+                            current.setTime(to);
+                            minsUsed = lastCurrent.secsTo(current) / 60;
+
+                            // mod duration: possibly discard some minutes in
+                            // the next time-range
+                            if (durationMinutes >= minsUsed) {
+                                minsToCarryOver = durationMinutes - minsUsed;
+                            }
+
+                            durationMinutes -= minsUsed;
+                            durationMinutesNetto += minsUsed;
+                            durationMinutesBrutto += minsUsed;
+
+                            if (minsUsed > 0) {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                        price += (uint)rate.pra_price;
+
+                                        if (price >= maxParkingPrice) {
+                                            price = maxParkingPrice;
+                                        }
+
+                                        if (price >= cost) {
+                                            end_datetime = current;
+                                            // return end_datetime.toString(Qt::ISODate).toStdString();
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+
+                end_datetime = start.addSecs(durationMinutesBrutto * 60);
+                return end_datetime.toString(Qt::ISODate).toStdString();
+            }
+        }
+
+        end_datetime = QDateTime();
+        return end_datetime.toString(Qt::ISODate).toStdString();
    }

-    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, cost, prepaid);

    // qCritical().noquote() << t;

@@ -279,9 +496,11 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                        end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                        return cost;
                    }
+                } else {
+                    // it might be that in such a case even prepaid ("vorkauf")
+                    // is not allowed at any moment
                }
-
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
                end_datetime = QDateTime();
                return 0;
            }
@@ -299,34 +518,18 @@ double Calculator::GetCostFromDuration(Configuration* cfg,

        QDateTime start = start_datetime;

-#define DEBUG 0
-#if DEBUG==1
-        qCritical() << "start" << start.toString(Qt::ISODate) << durationMinutes;
-#endif
        int weekdayId = -1;
        int weekdayIdLast = -1;
-        int timeRanges = 0;
        int durationMinutesBrutto = 0;

        QDateTime current = start;

-        //if ((durationMinutes % 5) != 0) {
-        //    qCritical() << "ERROR DURATION (" << durationMinutes
-        //                << ") NOT A MULTIPLE Of 5";
-        //}
-
        int days = 7;
        while (--days > 0) {
-
-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "start" << start.toString(Qt::ISODate)
-                    << "current" << current.toString(Qt::ISODate);
-#endif
            weekdayId = current.date().dayOfWeek();
            weekdayIdLast = weekdayId; // TODO: some end condition in json-file

-            while ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
+            while (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
                current = current.addDays(1);
                weekdayId = current.date().dayOfWeek();
                if (weekdayId == weekdayIdLast) {
@@ -335,11 +538,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                }
            }

-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "current" << current.toString(Qt::ISODate);
-#endif
-
            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

@@ -347,235 +545,169 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
            for (WTIterator itr = p.first; itr != p.second; ++itr) {
                QTime const &t = Utilities::WeekDaysWorkTimeUntil(itr);

-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "current" << current.time().toString(Qt::ISODate)
-                            << "t" << t.toString(Qt::ISODate)
-                            << "to" << to.toString(Qt::ISODate);
-#endif
-
                if (to < t) {
                    to = t;
                }
            }

-
            if (current.time() >= to) {
-                QDateTime const dt = start;
-                start = start.addDays(1);
-                start.setTime(QTime(0, 0, 0));
+                if (carryOverNotSet) {
+                    end_datetime = start;
+                    return 0;
+                } else {
+                    QDateTime const dt = start;
+                    start = start.addDays(1);
+                    start.setTime(QTime(0, 0, 0));

-                durationMinutesBrutto += dt.secsTo(start) / 60;
-                current = start;
+                    durationMinutesBrutto += dt.secsTo(start) / 60;
+                    current = start;
+                }
            } else {
-
-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "current" << current.toString(Qt::ISODate)
-                            << "durationMinutesBrutto" << durationMinutesBrutto;
-#endif
-
                break;
            }
        }

-#if DEBUG==1
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    << "timeRanges" << timeRanges << weekdayId
-                    << "durationMinutesBrutto" << durationMinutesBrutto
-                    << "start" << start.toString(Qt::ISODate)
-                    << "current" << current.toString(Qt::ISODate);
-#endif
-
        int durationMinutesNetto = 0;
        uint price = 0;

        if (carryOverNotSet) {
            int range = 0;
            int minsToCarryOver = 0; // from one work-time to the other on the same day
+            int minsUsed = 0;
            QDateTime lastCurrent = QDateTime();

-            auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);

-                for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                    ++range;
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                ++range;

-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);

-                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");

+                if (current.time() >= to) {
+                    continue; // try to use next available work-time
+                } else
+                if (current.time() <= from) {
+                    if (prepaid) {
+                        lastCurrent = current;
+                        current.setTime(from); // move current forward (range==1),
+                                               // as prepaid is set
+                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+                        durationMinutesBrutto += minutesMoved;

-                    if (current.time() >= to) {
-#if DEBUG==1
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    << "current" << current.toString(Qt::ISODate)
-                                    << "from" << from.toString(Qt::ISODate)
-                                    << "to" << to.toString(Qt::ISODate);
-#endif
-                        continue; // try to use next available work-time
-                    } else
-                    if (current.time() <= from) {
-                        if (prepaid) {
-                            lastCurrent = current;
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-#if DEBUG==1
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "current" << current.toString(Qt::ISODate)
-                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
-                                        << "minutesMoved" << minutesMoved
-                                        << "durationMinutes" << durationMinutes;
-#endif
-                            durationMinutesBrutto += minutesMoved;
-
-                            if (range == 1) {
-                                start_datetime = current;
-                            }
+                        if (range == 1) {
+                            start_datetime = current;
                        }
                    }
+                }

-#if DEBUG==1
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                << "from" << from.toString(Qt::ISODate)
-                                << "to" << to.toString(Qt::ISODate)
+                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+
+                    ATBTimeRange timeRange = timeRangeIt->second;
+
+                    timeRange.computeQTimes(current.time());
+
+                    int duration = timeRange.time_range_to_in_minutes_from_start -
+                                   timeRange.time_range_from_in_minutes_from_start;
+
+                    qCritical() << __func__ << ":" << __LINE__
                                << "current" << current.toString(Qt::ISODate)
-                                << "durationMinutes" << durationMinutes;
-#endif
+                                << "duration" << duration
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver;

-                    while (timeRangeIt != cfg->TimeRange.cend()) {
-                        ATBTimeRange timeRange = timeRangeIt->second;

-                        timeRange.computeQTimes(current.time());
+                    //if (minsUsed > 0) {
+                    //    duration -= minsUsed;
+                    //    minsUsed = 0;
+                    //}

-                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                                       timeRange.time_range_from_in_minutes_from_start;
-
-#if DEBUG==1
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    << "duration" << duration << timeRange.time_range_id
-                                    << "current" << current.toString(Qt::ISODate)
-                                    << "minsToCarryOver" <<  minsToCarryOver
-                                    << "durationMinutes" << durationMinutes;
-#endif
-
-                        if (current.addSecs(duration * 60).time() <= to) {
-
-                            for(const auto &x: cfg->PaymentRate) {
-                                ATBPaymentRate const rate = x.second;
-                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    if (minsToCarryOver > 0) {
-                                        durationMinutes -= minsToCarryOver;
-                                        durationMinutesNetto += minsToCarryOver;
-                                        durationMinutesBrutto += minsToCarryOver;
-                                        current = current.addSecs(minsToCarryOver*60);
-                                        minsToCarryOver = 0;
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto
-                                                    << "current" << current.toString(Qt::ISODate);
-#endif
-                                    } else {
+                    if (current.addSecs(duration * 60).time() <= to) {
+                        if (minsToCarryOver > 0) {  // the price for this time range
+                                                    // has been is paid already
+                            if (minsUsed == 0) {
+                                for(const auto &x: cfg->PaymentRate) {
+                                    ATBPaymentRate const rate = x.second;
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
                                        price += (uint)rate.pra_price;

                                        durationMinutes -= duration;
                                        durationMinutesNetto += duration;
                                        durationMinutesBrutto += duration;

-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "duration" << duration
-                                                    << "durationMinutes" << durationMinutes
-                                                    << "durationMinutesNetto" << durationMinutesNetto
-                                                    << "durationMinutesBrutto" << durationMinutesBrutto;
-#endif
-
                                        current = current.addSecs(duration * 60);

-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "current" << current.toString(Qt::ISODate)
-                                                    << "price" << price;
-#endif
-                                    }
+                                        if (durationMinutes <= 0) {
+                                            end_datetime = current;
+                                            return price;
+                                        }

-                                    break;
-                                }
-                            }
-
-                            if (durationMinutes <= 0) {
-                                end_datetime = current;
-#if DEBUG==1
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                            << "duration" << durationMinutesNetto << ", price" << price
-                                            << current.toString(Qt::ISODate)
-                                            << end_datetime.toString(Qt::ISODate);
-#endif
-                                return price;
-                            }
-
-                            ++timeRangeIt;
-
-                        } else {
-
-                            lastCurrent = current;
-                            current.setTime(to);
-                            int const minsLeft = lastCurrent.secsTo(current) / 60;
-
-                            // mod duration: possibly discard some minutes in
-                            // the next time-range
-                            minsToCarryOver = (durationMinutes - minsLeft) % duration;
-
-                            durationMinutes -= minsLeft;
-                            durationMinutesNetto += minsLeft;
-                            durationMinutesBrutto += minsLeft;
-
-#if DEBUG==1
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
-                                        << "current" << current.toString(Qt::ISODate)
-                                        << "minsLeft" << minsLeft;
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                        << "duration" << duration
-                                        << "durationMinutes" << durationMinutes
-                                        << "durationMinutesNetto" << durationMinutesNetto
-                                        << "durationMinutesBrutto" << durationMinutesBrutto
-                                        << "minsToCarryOver" << minsToCarryOver;
-#endif
-
-                            if (minsLeft > 0) {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                        price += (uint)rate.pra_price;
-#if DEBUG==1
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                                    << "price" << price;
-#endif
                                        break;
                                    }
                                }
+                            } else {
+                                durationMinutes -= duration;
+                                durationMinutesNetto += duration;
+                                durationMinutesBrutto += duration;
+                                current = current.addSecs(duration*60);
+                                minsToCarryOver = 0;
                            }
+                        } else {
+                            for(const auto &x: cfg->PaymentRate) {
+                                ATBPaymentRate const rate = x.second;
+                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                    price += (uint)rate.pra_price;

-                            break;
+                                    durationMinutes -= duration;
+                                    durationMinutesNetto += duration;
+                                    durationMinutesBrutto += duration;
+
+                                    current = current.addSecs(duration * 60);
+                                    break;
+                                }
+                            }
                        }
+
+                        if (durationMinutes <= 0) {
+                            end_datetime = current;
+                            return price;
+                        }
+
+                        //++timeRangeIt;
+
+                    } else {
+
+                        lastCurrent = current;
+                        current.setTime(to);
+                        minsUsed = lastCurrent.secsTo(current) / 60;
+
+                        // mod duration: possibly discard some minutes in
+                        // the next time-range
+                        if (durationMinutes >= minsUsed) {
+                            minsToCarryOver = durationMinutes - minsUsed;
+                        }
+
+                        durationMinutes -= minsUsed;
+                        durationMinutesNetto += minsUsed;
+                        durationMinutesBrutto += minsUsed;
+
+                        if (minsUsed > 0) {
+                            for(const auto &x: cfg->PaymentRate) {
+                                ATBPaymentRate const rate = x.second;
+                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                    price += (uint)rate.pra_price;
+                                    break;
+                                }
+                            }
+                        }
+                        // break;
                    }
-                }
+                } // for (WTIterator itr = p.first; itr != p.second; ++itr) {

                end_datetime = start.addSecs(durationMinutesBrutto * 60);
-#if DEBUG==1
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                            << "duration" << durationMinutesNetto
-                            << ", price" << std::max(price, minParkingPrice)
-                            << start.toString(Qt::ISODate)
-                            << end_datetime.toString(Qt::ISODate);
-#endif
                return std::max(price, minParkingPrice);
            }
        }
@@ -1072,6 +1204,8 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
    int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
    int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;

+    static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
    qCritical() << __func__ << ":" << __LINE__ << "       start parking time:" << start.toString(Qt::ISODate);
    qCritical() << __func__ << ":" << __LINE__ << "        payment option id:" << pop_id;
    qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
@@ -1079,63 +1213,71 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
    if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
        //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";

-        uint16_t timeStepCompensation = 0;
+        if (paymentMethodId == PaymentMethod::Progressive) { // e.g. neuhauser kirchdorf (743)
+            std::size_t const s = cfg->TimeRange.size();
+            for (std::size_t id = 1; id <= s; ++id) {
+                int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
+                m_timeSteps.append(step);
+            }
+        } else {
+            uint16_t timeStepCompensation = 0;

-        if (pop_carry_over) {
-            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
-            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
-            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+            if (pop_carry_over) {
+                int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+                QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+                QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;

-            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                        int const durationId = itr->second.pra_payment_unit_id;
-                        auto search = cfg->Duration.find(durationId);
-                        if (search != cfg->Duration.end()) {
-                            ATBDuration duration = search->second;
-                            if (durationId == 1) {
-                                QDateTime carryOver = start;
-                                carryOver = carryOver.addDays(1);
-                                carryOver.setTime(QTime(0, 0, 0));
+                if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                            int const durationId = itr->second.pra_payment_unit_id;
+                            auto search = cfg->Duration.find(durationId);
+                            if (search != cfg->Duration.end()) {
+                                ATBDuration duration = search->second;
+                                if (durationId == 1) {
+                                    QDateTime carryOver = start;
+                                    carryOver = carryOver.addDays(1);
+                                    carryOver.setTime(QTime(0, 0, 0));

-                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                    qCritical()
-                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                            .arg(timeStep).arg(duration.pun_duration_min)
-                                            .arg(timeStep).arg(duration.pun_duration_max);
-                                    break;
+                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                        qCritical()
+                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                                .arg(timeStep).arg(duration.pun_duration_min)
+                                                .arg(timeStep).arg(duration.pun_duration_max);
+                                        break;
+                                    }
+                                    qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    // set dynamic minimal parking time
+                                    cfg->getPaymentOptions().pop_min_time = timeStep;
+
+                                    qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+
+                                    duration.pun_duration = timeStep;
+                                    timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
+                                    m_timeSteps << duration.pun_duration;
+                                } else {
+                                    duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
+                                    m_timeSteps << duration.pun_duration;;
                                }
-                                qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;

-                                // set dynamic minimal parking time
-                                cfg->getPaymentOptions().pop_min_time = timeStep;
+                                cfg->Duration.erase(search);
+                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));

-                                qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-
-                                duration.pun_duration = timeStep;
-                                timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
-                                m_timeSteps << duration.pun_duration;
-                            } else {
-                                duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                m_timeSteps << duration.pun_duration;;
+                            } else { // if (search != cfg->Duration.end()) {
+                               // TODO
                            }
-
-                            cfg->Duration.erase(search);
-                            cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
-
-                        } else { // if (search != cfg->Duration.end()) {
-                           // TODO
                        }
+                    } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                        // TODO
                    }
-                } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                    // TODO
                }
-            } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
+            } else { // if (pop_carry_over) {
                // TODO
            }
-        } else { // if (pop_carry_over) {
-            // TODO
        }
    } else {
        qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
@@ -1308,6 +1450,18 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                case PERMIT_TYPE::INVALID:
                    break;
            }
+        } else {
+            // for projects which have not defined a daily ticket in their
+            // tariff-files (e.g. szeged)
+            price.netto = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+            qCritical() << "                  start:" << startDatetime.toString(Qt::ISODate);
+            qCritical() << "          workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
+            qCritical() << "            workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
+            qCritical() << "daily_ticket_card_price:" << price.netto;
+
+            value = value.value_or(price);
        }
    }

--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
--- a/library/src/tariff_global_defines.cpp
+++ b/library/src/tariff_global_defines.cpp
@@ -0,0 +1,5 @@
+#include "tariff_global_defines.h"
+
+int DBG_LEVEL = DBG_NOTICE;
+// int DBG_LEVEL = DBG_INFORMATION;
+// int DBG_LEVEL = DBG_DEBUG;
--- a/library/src/utilities.cpp
+++ b/library/src/utilities.cpp
@@ -215,6 +215,43 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
    return true;
 }

+std::optional<ATBPeriodYear>
+Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
+
+    ATBPeriodYear period;
+    std::optional<ATBPeriodYear> value;
+
+    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
+         it != cfg->YearPeriod.cend();
+         ++it) {
+        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
+        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
+
+        QDateTime start(currentDateTime);
+        QDateTime end(currentDateTime);
+
+        start.setDate(s);
+        end.setDate(e);
+
+        if (start.date().dayOfYear() < end.date().dayOfYear()) {
+            // start and end in the same year
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        } else {
+            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
+                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
+                value = value.value_or(it->second);
+                break;
+            }
+        }
+    }
+
+    return value;
+}
+
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {
--- a/main/cc_iuc_asynchpos.h
+++ b/main/cc_iuc_asynchpos.h
@@ -1,113 +0,0 @@
-#ifndef CC_IUC_ASYNCHPOS_H
-#define CC_IUC_ASYNCHPOS_H
-
-/*
- * cc_iuc_asynchpos.c
- *
- * Created: 21.11.2017
- *  Author: Matthias
- */
-
-#include <cstdlib>
-#include <cinttypes>
-
-//#define IUC_ASYCHNPOS_TESTMODE 1
-
-#define IUC_ASYNCHPOS_COINCOIDE_H               0x09
-#define IUC_ASYNCHPOS_COINCOIDE_L               0x78
-#define IUC_ASYNCHPOS_MAX_ARRAY_SIZE	        1024
-#define IUC_ASYNCHPOS_MAX_TX_MESSAGE_SIZE	    300
-#define IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE	    10000   // 17000
-#define IUC_ASYNCHPOS_MIN_PACKET_SIZE	        16
-#define IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE        32
-#define IUC_ASYNCHPOS_MIN_BASE_BYTE_DATA_SIZE   16
-#define IUC_ASYNCHPOS_POLYNOME	                0xedb88320	// 0x04C11DB7
-#define IUC_ASYNCHPOS_POLYNOME_INITIAL	        0		    // 0xFFFFFFFF
-#define IUC_ASYNCHPOS_PRINTTIMOUT               1000
-//#define IUC_ASYNCHPOS_RECEIPT_LENGTH 16384
-
-#define STX     0x01
-#define ETX1    0x02
-#define ETX2    0x03
-#define EOT     0x04
-#define ENQ     0x05
-#define ACK1    0x06
-#define ACK2    0x07
-#define DLE     0x10
-#define NAK     0x15
-
-unsigned static char terminalID[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
-unsigned static char terminalAPAK[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
-unsigned static char rxAsynchData[IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE];
-unsigned static char terminalSignature[16];
-//unsigned static char messageData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
-unsigned static char receiptData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1];
-unsigned static char txAsynchData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
-unsigned static char ENQrecieved;
-unsigned static int rxCounter;
-unsigned static int messageLength;
-unsigned static long timeInitalized;
-unsigned static long timeHoldISMAS;
-unsigned static long crcTable[256];
-unsigned static char tableCreated;
-unsigned static int asynchState;
-unsigned static char asynchSessionClosed;
-unsigned static char iuc_asynch_PRNrecieved;
-unsigned static char iuc_asynch_keepAlive;
-unsigned static char iuc_asynch_PrintControl;
-unsigned static char iuc_asynchpos_crc_old;
-unsigned static int iuc_print_counter;
-unsigned static int iuc_asynch_printTimeout;
-unsigned static char iucAsynchpoxDataContext;
-//Prozessdaten - highly private
-struct billAsynchData {
-	unsigned char time[20]; //UCHAR tagValue[] = "2017-12-19 13:40:00";
-	unsigned char id[37];
-	unsigned char printId[129];
-	unsigned char docNr[33];
-	//unsigned char amount[10];
-	//unsigned char token[25];
-	//unsigned char result[8];
-	//unsigned char authCode[7];
-	//unsigned char rrn[13];
-	//unsigned char stan[7];
-	//unsigned char cardtype[33];
-	unsigned char errCode[17];
-	//unsigned char receiptData[IUC_ASYNCHPOS_RECEIPT_LENGTH];
-};
-
-//private
-unsigned int iuc_asynchpos_send(unsigned char packetType, unsigned char* pData, unsigned int length, unsigned char needRTS);
-
-//void iuc_asynchpos_interpretCommand(unsigned int readLength_);
-
-//public
-void iuc_asynchpos_setTerminalID(unsigned char *pID, unsigned int length);
-void iuc_asynchpos_setTerminalAPAK(unsigned char *pAPAK, unsigned int length);
-unsigned char iuc_asynchpos_recieve_serial(unsigned char waitforACK);
-void iuc_asynchpos_init();
-void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
-int iuc_asynchpos_checkTime();
-unsigned char iuc_asynchpos_getIsSaleRunning();
-
-//commands
-void iuc_asynchpos_command_ping_terminal(void);
-void iuc_asynchpos_command_Login();
-void iuc_asynchpos_command_Logout();
-void iuc_asynchpos_command_authorize(unsigned int vkPreis);
-void iuc_asynchpos_command_cancel_authorize();
-void iuc_asynchpos_command_close_Document(unsigned char isStorno);
-void iuc_asynchpos_command_print_Result(unsigned char status);
-
-//void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
-//void iuc_asynchpos_init();
-//int iuc_asynchpos_checkTime();
-
-//unsigned char iuc_asynchpos_getCurrentStatus();
-
-//int iuc_asynchpos_heartbeat();
-
-
-uint32_t iuc_asynchpos_sub_updateCRC(uint32_t crc, char* pData, size_t len);
-
-#endif
--- a/main/main.cpp
+++ b/main/main.cpp
--- a/main/main.pro
+++ b/main/main.pro
@@ -25,19 +25,14 @@ CONFIG(debug, debug|release) {
    }
 }

-SOURCES += main.cpp \
-    aes128.cpp \
-    cc_iuc_asynchpos.cpp \
-    terminal_utils.cpp \
-    MessageHelper.cpp
+SOURCES += main.cpp

-HEADERS += aes128.h \
-    cc_iuc_asynchpos.h \
-    terminal_utils.h \
-    MessageHelper.h
-
-# OTHER_FILES += \
+# HEADERS +=

+OTHER_FILES += \
+    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json \
+    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json \
+    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json
Author	SHA1	Message	Date
Gerhard Hoffmann	04e1fe40ba	Added test cases for Fuchs/Schnals	2024-08-13 14:55:18 +02:00
Gerhard Hoffmann	397e0f9061	GetDurationFromCost(): Minor: changed some debug output.	2024-08-13 14:55:13 +02:00
Gerhard Hoffmann	e6b5bc0f4d	compute_price_for_parking_ticket(): Use (netto_parking_time >= minutesUntilCarryOver) instead of (netto_parking_time > minutesUntilCarryOver), to correctly use interval limit.	2024-08-13 14:54:59 +02:00
Gerhard Hoffmann	3cfaf88a6d	compute_price_for_parking_ticket(): Comute effective start time (jump over carry over time).	2024-08-13 14:54:48 +02:00
Gerhard Hoffmann	1be07a2415	get_minimal_parkingtime(): compute_price_for_parking_ticket(): Minor: changed debug output.	2024-08-13 14:51:55 +02:00
Siegfried Siegert	25b3143d88	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 14:37:42 +02:00
Gerhard Hoffmann	0856f10ca9	GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.	2024-08-02 14:34:44 +02:00
Siegfried Siegert	88c703ecc2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 13:21:54 +02:00
Gerhard Hoffmann	465b2274a1	compute_duration_for_parking_ticket(): Adapt end-time in case it is midnight: 00:00 -> 23:59	2024-08-02 13:15:11 +02:00
Siegfried Siegert	f946cd13e4	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:55:12 +02:00
Siegfried Siegert	8d1cbe7337	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:29:10 +02:00
Gerhard Hoffmann	62c52fd580	test case for fuchs, fane alm.	2024-08-02 11:13:50 +02:00
Gerhard Hoffmann	1023f6ede1	GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.	2024-08-02 11:12:07 +02:00
Gerhard Hoffmann	36b3e85d1b	GetCostFromDuration(): recompute timestep list to make sure that time step is found in it.	2024-08-02 11:11:20 +02:00
Gerhard Hoffmann	b394ed46cc	In case end-parking-time ends with 00:00, set it to 23:59.	2024-08-02 11:09:20 +02:00
Gerhard Hoffmann	3dda2d8355	Check if prepaid-option is set.	2024-08-02 11:08:52 +02:00
Gerhard Hoffmann	1152c3824e	Minor: add some debug output.	2024-08-02 11:08:32 +02:00
Gerhard Hoffmann	4271c0fb31	Fixed compute_next_timestep() for degressive tariff: compute_next_timestep() was actually never called for such a tariff.	2024-08-02 10:50:25 +02:00
Gerhard Hoffmann	24d9d4a0ff	test case for kleipeda and fuchs	2024-08-01 16:46:09 +02:00
Gerhard Hoffmann	4bce854d77	GetDurationFromCost(): Set durationInSecs in case 'pop_accumulate_prices' is not configured in tariff file.	2024-08-01 16:44:06 +02:00
Gerhard Hoffmann	138221759b	GetDurationFromCost(): Minor: removed some debug ouput	2024-08-01 16:43:19 +02:00
Gerhard Hoffmann	9cb7d4aea6	compute_price_for_parking_ticket(): Added handling for prepaid and carry-over.	2024-08-01 16:04:57 +02:00
Gerhard Hoffmann	cde490bab2	compute_next_time_step(): Added handling with pop_plus_steps/pop_minus_steps: '+' usually takes more than one time step. '-' is usually 1. Changed behaviour when current time is not found in the list of time steps: Search for the entry with the smallest distance to 'current time'. If the distance is smaller than 3 minutes, then use 'current time' as new entry in the list of time steps.	2024-08-01 16:00:10 +02:00
Gerhard Hoffmann	f0677374ec	Parsing of pop_plus_steps/pop_minus_steps	2024-08-01 15:46:49 +02:00
Gerhard Hoffmann	89b05ffadc	Added GetYearPeriodActive() to get active year period.	2024-08-01 15:45:50 +02:00
Gerhard Hoffmann	260973cd09	Added pop_plus_steps/pop_minus_steps to control step sizes	2024-08-01 15:44:06 +02:00
Siegfried Siegert	3a98a14eb0	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 10:50:03 +02:00
Gerhard Hoffmann	7bf7108668	GetDurationFromCost(): Check if computed duration is below minimal parking time.	2024-07-31 10:26:47 +02:00
Gerhard Hoffmann	e5629ba4fd	GetDurationFromCost(): Check if given price is below minimal parking price.	2024-07-31 10:25:03 +02:00
Siegfried Siegert	0d0d34cb87	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-31 08:06:45 +02:00
Gerhard Hoffmann	e4cb992aae	GetTimeSteps() for payment-method degressive. introduced for Valser Alm (location: Fane).	2024-07-30 15:39:55 +02:00
Gerhard Hoffmann	cdeb625a15	Minor: Revode debug output.	2024-07-30 15:39:35 +02:00
Gerhard Hoffmann	589d89b73a	Calculator::GetDurationFromCost(): Compute duration from cost for PaymentMethod::Degressive: introduced for Valser Alm (location: Fane).	2024-07-30 15:37:28 +02:00
Gerhard Hoffmann	7536f89d75	compute_duration_for_parking_ticket(): read prepaid-setting from tariff-file, if possible.	2024-07-30 15:32:58 +02:00
Gerhard Hoffmann	9a6b2b195d	get_minimal_parking_price(): compute this price dynamically according to settings in the tariff-file. Introduced for Fuchs (500) for Valser Alm (Location: Fane)	2024-07-30 15:29:47 +02:00
Gerhard Hoffmann	7233bc55c2	test for valser alm (fane)	2024-07-30 15:24:52 +02:00
Siegfried Siegert	8fff7a76f6	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-30 10:02:57 +02:00
Gerhard Hoffmann	52b7c2390a	Minor: introduce using-typedef for Duration	2024-07-29 17:33:49 +02:00
Gerhard Hoffmann	894e23332f	compute option index using permit type.	2024-07-29 17:32:15 +02:00
Gerhard Hoffmann	fbc255a6f2	Fix: compute_next_time_step(): removed check for product ids.	2024-07-29 17:31:33 +02:00
Gerhard Hoffmann	24ab01695d	GetPriceForTimeStep(): remove default parameter.	2024-07-29 17:28:27 +02:00
Gerhard Hoffmann	37652d3b6a	Save computed pop_min_time.	2024-07-29 17:27:16 +02:00
Gerhard Hoffmann	14fd7ddd39	Preperationf for Zone3.	2024-07-29 17:26:53 +02:00
Gerhard Hoffmann	ca3c3921d4	Minor: change debug output	2024-07-29 17:26:26 +02:00
Gerhard Hoffmann	37620a06c1	added test case for bus	2024-07-29 11:30:36 +02:00
Gerhard Hoffmann	9f4affca5a	Minor: removed debug output	2024-07-29 11:30:00 +02:00
Gerhard Hoffmann	4f2c33cdc2	Minor: added comments and added some debug output.	2024-07-29 11:28:07 +02:00
Gerhard Hoffmann	3cd02296b0	compute_duration_for_parking_ticket(): Fix: pass PERMIT_TYPE explicitly to correct arity of GetDurationFromCost().	2024-07-29 11:25:12 +02:00
Gerhard Hoffmann	f1493f417f	get_maximal_parkingprice(): implement for SHORT_TERM_PARKING_BUS and SHORT_TERM_PARKING_PKW.	2024-07-29 11:24:05 +02:00
Gerhard Hoffmann	356e3be178	Pass PERMIT_TYPE to get_minimal_parkingtime() and get_maximal_parkingtime() to override default parameter value.	2024-07-29 11:22:22 +02:00
Gerhard Hoffmann	31b1dd1690	ResetTimeSteps(): Check paymentOptionIndex for correct value.	2024-07-29 11:20:00 +02:00
Siegfried Siegert	84d807930e	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:35:38 +02:00
Gerhard Hoffmann	dbf5b1f11d	remove input correction	2024-07-26 17:34:24 +02:00
Siegfried Siegert	18f4e74eea	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 17:05:45 +02:00
Gerhard Hoffmann	29368ea850	Remove correction	2024-07-26 17:04:33 +02:00
Gerhard Hoffmann	b84f80887e	Checkin for testing	2024-07-26 17:01:44 +02:00
Siegfried Siegert	bfd9f3b80c	Fix: add missing parameter PermitType	2024-07-26 14:11:37 +02:00
Siegfried Siegert	cb69d3ca2f	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:35:56 +02:00
Gerhard Hoffmann	4a2b15d086	Add some debug output into GetDurationForPrice().	2024-07-26 13:34:18 +02:00
Siegfried Siegert	63043931c2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:12:56 +02:00
Gerhard Hoffmann	8dad8f00e8	GetPriceForTimeStep(): Fix: user default payment option	2024-07-26 13:11:29 +02:00
Siegfried Siegert	1ea03f522c	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 13:01:17 +02:00
Gerhard Hoffmann	805a732c52	GetPriceForTimeStep(): add prices for computed timesteps. Return maximal price which is still smaller or equal then (input-)price.	2024-07-26 12:53:42 +02:00
Siegfried Siegert	ac20a767df	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-07-26 11:08:02 +02:00
Gerhard Hoffmann	b7facb9d60	checkin for tariff02.json	2024-07-26 10:59:45 +02:00
Gerhard Hoffmann	8344b04b15	Use of permitType in several places	2024-07-25 09:49:16 +02:00
Gerhard Hoffmann	b0ecef0361	Use of permitType in several places	2024-07-25 09:48:12 +02:00
Gerhard Hoffmann	003b7e8e8a	getPaymentOption() functions and getPaymentOptionIndex()	2024-07-25 09:46:46 +02:00
Gerhard Hoffmann	7ef2d44fc4	Add parameter PermitType to GetCostForDuration() and GetDurationFromCost()	2024-07-25 09:45:36 +02:00
Gerhard Hoffmann	8f203184b6	Add additional parameter (PermitType) to several functions	2024-07-25 09:44:24 +02:00
Gerhard Hoffmann	0bfec6a938	Added getPaymentOptionIndex() and getPaymentOptionsForAllKeys()	2024-07-25 09:43:16 +02:00
Gerhard Hoffmann	070446d01a	Updated test cases for PermitType.	2024-07-24 17:35:46 +02:00
Gerhard Hoffmann	4d7e5263ee	Added parsing of pop_product_id and pop_product_name.	2024-07-24 17:34:28 +02:00
Gerhard Hoffmann	7d452c82b7	Added pop_product_id and pop_product_name	2024-07-24 17:33:53 +02:00
Gerhard Hoffmann	0a08221381	Added conversion from QString to PermitType	2024-07-24 17:33:06 +02:00
Gerhard Hoffmann	b4b2e27fe3	Removed some debug output for testing	2024-07-24 12:37:29 +02:00
Gerhard Hoffmann	2a3ff30e66	Add test cases	2024-07-24 12:34:28 +02:00
Gerhard Hoffmann	b19cfd693c	Minor: add some debug output.	2024-07-24 12:34:05 +02:00
Gerhard Hoffmann	78921c8870	IMPORTANT: isParkingAllowedForWeekDay(): deactivated for testing !!!	2024-07-24 12:30:46 +02:00
Gerhard Hoffmann	e891bfc5de	Only check for prepaid == never.	2024-07-24 12:23:15 +02:00
Gerhard Hoffmann	a6922976bf	Minor: remove some debug output.	2024-07-24 12:22:47 +02:00
Gerhard Hoffmann	7f25c46d30	Set pun_duration_saved	2024-07-23 12:51:51 +02:00
Gerhard Hoffmann	2b30e9562f	Recompute time step list (previously is was saved as an optimization)	2024-07-23 12:51:08 +02:00
Gerhard Hoffmann	eb4ef0c3b5	Allow adjustment of the step list by a tolerance of 5 minutes per step	2024-07-23 12:48:50 +02:00
Gerhard Hoffmann	da05d004dd	Introduced 'pun_duration_saved': to be used when time steps have to be re-calculated.	2024-07-23 12:46:44 +02:00
Gerhard Hoffmann	abf4ef0b00	GetPriceForTimeStep(): Use special flag 'pop_accumulate_prices' to add up prices given in the tariff json file.	2024-07-23 11:53:22 +02:00
Gerhard Hoffmann	49fb860129	Minor: fixed printing of 'cost'.	2024-07-23 11:47:48 +02:00
Gerhard Hoffmann	69edc8e898	compute_product_price(): add new Products (CAR, BUS, CAMPER).	2024-07-23 11:45:34 +02:00
Gerhard Hoffmann	40440e28d3	Read pop_accumulate_prices and pop_accumulate_durations.	2024-07-22 15:56:04 +02:00
Gerhard Hoffmann	ba8e2786fc	GetTimeSteps(): updated as well for Schnals (505). Still to be tested.	2024-07-22 15:54:36 +02:00
Gerhard Hoffmann	b5804408f4	GetDurationFromCost(): expanded. still to be tested.	2024-07-22 15:53:27 +02:00
Gerhard Hoffmann	f7be0e471a	getDurationFromCost(): call Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate); for its side-effects. Timesteps will be used in the following calculation.	2024-07-22 15:50:36 +02:00
Gerhard Hoffmann	45694106a7	GetTimeSteps(): added default parameter 'start'; was set inside the funtion.	2024-07-22 15:48:21 +02:00
Gerhard Hoffmann	6d125c65fe	Added flags pop_accumulate_prices pop_accumulate_durations to decide if values in json files should be accumulated or not.	2024-07-22 15:46:45 +02:00
Gerhard Hoffmann	1c86e1ac40	tests for schnals	2024-07-22 15:46:13 +02:00
Gerhard Hoffmann	3503306637	save experimental	2024-07-21 20:58:12 +02:00
Gerhard Hoffmann	977356040c	Added changes for Schnals	2024-07-19 14:10:07 +02:00
Gerhard Hoffmann	2a89f90745	Added parsing for Interpolation, CarryOver and Prepaid-options. Has to be formatted.w	2024-07-19 14:09:04 +02:00
Gerhard Hoffmann	f2356bec55	Added new products	2024-07-19 14:04:20 +02:00
Gerhard Hoffmann	2d6ef2d158	Add prepaid and carry over option	2024-07-19 14:03:46 +02:00
Gerhard Hoffmann	e5d23d8022	Added tests for Schnals	2024-07-19 14:03:06 +02:00
Gerhard Hoffmann	02927be9c9	Added interpolation, carryover and prepaid types	2024-07-19 14:02:41 +02:00
Gerhard Hoffmann	c6d396f34b	Added handling for interpolation, carry over and prepaid.	2024-07-19 14:01:27 +02:00
Gerhard Hoffmann	026c791c79	Add interpolation and operator<<	2024-07-19 14:01:00 +02:00
Gerhard Hoffmann	927164e23e	Added headers for interpolation, prepaid and carryover	2024-07-19 13:59:56 +02:00
Gerhard Hoffmann	507b5d1b9c	Add Interpolation, Prepaid and CarryOver structures to streamline Json-File layout.	2024-07-19 13:58:22 +02:00
Gerhard Hoffmann	c153652b3d	compute_next_timestep(): allow some tolerance for first time-step	2024-07-16 16:50:11 +02:00
Gerhard Hoffmann	d7e185006f	GetTimeSteps(): add sanity check	2024-07-16 16:47:26 +02:00
Gerhard Hoffmann	c3c888dc04	GetTimeSteps(): remove list as reference so compute_next_timestep)_ can change it	2024-07-16 16:46:43 +02:00
Gerhard Hoffmann	2ecaa0545f	Clean up. Adding SEXTEN.	2024-07-16 16:42:39 +02:00
Gerhard Hoffmann	a849f953bd	Remove some parts used for testing	2024-07-16 16:42:11 +02:00
Gerhard Hoffmann	24df8e995a	remove now useless file	2024-07-16 16:41:18 +02:00