test case for fuchs/muelbach

Minor: added debug output.

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,

library/include/mobilisis/calculator_functions.h

@@ -27,6 +27,13 @@ class Calculator {
                                             int netto_parking_time,
                                             int paymentOptionIndex);
 
+    int computeBruttoDurationInSecs(Configuration const *cfg,
+                                    QDateTime const &from,
+                                    int durationInSecs, bool maxBrutto = false);
+
+    QDateTime computeBruttoDateTime(Configuration const *cfg,
+                                    QDateTime const &from,
+                                    int durationInSecs, bool maxBrutto = false);
 protected:
     explicit Calculator() = default;
 
@@ -40,12 +47,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 +77,7 @@ 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
@@ -78,10 +85,10 @@ public:
 	/// <param name="tariff_cfg">Pointer to configuration</param>
 	/// <param name="vehicle_type">Type of vehicle</param>
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
-    /// <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="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 +98,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> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
+    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 +138,10 @@ private:
                               int durationMinutes);
 
     //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
+    //    return GetPriceForTimeStep(cfg, step, 0);
-    }
+    //}
     uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
     uint32_t GetStepForPrice(Configuration *cfg, int price) const {
         return GetDurationForPrice(cfg, price);

library/include/mobilisis/configuration.h

@@ -28,6 +28,7 @@
 #include "tariff_interpolation.h"
 #include "tariff_prepaid.h"
 #include "tariff_carryover.h"
+#include "tariff_permit_type.h"
 
 #include <QVector>
 #include <optional>
@@ -47,29 +48,30 @@ public:
     using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
     using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
     using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+    using TariffDurationType = std::multimap<int, ATBDuration>;
 
     ATBProject project;
     ATBCurrency Currency;
-	ATBDuration duration;
+    ATBDuration duration;
 
-	multimap<int, ATBDuration> Duration;
+    TariffDurationType Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
-    SpecialDaysWorktimeType SpecialDaysWorktime;
+	SpecialDaysWorktimeType SpecialDaysWorktime;
-    SpecialDaysType SpecialDays;
+	SpecialDaysType SpecialDays;
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-    ATBPaymentOptionType PaymentOption;
+	ATBPaymentOptionType PaymentOption;
-    multimap<int, ATBDailyTicket> DailyTicket;
+	multimap<int, ATBDailyTicket> DailyTicket;
-    TimeRangeType TimeRange;
+	TimeRangeType TimeRange;
-    multimap<int, ATBTimeStepConfig> TimeStepConfig;
+	multimap<int, ATBTimeStepConfig> TimeStepConfig;
-    multimap<int, ATBTimeBase> TimeBase;
+	multimap<int, ATBTimeBase> TimeBase;
-    multimap<int, ATBCustomer> Customer;
+	multimap<int, ATBCustomer> Customer;
-    TariffProductType TariffProduct;
+	TariffProductType TariffProduct;
-    TariffInterpolationType TariffInterpolations;
+	TariffInterpolationType TariffInterpolations;
-    TariffPrepaidType TariffPrepaidOptions;
+	TariffPrepaidType TariffPrepaidOptions;
-    TariffCarryOverType TariffCarryOverOptions;
+	TariffCarryOverType TariffCarryOverOptions;
 
 	/// <summary>
 	/// Parse JSON string
@@ -91,10 +93,16 @@ 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;
@@ -102,8 +110,11 @@ public:
     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> adaptStart(QDateTime const &start, int prepaid_option_id);
+    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;
 
 private:
 	/// <summary>
@@ -113,5 +124,5 @@ private:
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
 
-    QVector<ATBPaymentOption> currentPaymentOptions;
+	QVector<ATBPaymentOption> currentPaymentOptions;
 };

library/include/mobilisis/duration.h

@@ -9,6 +9,7 @@ public:
       : pun_id(0)
       , pun_label("")
       , pun_duration(0)
+      , pun_duration_saved(0)
       , pun_duration_min(0)
       , pun_duration_max(0)
       , pun_interpolation_id(-1) {
@@ -21,6 +22,7 @@ public:
             << "              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";
@@ -31,6 +33,7 @@ public:
 	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;

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 = "";
@@ -26,6 +28,9 @@ public:
         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;
@@ -33,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;
@@ -47,6 +60,7 @@ public:
     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;
@@ -55,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;

library/include/mobilisis/tariff_carryover.h

@@ -10,11 +10,11 @@ struct ATBCarryOver {
         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);
 
@@ -24,24 +24,28 @@ struct ATBCarryOver {
             << "                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"
@@ -54,12 +58,14 @@ struct ATBCarryOver {
             << "                day: " << co.carryover[(int)Qt::Saturday].day << "\n"
             << "       static_start: " << co.carryover[(int)Qt::Saturday].static_start.toString(Qt::ISODate) << "\n"
             << "         static_end: " << co.carryover[(int)Qt::Saturday].static_end.toString(Qt::ISODate) << "\n"
+            << "           duration: " << co.carryover[(int)Qt::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";
 

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

library/include/mobilisis/tariff_interpolation.h

@@ -12,7 +12,7 @@ struct ATBInterpolation {
         STATIC_TIMEPOINT_AND_DURATION = 3,
         DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
         DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_PRICE = 6,
+        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
         DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
     };
 
@@ -28,8 +28,8 @@ struct ATBInterpolation {
             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_PRICE):
+        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_PRICE").arg(i);
+            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:;
@@ -49,7 +49,9 @@ struct ATBInterpolation {
       , dynamic_start_str(QString())
       , dynamic_end_str(QString())
       , dynamic_duration(0)
-      , dynamic_until_price(0) {
+      , dynamic_until_price(0)
+      , seemless(false)
+      , never(false) {
     }
 
     int id;
@@ -64,6 +66,8 @@ struct ATBInterpolation {
     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);
@@ -80,7 +84,9 @@ struct ATBInterpolation {
             << "  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";
+            << "dynamic_until_price: " << i.dynamic_until_price << "\n"
+            << "           seemless: " << i.seemless << "\n"
+            << "              never: " << i.never << "\n";
 
         return debug;
     }

library/include/mobilisis/tariff_permit_type.h

@@ -122,6 +122,59 @@ struct PermitType {
         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() {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:

library/include/mobilisis/utilities.h

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

library/include/mobilisis/weekdays_worktime.h

@@ -4,8 +4,10 @@
 class ATBWeekDaysWorktime
 {
 public:
-	int pwd_id;
+    int pwd_id;
-	int pwd_period_week_day_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;

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 \
@@ -87,7 +88,8 @@ HEADERS += \
     include/mobilisis/tariff_global_defines.h \
     include/mobilisis/tariff_interpolation.h \
     include/mobilisis/tariff_prepaid.h \
-    include/mobilisis/tariff_carryover.h
+    include/mobilisis/tariff_carryover.h \
+    include/mobilisis/tariff_global_defines.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

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) {
+    int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;
-    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+
-        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+    if (payment_method_id == PaymentMethod::Degressive) {
-    } break;
+        // Degressive: new for Fuchs Technik (500), ValserAlm (Fane):
-    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+        // the minimal price has to be calculated, in cannot be hard coded into
-    } break;
+        // the tariff file.
-    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+        // The working times have a reference into the payment rates. Two special
-    } break;
+        // entries (with the numbers 1000/1001) point to the respective prices.
-    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+        switch(permitType) {
-    } break;
+            default: {
-    case PERMIT_TYPE::DAY_TICKET: {
+                // find the correct work time range
-        minPrice = compute_product_price(cfg, permitType, start);
+                int weekDay = start.date().dayOfWeek();
-    } break;
+                std::optional<QVector<ATBWeekDaysWorktime>> const &wd = cfg->getAllWeekDayWorkTimes();
-    default: ;
+                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_min_time = get_minimal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
-                    int pop_max_time = get_maximal_parkingtime(cfg); // 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,10 +322,13 @@ 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) {
-            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+            maxPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
         } else { // PaymentMethod::Linear -> e.g. szeged
             int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
             int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
@@ -249,6 +348,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 +439,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 +462,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 +490,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,57 +510,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))
     {
-        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff);
+        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() << "   compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
-        qCritical() << "   compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
-        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+        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];
         }
-        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        // max. tolerance set to 5 minutes
-        if (std::abs(stepList[0] - currentTimeMinutes) <= tolerance) {
+        int const tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
-            qCritical().noquote()
+        for (int i=0; i < stepList.size(); ++i) {
-                << QString("   compute_next_timestep() correction stepList[0]=%1 -> %2:")
+            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
-                                    .arg(stepList[0]).arg(currentTimeMinutes);
+                qCritical().noquote()
-            stepList[0] = currentTimeMinutes;
+                    << __LINE__ << QString("compute_next_timestep() correction stepList[%1]=%2 -> %3:")
-            qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
+                                    .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
@@ -460,12 +649,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 start_parking_time,  // in minutes
-        time_t end_parking_time,   // netto time in minutes
+        time_t end_parking_time,    // netto time in minutes
-        struct price_t *price) {
+        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));
@@ -498,13 +692,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;
@@ -518,27 +712,39 @@ 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,
-        bool prepaid)
+        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, start_parking_time);
+    //Q_UNUSED(tlist);
+    qCritical() << __func__ << __LINE__ << tlist;
 
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
 
-    // DEBUG
+    // netto_parking_time = minMin;
-    qCritical() << "compute_price_for_parking_ticket() " << endl
-                << "          paymentOptionIndex: " << paymentOptionIndex << endl
-                << "          start_parking_time: " << start_parking_time << endl
-                << "          netto_parking_time: " << netto_parking_time << endl
-                << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin;
 
+    //if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "compute_price_for_parking_ticket() " << endl
+                    << "          paymentOptionIndex: " << paymentOptionIndex << endl
+                    << "          start_parking_time: " << start_parking_time << 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 << endl
+                    << "                     prepaid: " << prepaid << endl
+                    << "                  permitType: " << permitType.toString();
+    //}
 
     if (netto_parking_time < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
@@ -546,34 +752,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__ << ")"
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                //             << calcState.toString();
+                            << 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(
@@ -584,15 +840,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() << __LINE__ << "            end_parking_time: " << end_parking_time;
-        qCritical() << "  -> calculated cost (netto): " << cost;
+        qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;
 
         price->brutto = price->vat = price->vat_percentage = 0;
         price->units = cost;
@@ -602,6 +859,13 @@ 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);
 }
 
@@ -609,7 +873,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);
@@ -618,15 +883,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() << "compute_duration_for_parking_ticket(1): ";
-        qCritical() << "      start (cs): " << cs;
+        qCritical() << " payment option index: " << paymentOptionIndex;
-        qCritical() << "           price: " << price;
+        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));
@@ -643,16 +918,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"));
@@ -714,15 +1007,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);
@@ -731,7 +1029,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()) {

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
+                                            char const *startDatetimePassed, // given in local time
-                                            double price,
+                                            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() << "(" << __func__ << ":" << __LINE__ << ")" << "NOT YET IMPLEMENTED";
-                qCritical() << __PRETTY_FUNCTION__ << "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;
+                if (carryOverNotSet) {
-                start = start.addDays(1);
+                    end_datetime = start;
-                start.setTime(QTime(0, 0, 0));
+                    return 0;
+                } else {
+                    QDateTime const dt = start;
+                    start = start.addDays(1);
+                    start.setTime(QTime(0, 0, 0));
 
-                durationMinutesBrutto += dt.secsTo(start) / 60;
+                    durationMinutesBrutto += dt.secsTo(start) / 60;
-                current = start;
+                    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();
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+            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) {
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                    ++range;
+                ++range;
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(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 (range == 1) {
-#if DEBUG==1
+                            start_datetime = current;
-                        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 DEBUG==1
+                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+
-                                << "from" << from.toString(Qt::ISODate)
+                    ATBTimeRange timeRange = timeRangeIt->second;
-                                << "to" << to.toString(Qt::ISODate)
+
+                    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;
+                                << "duration" << duration
-#endif
+                                << "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 -
+                    if (current.addSecs(duration * 60).time() <= to) {
-                                       timeRange.time_range_from_in_minutes_from_start;
+                        if (minsToCarryOver > 0) {  // the price for this time range
-
+                                                    // has been is paid already
-#if DEBUG==1
+                            if (minsUsed == 0) {
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                for(const auto &x: cfg->PaymentRate) {
-                                    << "duration" << duration << timeRange.time_range_id
+                                    ATBPaymentRate const rate = x.second;
-                                    << "current" << current.toString(Qt::ISODate)
+                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    << "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 {
                                         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
+                                        if (durationMinutes <= 0) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                            end_datetime = current;
-                                                    << "current" << current.toString(Qt::ISODate)
+                                            return price;
-                                                    << "price" << price;
+                                        }
-#endif
-                                    }
 
-                                    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) {
+            if (pop_carry_over) {
-            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+                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 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;
+                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.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                        int const durationId = itr->second.pra_payment_unit_id;
+                            int const durationId = itr->second.pra_payment_unit_id;
-                        auto search = cfg->Duration.find(durationId);
+                            auto search = cfg->Duration.find(durationId);
-                        if (search != cfg->Duration.end()) {
+                            if (search != cfg->Duration.end()) {
-                            ATBDuration duration = search->second;
+                                ATBDuration duration = search->second;
-                            if (durationId == 1) {
+                                if (durationId == 1) {
-                                QDateTime carryOver = start;
+                                    QDateTime carryOver = start;
-                                carryOver = carryOver.addDays(1);
+                                    carryOver = carryOver.addDays(1);
-                                carryOver.setTime(QTime(0, 0, 0));
+                                    carryOver.setTime(QTime(0, 0, 0));
 
-                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                    qCritical()
+                                        qCritical()
-                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                            .arg(timeStep).arg(duration.pun_duration_min)
+                                                .arg(timeStep).arg(duration.pun_duration_min)
-                                            .arg(timeStep).arg(duration.pun_duration_max);
+                                                .arg(timeStep).arg(duration.pun_duration_max);
-                                    break;
+                                        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->Duration.erase(search);
-                                cfg->getPaymentOptions().pop_min_time = timeStep;
+                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
 
-                                qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
+                            } else { // if (search != cfg->Duration.end()) {
-
+                               // TODO
-                                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;;
                             }
-
-                            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);
         }
     }
 

library/src/configuration.cpp

@@ -7,6 +7,7 @@
 #include "tariff_business_hours.h"
 #include "tariff_global_defines.h"
 #include "tariff_carryover.h"
+#include "tariff_global_defines.h"
 
 #include <QString>
 #include <QDebug>
@@ -15,16 +16,16 @@
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
 {
-        if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
+    if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
-        if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
+    if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
-        if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
+    if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
-        if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
+    if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
-        if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
+    if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
-        //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
+    //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
-        if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
+    if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
-        if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
+    if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
-        if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
+    if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
-        if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
+    if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
     if (strcmp(member_name, "DailyTicket") == 0) return MemberType::DailyTicketType;
     if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType;
     if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
@@ -42,36 +43,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 {
         try
         {
-                if (cfg == nullptr)
+            if (cfg == nullptr)
-                {
+            {
-                        printf("TariffConfiguration pointer not set\n");
+                    printf("TariffConfiguration pointer not set\n");
-                        return false;
+                    return false;
-                }
+            }
-                if (json == NULL)
+            if (json == NULL)
-                {
+            {
-                        printf("%s", "Input JSON string is NULL\n");
+                    printf("%s", "Input JSON string is NULL\n");
-                        return false;
+                    return false;
-                }
+            }
 
-                // Parse JSON to document
+            // Parse JSON to document
-                Document document;
+            Document document;
-                document.Parse(json);
+            document.Parse(json);
 
-                // Return if parse error has been found
+            // Return if parse error has been found
-                ParseErrorCode err = document.GetParseError();
+            ParseErrorCode err = document.GetParseError();
-                if (err != 0)
+            if (err != 0)
-                {
+            {
-                        printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
+                    printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
-                        return false;
+                    return false;
-                }
+            }
 
-                // Validate JSON, check if it's a JSON object
+            // Validate JSON, check if it's a JSON object
-        qCritical() << "JSON parsing has been successful";
+            qCritical() << "JSON parsing has been successful";
                 if (!document.IsObject()) {
                         printf("%s", "Error: not a (valid) JSON object\n");
                         return false;
                 }
-        qCritical() << "Valid JSON object identified";
+            qCritical() << "Valid JSON object identified";
 
                 // Validate JSON, check configuration members
                 if (!document.HasMember("Currency")
@@ -80,36 +81,36 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         || !document.HasMember("PaymentRate")
                         || !document.HasMember("Duration")
                         //|| !document.HasMember("WeekDays")
-            //|| !document.HasMember("SpecialDaysWorktime")
+                    //|| !document.HasMember("SpecialDaysWorktime")
-            //|| !document.HasMember("SpecialDays")
+                    //|| !document.HasMember("SpecialDays")
-            )
+                )
                 {
                         printf("%s", "Error: not a valid configuration JSON\n");
                         return false;
                 }
-        qCritical() << "Valid JSON configuration identified";
+            qCritical() << "Valid JSON configuration identified";
 
-        ATBCurrency Currency;
+            ATBCurrency Currency;
-        ATBDuration Duration;
+            ATBDuration Duration;
-        ATBPaymentMethod PaymentMethod;
+            ATBPaymentMethod PaymentMethod;
-        ATBPaymentRate PaymentRate;
+            ATBPaymentRate PaymentRate;
-        ATBSpecialDaysWorktime SpecialDaysWorktime;
+            ATBSpecialDaysWorktime SpecialDaysWorktime;
-        ATBSpecialDays SpecialDays;
+            ATBSpecialDays SpecialDays;
-        ATBWeekDays  WeekDays;
+            ATBWeekDays  WeekDays;
-        ATBWeekDaysWorktime  WeekDaysWorktime;
+            ATBWeekDaysWorktime  WeekDaysWorktime;
-        ATBPeriodYear YearPeriod;
+            ATBPeriodYear YearPeriod;
-        ATBDailyTicket DailyTicket;
+            ATBDailyTicket DailyTicket;
-        ATBTimeBase TimeBase;
+            ATBTimeBase TimeBase;
-        ATBCustomer Customer;
+            ATBCustomer Customer;
-        ATBTimeRange TimeRange;
+            ATBTimeRange TimeRange;
-        ATBTimeStepConfig TimeStepConfig;
+            ATBTimeStepConfig TimeStepConfig;
-        ATBTariffProduct TariffProduct;
+            ATBTariffProduct TariffProduct;
-        ATBInterpolation TariffInterpolation;
+            ATBInterpolation TariffInterpolation;
-        ATBPrepaid TariffPrepaidOption;
+            ATBPrepaid TariffPrepaidOption;
-        ATBCarryOver TariffCarryOver;
+            ATBCarryOver TariffCarryOver;
 
-        MemberType mb_type = MemberType::UnknownType;
+            MemberType mb_type = MemberType::UnknownType;
-        this->currentPaymentOptions.clear();
+            this->currentPaymentOptions.clear();
 
                 // Get all JSON object members
                 // This code should run only once (to load JSON variables into memory)
@@ -142,35 +143,34 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 
             qCritical() << " -" << mb_name;
 
-                        // Get array for each JSON object member
+            // Get array for each JSON object member
-                        auto mb_array = document[mb_name].GetArray();
+            auto mb_array = document[mb_name].GetArray();
-                        if (mb_array.Size() <= 0) break;
+            if (mb_array.Size() <= 0) break;
 
                         //Iterate over provided array
-            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++)
+            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++) {
-                        {
+                // Get all inner objects, don't print name if NULL
-                                // Get all inner objects, don't print name if NULL
+                auto inner_obj = mb_array[j].GetObject();
-                                auto inner_obj = mb_array[j].GetObject();
+                if (inner_obj.MemberCount() <= 0) break;
-                                if (inner_obj.MemberCount() <= 0) break;
 
-                                // Iterate over inner object JSON members
+                // Iterate over inner object JSON members
-                                for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
+                for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
-                                {
+                {
-                                        // Get inner object JSON member, don't print name if NULL
+                    // Get inner object JSON member, don't print name if NULL
-                                        const char* inner_obj_name = k->name.GetString();
+                    const char* inner_obj_name = k->name.GetString();
-                                        if (inner_obj_name == NULL)
+                    if (inner_obj_name == NULL)
-                                        {
+                    {
-                                                printf("Inner object name is NULL\n");
+                            printf("Inner object name is NULL\n");
-                                                continue;
+                            continue;
-                                        }
+                    }
 
-                                        // Identify member type
+                    // Identify member type
-                                        mb_type = IdentifyJsonMember(mb_name);
+                    mb_type = IdentifyJsonMember(mb_name);
 
-                                        switch (mb_type)
+                    switch (mb_type)
-                                        {
+                    {
-                                        case MemberType::UnknownType:
+                    case MemberType::UnknownType:
-                                                break;
+                        break;
                     case MemberType::CarryOverType: {
                         if (QString(inner_obj_name) == QString("carry_over_id")) {
                             if (k->value.IsInt()) {
@@ -196,6 +196,11 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                                                     TariffCarryOver.carryover[day].day = day;
                                                 }
                                             } else
+                                            if (member == "carry_over_duration") {
+                                                if (w->value.IsInt()) {
+                                                    TariffCarryOver.carryover[day].duration = w->value.GetInt();
+                                                }
+                                            } else
                                             if (member == "carry_over_seemless") {
                                                 if (w->value.IsBool()) {
                                                     bool b = w->value.GetBool();
@@ -330,6 +335,18 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                                 int const x = k->value.GetInt();
                                 TariffInterpolation.dynamic_until_price = x;
                             }
+                        } else
+                        if (QString(inner_obj_name) == QString("interpol_seemless")) {
+                            if (k->value.IsBool()) {
+                                bool const x = k->value.GetBool();
+                                TariffInterpolation.seemless = x;
+                            }
+                        }
+                        if (QString(inner_obj_name) == QString("interpol_never")) {
+                            if (k->value.IsBool()) {
+                                bool const x = k->value.GetBool();
+                                TariffInterpolation.never = x;
+                            }
                         }
                     } break;
                     case MemberType::ProductType: {
@@ -543,28 +560,52 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         }
                         break;
                     case MemberType::CurrencyType:
-                                                if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
+                        else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
-                                                break;
+                        break;
-                                        case MemberType::PaymentMethodType:
+                    case MemberType::PaymentMethodType:
-                                                if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
-                                                break;
+                        break;
-                                        case MemberType::PaymentRateType:
+                    case MemberType::PaymentRateType:
-                                                if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
-                                                break;
+                        break;
-                                        case MemberType::PaymentOptionType:
+                    case MemberType::PaymentOptionType:
                         if (strcmp(inner_obj_name, "pop_id") == 0) {
                             this->currentPaymentOptions.append(ATBPaymentOption());
                             this->currentPaymentOptions.last().reset();
                             this->currentPaymentOptions.last().pop_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_label") == 0) {
                             this->currentPaymentOptions.last().pop_label = k->value.GetString();
+                        } else if (strcmp(inner_obj_name, "pop_product_id") == 0) {
+                            this->currentPaymentOptions.last().pop_product_id = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_product_name") == 0) {
+                            if (k->value.IsString()) {
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                this->currentPaymentOptions.last().pop_product_name = s;
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_use_only_upto_datetime") == 0) {
+                            if (k->value.IsString()) {
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                this->currentPaymentOptions.last().pop_use_only_upto_datetime = s;
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_use_only_for_duration") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_use_only_for_duration = k->value.GetInt();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_plus_steps") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_plus_steps = k->value.GetInt();
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_minus_steps") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_minus_steps = k->value.GetInt();
+                            }
                         } else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
                             this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
@@ -583,6 +624,12 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) {
                             this->currentPaymentOptions.last().pop_prepaid_option_id = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_truncate_last_interpolation_step") == 0) {
+                            this->currentPaymentOptions.last().pop_truncate_last_interpolation_step = k->value.GetBool();
+                        } else if (strcmp(inner_obj_name, "pop_accumulate_prices") == 0) {
+                            this->currentPaymentOptions.last().pop_accumulate_prices = k->value.GetBool();
+                        } else if (strcmp(inner_obj_name, "pop_accumulate_durations") == 0) {
+                            this->currentPaymentOptions.last().pop_accumulate_durations = k->value.GetBool();
                         } else if (strcmp(inner_obj_name, "pop_carry_over_option_id") == 0) {
                             this->currentPaymentOptions.last().pop_carry_over_option_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
@@ -665,105 +712,108 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         }
                         break;
-                                        case MemberType::DurationType:
+                    case MemberType::DurationType:
-                                                if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pun_duration") == 0) {
-                        else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
+                            Duration.pun_duration = k->value.GetDouble();
+                            Duration.pun_duration_saved = Duration.pun_duration;
+                        } else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pun_interpolation_id") == 0) Duration.pun_interpolation_id = k->value.GetInt();
                         break;
-                                        case MemberType::SpecialDaysWorktimeType:
+                     case MemberType::SpecialDaysWorktimeType:
-                                                if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
-                                                break;
+                        break;
-                                        /*case MemberType::WeekDaysType:
+                /*case MemberType::WeekDaysType:
-                                                if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
-                                                break;*/
+                        break;*/
-                                        case MemberType::WeekDaysWorkTimeType:
+                     case MemberType::WeekDaysWorkTimeType:
-                                                if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pwd_pop_id") == 0) WeekDaysWorktime.pwd_pop_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pwd_next_id") == 0) WeekDaysWorktime.pwd_next_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pwd_time_to") == 0) WeekDaysWorktime.pwd_time_to = k->value.GetString();
                         break;
-                                        case MemberType::SpecialDaysType:
+                     case MemberType::SpecialDaysType:
-                                                if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_payment_option_id") == 0) SpecialDays.ped_payment_option_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_year") == 0) SpecialDays.ped_year = k->value.GetInt();
-                                                break;
+                        break;
-                                        case MemberType::PeriodYearType:
+                     case MemberType::PeriodYearType:
-                                                if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
+                        else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
-                                                else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
-                                                else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
-                                                break;
+                        break;
-                                        default:
+                    default:
-                                                break;
+                        break;
-                                        }
+                    }
 //#pragma endregion
-                                }
+                }
 
                                 // Push to specific list depending on member type
-                                switch (mb_type)
+                switch (mb_type) {
-                                {
+                case MemberType::UnknownType:
-                                case MemberType::UnknownType:
+                    break;
-                                        break;
                 case MemberType::PaymentMethodType:
-                                        cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
+                    cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
-                                        break;
+                    break;
                 case MemberType::PaymentRateType:
-                    // qCritical() << "PaymentRate" << PaymentRate;
+                    // qCritical() << "PaymentRate" << PaymentRate.pra_price << PaymentRate.pra_payment_option_id;
                     cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
-                                        break;
+                    break;
                 case MemberType::PaymentOptionType: {
                     if (!this->currentPaymentOptions.isEmpty()) {
                         ATBPaymentOption const &PaymentOption = this->currentPaymentOptions.last();
                         cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
                     }
                 } break;
-                                case MemberType::DurationType:
+                case MemberType::DurationType:
-                                        cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
+                    cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
                     // qCritical() << Duration;
                     break;
-                                case MemberType::SpecialDaysWorktimeType:
+                case MemberType::SpecialDaysWorktimeType:
-                                        cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
+                    cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
-                                        break;
+                    break;
                                 //case MemberType::WeekDaysType:
                                 //      cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
                                 //      break;
-                                case MemberType::WeekDaysWorkTimeType:
+                case MemberType::WeekDaysWorkTimeType:
-                                        cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
+                    cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
-                                        break;
+                    break;
-                                case MemberType::SpecialDaysType:
+                case MemberType::SpecialDaysType:
-                                        cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
+                    cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
-                                        break;
+                    break;
-                                case MemberType::PeriodYearType:
+                case MemberType::PeriodYearType:
-                                        cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
+                    cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
-                                        break;
+                    break;
                 case MemberType::DailyTicketType:
                     cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
-                    qCritical() << DailyTicket;
+                    // qCritical() << DailyTicket;
                     DailyTicket.reset();
                     break;
                 case MemberType::CustomerType:
                     cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
-                    qCritical() << Customer;
+                    // qCritical() << Customer;
                     break;
                 case MemberType::TimeBaseType:
                     cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
-                    qCritical() << TimeBase;
+                    // qCritical() << TimeBase;
                     break;
                 case MemberType::TimeRangeType:
                     cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
@@ -775,33 +825,152 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     break;
                 case MemberType::ProductType:
                     cfg->TariffProduct.insert(pair<int, ATBTariffProduct>(TariffProduct.m_tariff_product_id, TariffProduct));
-                    qCritical() << TariffProduct;
+                    // qCritical() << TariffProduct;
                     break;
                 case MemberType::InterpolationType:
                     cfg->TariffInterpolations.insert(pair<int, ATBInterpolation>(TariffInterpolation.id, TariffInterpolation));
-                    qCritical() << TariffInterpolation;
+                    // qCritical() << TariffInterpolation;
                     break;
                 case MemberType::PrepaidType:
                     cfg->TariffPrepaidOptions.insert(pair<int, ATBPrepaid>(TariffPrepaidOption.id, TariffPrepaidOption));
-                    qCritical() << TariffPrepaidOption;
+                    // qCritical() << TariffPrepaidOption;
                     break;
                 case MemberType::CarryOverType:
                     cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
-                    qCritical() << TariffCarryOver;
+                    // qCritical() << TariffCarryOver;
                     break;
                 default:
-                                        break;
+                     break;
-                                }
-                        }
                 }
-                return true;
+            }
-        }
-        catch (...) {
-                printf("%s\n", "General exception has occurred while parsing JSON\n");
-                return false;
         }
+        return true;
+    }
+    catch (...) {
+        printf("%s\n", "General exception has occurred while parsing JSON\n");
+        return false;
+    }
 }
 
+std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const {
+    int const pop_id = getPaymentOptions(paymentOptionIndex).pop_id;
+    int const pop_carry_over_option_id = getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+    int const pop_truncate_last_interpolation_step = getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
+    int const weekDay = start.date().dayOfWeek();
+    //QTime const &carryOverStart = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+    //QTime const &carryOverEnd = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
+    //bool const carry_over_seemless = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].seemless;
+    //bool const carry_over_never = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].never;
+    int const carryOverDuration  = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+    std::optional<QDateTime> value = std::nullopt;
+
+    QDateTime interpolationEndTime = start;
+    //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
+
+    int price = 0;
+
+    for (auto[itr, rangeEnd] = PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+        int const durationId = itr->second.pra_payment_unit_id;
+        // int const price = itr->second.pra_price;
+
+        auto search = Duration.find(durationId);
+        if (search != Duration.end()) {
+            ATBDuration duration = search->second;
+
+            if (duration.pun_interpolation_id == -1) {
+                // should never happen -> misconfigured tariff-file
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ") ERROR pun_interpolation not set!";
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ") See for instance customer_505/6";
+                break;
+            }
+
+            std::optional<ATBInterpolation> ipolCheck = getInterpolationType(duration.pun_interpolation_id);
+            if (ipolCheck) {
+                ATBInterpolation interpolation = ipolCheck.value();
+                switch (duration.pun_interpolation_id) {
+                    case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
+                    break;
+                    case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                    break;
+                    case static_cast<int>(ATBInterpolation::STATIC_TIMEPOINT_AND_DURATION):
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                    break;
+                    case static_cast<int>(ATBInterpolation::DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                    break;
+                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                    break;
+                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE): {
+                        interpolation.dynamic_start = start.time();
+                        interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
+
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")               interpol start:" << interpolation.dynamic_start.toString(Qt::ISODate);
+                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << interpolationEndTime.toString(Qt::ISODate);
+
+                        if (interpolation.seemless) {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                        } else
+                        if (interpolation.never) {
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                        } else {
+                            QDateTime const &s = interpolationEndTime.addSecs(duration.pun_duration * 60);
+                            int const minutesToStaticEnd = s.time().secsTo(interpolation.static_end) / 60;
+
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << s.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")          interpol static end:" << interpolation.static_end.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        minutes to static end:" << minutesToStaticEnd;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                       pun-id:" << duration.pun_id;
+
+                            int p = 0;
+                            for (auto[it, rangeEnd] = this->PaymentRate.equal_range(pop_id); it != rangeEnd; ++it) {
+                                if (it->second.pra_payment_unit_id == duration.pun_id) {
+                                    if (minutesToStaticEnd >= 0) {
+                                        // the end of the interpolation for this day must be before a possible carry over interval
+                                        p = it->second.pra_price;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
+                                        price += p;
+                                        interpolationEndTime = s;
+                                    } else {
+                                        if (pop_truncate_last_interpolation_step == false) {
+                                            p = it->second.pra_price;
+                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
+                                            price += p;
+                                            interpolationEndTime = s;
+                                            interpolationEndTime = interpolationEndTime.addSecs(carryOverDuration * 60);
+                                        } else {
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                                        }
+                                    }
+                                }
+                            }
+
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
+
+                            if (price >= interpolation.dynamic_until_price) {
+     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
+     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
+                                value = value.value_or(interpolationEndTime);
+                                break;
+                            }
+                        }
+                    }
+                    break;
+                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
+                    break;
+                    default:;
+                }
+            }
+        }
+    }
+
+    return value;
+}
+
+
 int Configuration::getPaymentOptionIndexIfSpecialDay(QDateTime const &dt) const {
     if (isSpecialDay(dt)) {
         int const numOptions = getAllPaymentOptions().size();
@@ -826,6 +995,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
             for (int opt=0; opt < numOptions; ++opt) {
                 uint64_t const pop_id = getPaymentOptions(opt).pop_id;
                 if (pop_id == (uint64_t)sd.ped_payment_option_id) {
+
+                    qCritical() << __func__ << __LINE__ << opt;
+
                     return opt;
                 }
             }
@@ -835,6 +1007,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
     for (int opt=0; opt < numOptions; ++opt) {
         uint64_t const pop_business_hours = getPaymentOptions(opt).pop_business_hours;
 
+        if (pop_business_hours == 0) { // 0 == 24/7
+            return opt;
+        }
 
         uint64_t p = 0;
         int const dayOfWeek = dt.date().dayOfWeek();
@@ -865,6 +1040,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         }
 
         if ((pop_business_hours & p) == p) {
+
+            qCritical() << __func__ << __LINE__ << opt;
+
             return opt;
         }
     }
@@ -981,6 +1159,41 @@ Configuration::getTariffProductForProductTypeName(QString const &permitTypeName)
     return value;
 }
 
+int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
+
+    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
+    if (paymentOptions) {
+        QVector<ATBPaymentOption> const vec = paymentOptions.value();
+        PermitType const p(permitType);
+
+        for (int i = 0; i < vec.size(); ++i) {
+            if (vec[i].pop_product_name == p.toString()) {
+               return i;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
+    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
+    if (paymentOptions) {
+
+
+        QVector<ATBPaymentOption> const vec = paymentOptions.value();
+        PermitType const p(permitType);
+
+        for (int i = 0; i < vec.size(); ++i) {
+            if (vec[i].pop_product_name == p.toString()) {
+               return i;
+            }
+        }
+    }
+
+    return 0;
+}
+
 std::optional<QVector<ATBTariffProduct>>
 Configuration::getTariffProductForProductId(PermitType permitType) const {
     QString permitTypeName(permitType);
@@ -1043,23 +1256,27 @@ std::optional<ATBPrepaid> Configuration::getPrepaidType(int key) const {
     return value;
 }
 
-std::optional<QDateTime> Configuration::adaptStart(QDateTime const &start, int prepaid_option_id) {
+std::optional<QDateTime> Configuration::prepaidStart(QDateTime const &start, int prepaid_option_id) {
     std::optional<QDateTime> value;
     QDateTime s = start;
 
+    // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid option id:" << prepaid_option_id;
+
     std::optional<ATBPrepaid> prepaid_option = getPrepaidType(prepaid_option_id);
     if (prepaid_option.has_value()) {
         ATBPrepaid prepaid = prepaid_option.value();
-        if (prepaid.anytime == true) {
+
-            int const weekdayId = s.date().dayOfWeek();
+        if (prepaid.never == false) {
-            QTime worktime_from = QTime::fromString(WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str(), Qt::ISODate);
+            // start: 22:00, end: 08:00
-            QTime worktime_to = QTime::fromString(WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str(), Qt::ISODate);
+            QTime prepaidStart = TariffPrepaidOptions.find(prepaid_option_id)->second.static_start;
-            if (s.time() < worktime_from) {
+            QTime prepaidEnd = TariffPrepaidOptions.find(prepaid_option_id)->second.static_end;
-                s.setTime(worktime_from);
+
+            if (s.time() >= prepaidStart) {
+                s = s.addDays(1);
+                s.setTime(prepaidEnd);
             } else
-            if (worktime_to < s.time()) {
+            if (s.time() < prepaidEnd) {
-                s = start.addDays(1);
+                s.setTime(prepaidEnd);
-                s.setTime(worktime_from);
             }
             s.setTime(QTime(s.time().hour(), s.time().minute(), 0));
             value = value.value_or(s);
@@ -1086,6 +1303,65 @@ Configuration::getDailyTicketsForKey(int key) const {
     return value;
 }
 
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForId(int key) const {
+    ATBPaymentOption option;
+    std::optional<ATBPaymentOption> value;
+
+    for (auto[it, rangeEnd] = this->PaymentOption.equal_range(key); it != rangeEnd; ++it) {
+        value = value.value_or(it->second);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBPaymentOption>>
+Configuration::getPaymentOptionsForAllKeys() const {
+    QVector<ATBPaymentOption> paymentOptions;
+    std::optional<QVector<ATBPaymentOption>> value;
+    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
+        it != this->PaymentOption.cend(); ++it) {
+        paymentOptions.append(it->second);
+    }
+
+    if (paymentOptions.size() > 0) {
+        value = value.value_or(paymentOptions);
+    }
+
+    return value;
+}
+
+// TODO: umbenennen: getPaymentOptionForPermitType
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(PERMIT_TYPE permitType) const {
+    return getPaymentOptionForKey(static_cast<int>(permitType));
+}
+
+
+// TODO: umbenennen: getPaymentOptionForPermitType
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(int permitType) const {
+    std::optional<ATBPaymentOption> value;
+
+    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
+        it != this->PaymentOption.cend(); ++it) {
+        ATBPaymentOption const &paymentOption = it->second;
+        if (paymentOption.pop_product_id == permitType) {
+            value = value.value_or(paymentOption);
+            break;
+        }
+    }
+
+    return value;
+}
+
+// TODO: umbenennen: getPaymentOptionForPermitType
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(QString const &permitTypeStr) const {
+    PERMIT_TYPE permitType = PermitType::toPermitType(permitTypeStr);
+    return getPaymentOptionForKey(static_cast<int>(permitType));
+}
+
 std::optional<QVector<ATBPaymentRate>>
 Configuration::getPaymentRateForAllKeys() const {
     QVector<ATBPaymentRate> paymentRates;
@@ -1135,6 +1411,25 @@ Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
     return std::nullopt;
 }
 
+std::optional<QVector<ATBWeekDaysWorktime>>
+Configuration::getAllWeekDayWorkTimes() {
+    QVector<ATBWeekDaysWorktime> worktimes;
+    std::optional<QVector<ATBWeekDaysWorktime>> value;
+
+    worktimes.clear();
+
+    for (std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.cbegin();
+        it != this->WeekDaysWorktime.cend(); ++it) {
+        worktimes.append(it->second);
+    }
+
+    if (worktimes.size() > 0) {
+        value = value.value_or(worktimes);
+    }
+
+    return value;
+}
+
 std::optional<ATBWeekDaysWorktime>
 Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
     ATBWeekDaysWorktime worktime;

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;

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)
 {

main/main.cpp

@@ -49,8 +49,10 @@ extern "C" char* strptime(const char* s,
 #define NEUHAUSER_STOCKERAU                     (0)
 #define KLEIPEDA_LITAUEN                        (0)
 #define SEXTEN                                  (0)
-#define SCHNALS_LEITER_KIRCHL                   (1)
+#define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
+#define VALSER_ALM                              (0)
+#define FUCHS_MUEHLBACH                         (1)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -353,7 +355,7 @@ int main() {
         QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
         qCritical() << "TimeSteps" << timeSteps;
 
-        return 0;
+        // return 0;
 
         CalcState cs;
         double cost;
@@ -362,7 +364,7 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 5, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime s(QDate(2024, 7, 29 + day), QTime()); // 20: (whit) monday,..., 26: sunday
             QDateTime end;
 
             switch (day) {
@@ -400,9 +402,11 @@ int main() {
                                                         bool prepaid = true);
             */
 
-            for (int minutes = 0; minutes < 1440; ++minutes) {
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
-                QDateTime start = s.addSecs(minutes * 60);
+            for (int minutes = 540; minutes <= 540; ++minutes) {
-                QDateTime effectiveStart = start;
+                // QDateTime start = s.addSecs(minutes * 60);
+                QDateTime start(QDateTime::currentDateTime());
+                QDateTime effectiveStart(QDateTime::currentDateTime());
 
                 if (start.time() < QTime(8, 0, 0)) {
                     effectiveStart.setTime(QTime(8, 0, 0));
@@ -414,55 +418,18 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
-                for (int i = 0; i <= 2100; i += 10) {
+                for (int i = 30; i <= 30; i += 10) {
                 //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
-                        durationInMinutes = pop_min_time;
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                        if (i > 0) {
+                                    << "> end" << end.toString(Qt::ISODate);
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 600; // 22:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-                        qCritical() << cs.toString();
                     }
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
                 }
             }
         }
@@ -551,7 +518,7 @@ int main() {
             */
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 0; minutes < 1440; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
                 // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -568,66 +535,32 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
+/*
                 for (int i = 10; i <= 400; i += 10) {
-                //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
-
-
                         qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
                                     << "> end" << end.toString(Qt::ISODate);
-
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 780; // 19:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-#if 0
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
-#endif
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-//                        qCritical() << cs.toString();
                     }
+                }
+*/
+                int netto_parking_time = 60;
+                struct price_t price;
 
-#if 0
+                qCritical() << "start" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
-#endif
 
+                QDateTime const s = start;
+
+                if ((cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                        qCritical() << "start" << s.toString(Qt::ISODate)
+                                    << "netto_parking_time" << netto_parking_time
+                                    << "< price" << price.netto
+                                    << "> end" << end.toString(Qt::ISODate);
                 }
             }
         }
@@ -643,8 +576,8 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+    input.open("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
-    //input.open("/opt/ptu5/opt/customer_506/etc/psa_tariff/tariff01.json");
+    //input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
@@ -656,10 +589,13 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
+        //PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
-        pop_max_time = get_maximal_parkingtime(&cfg);
+        PermitType permitType(PERMIT_TYPE::DAY_TICKET_PKW);
-        pop_min_price = get_minimal_parkingprice(&cfg);
+
-        pop_max_price = get_maximal_parkingprice(&cfg);
+        pop_min_time = get_minimal_parkingtime(&cfg, permitType);
+        pop_max_time = get_maximal_parkingtime(&cfg, permitType);
+        pop_min_price = get_minimal_parkingprice(&cfg, permitType);
+        pop_max_price = get_maximal_parkingprice(&cfg, permitType);
         pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
         qCritical() << "        pop_min_time: " << pop_min_time;
@@ -667,10 +603,20 @@ int main() {
         qCritical() << "       pop_min_price: " << pop_min_price;
         qCritical() << "       pop_max_price: " << pop_max_price;
 
-        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        //QDateTime s = QDateTime::currentDateTime();
-        qCritical() << "TimeSteps" << timeSteps;
+        //s.setTime(QTime(13, 30, 0));
+        //std::optional<QDateTime> e = cfg.getInterpolationEnd(s, 0);
+        //if (e) {
+        //    qCritical() << "       endtime: " << e.value().toString(Qt::ISODate);
+        //}
+        //return 0;
 
-        return 0;
+        //QDateTime start = QDateTime::currentDateTime();
+        //start.setTime(QTime(18, 0, 0));
+        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, start);
+        //qCritical() << "TimeSteps" << timeSteps;
+
+        //return 0;
 
         CalcState cs;
         double cost;
@@ -679,7 +625,7 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 7, 14 + day), QTime());
+            QDateTime s(QDate(2024, 7, 21 + day), QTime(0, 0, 0));
             QDateTime end;
 
             switch (day) {
@@ -707,7 +653,7 @@ int main() {
             }
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 420; minutes < 420; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
                 // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -716,57 +662,21 @@ int main() {
 
                 // hier sollte man auch testen was passiert, falls man ausserhalb
                 // der verkaufsdaten steht
-                if (start.time() < QTime(8, 0, 0)) {
+                if (start.time() < QTime(7, 0, 0)) {
-                    effectiveStart.setTime(QTime(8, 0, 0));
+                    effectiveStart.setTime(QTime(7, 0, 0));
                 } else
-                if (start.time() <= QTime(19, 0, 0)) {
+                if (start.time() <= QTime(20, 0, 0)) {
                     effectiveStart = start;
                 } else {
                     effectiveStart = start.addDays(1);
-                    effectiveStart.setTime(QTime(8, 0, 0)); // next day
+                    effectiveStart.setTime(QTime(7, 0, 0)); // next day
                 }
 
-                for (int i = 10; i <= 400; i += 10) {
+#if 0
-                //for (int i = 2100; i <= 2100; i += 10) {
+                for (int i = 700; i <= 1400; i += 700) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
-
-
-                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                                    << "> end" << end.toString(Qt::ISODate);
-
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 780; // 19:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-#if 0
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
-#endif
                     }
 
                     if (!cs) {
@@ -775,23 +685,386 @@ int main() {
 //                        qCritical() << cs.toString();
                     }
 
-#if 0
+                    //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
+                    //            << "> end" << end.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
-#endif
 
                 }
+#else
+
+                start = QDateTime::currentDateTime();
+                //start.setTime(QTime(9, 57, 0));
+
+                for (int netto_parking_time = 60; netto_parking_time <= 60; netto_parking_time += 60) {
+
+                    QDateTime end;
+                    struct price_t price;
+                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
+
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
+                                << "price" << price.netto;
+                }
+#endif
             }
         }
     }
 #endif
 
+#if FUCHS_MUEHLBACH==1
+    std::ifstream input;
+    int pop_min_time;
+    int pop_max_time;
+    int pop_min_price;
+    int pop_max_price;
+    int pop_daily_card_price;
+
+    input.open("/home/linux/customer_504/etc/psa_tariff/tariff01.json");
+    //input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+        PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
+
+        //pop_min_time = get_minimal_parkingtime(&cfg, permitType);
+        //pop_max_time = get_maximal_parkingtime(&cfg, permitType);
+        //pop_min_price = get_minimal_parkingprice(&cfg, permitType);
+        //pop_max_price = get_maximal_parkingprice(&cfg, permitType);
+        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+        //qCritical() << "        pop_min_time: " << pop_min_time;
+        //qCritical() << "        pop_max_time: " << pop_max_time;
+        //qCritical() << "       pop_min_price: " << pop_min_price;
+        //qCritical() << "       pop_max_price: " << pop_max_price;
+
+        CalcState cs;
+        double cost;
+        int durationInMinutes = 0;
+        int offsetInMinutes = 0;
+
+        // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
+        for (int day = Qt::Wednesday; day <= Qt::Wednesday; ++day) {
+            QDateTime s(QDate(2024, 8, 11 + day), QTime(0, 0, 0));
+            QDateTime end;
+
+            switch (day) {
+            case (int)Qt::Monday:
+                qCritical() << "Monday";
+                break;
+            case (int)Qt::Tuesday:
+                qCritical() << "Tuesday";
+                break;
+            case (int)Qt::Wednesday:
+                qCritical() << "Wednesday";
+                break;
+            case (int)Qt::Thursday:
+                qCritical() << "Thursday";
+                break;
+            case (int)Qt::Friday:
+                qCritical() << "Friday";
+                break;
+            case (int)Qt::Saturday:
+                qCritical() << "Saturday";
+                break;
+            case (int)Qt::Sunday:
+                qCritical() << "Sunday";
+                break;
+            }
+
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
+            for (int minutes = 491; minutes <= 491; minutes += 1) {
+                QDateTime start = s.addSecs(minutes * 60);
+
+                //qCritical() << "start" << start.toString(Qt::ISODate);
+
+                QDateTime effectiveStart = start;
+
+                // hier sollte man auch testen was passiert, falls man ausserhalb
+                // der verkaufsdaten steht
+                if (start.time() < QTime(7, 0, 0)) {
+                    effectiveStart.setTime(QTime(7, 0, 0));
+                } else
+                if (start.time() <= QTime(20, 0, 0)) {
+                    effectiveStart = start;
+                } else {
+                    effectiveStart = start.addDays(1);
+                    effectiveStart.setTime(QTime(7, 0, 0)); // next day
+                }
+
+#if 0
+                qCritical() << "";
+                qCritical() << "compute_duration_for_parking_ticket";
+                qCritical() << "===================================";
+
+                for (int i = 0; i <= 600; i += 10) {
+                    cost = i;
+
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
+                    }
+
+                    if (!cs) {
+                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
+                    } else {
+//                        qCritical() << cs.toString();
+                    }
+
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                << "> end" << end.toString(Qt::ISODate);
+
+                }
+#else
+                qCritical() << "";
+                qCritical() << "compute_price_for_parking_ticket";
+                qCritical() << "================================";
+
+                for (int netto_parking_time = 180; netto_parking_time <= (180 + 720*3); netto_parking_time += 720) {
+                    QDateTime end;
+                    struct price_t price;
+                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
+
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
+                                << "price" << price.netto;
+                }
+#endif
+            }
+        }
+    }
+#endif
+
+#if VALSER_ALM==1
+    std::ifstream input;
+    int pop_min_time;
+    int pop_max_time;
+    int pop_min_price;
+    int pop_max_price;
+    int pop_daily_card_price;
+
+    int zone = 3;
+
+    if (zone == 1) {
+        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
+    }
+    if (zone == 2) {
+        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json");
+    }
+    if (zone == 3) {
+        input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json");
+    }
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+
+        if (zone == 1 || zone == 3) {
+/*
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_pkw: " << pop_min_time;
+            qCritical() << "        pop_max_time_pkw: " << pop_max_time;
+            qCritical() << "       pop_min_price_pkw: " << pop_min_price;
+            qCritical() << "       pop_max_price_pkw: " << pop_max_price;
+
+            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time_bus: " << pop_min_time;
+            qCritical() << "        pop_max_time_bus: " << pop_max_time;
+            qCritical() << "       pop_min_price_bus: " << pop_min_price;
+            qCritical() << "       pop_max_price_bus: " << pop_max_price;
+*/
+        }
+        if (zone == 2) {
+            pop_min_time = get_minimal_parkingtime(&cfg);
+            pop_max_time = get_maximal_parkingtime(&cfg);
+            pop_min_price = get_minimal_parkingprice(&cfg);
+            pop_max_price = get_maximal_parkingprice(&cfg);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "        pop_min_time: " << pop_min_time;
+            qCritical() << "        pop_max_time: " << pop_max_time;
+            qCritical() << "       pop_min_price: " << pop_min_price;
+            qCritical() << "       pop_max_price: " << pop_max_price;
+        }
+
+        //QDateTime start = QDateTime::currentDateTime();
+        //start.setTime(QTime(12, 0, 0));
+        //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, start);
+        //qCritical() << "TimeSteps" << timeSteps;
+        //return 0;
+        if (zone == 1) {
+            //int minParkingTime = get_minimal_parkingtime(&cfg);
+            QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+
+            if (paymentOptionIndex < 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            QSet<uint32_t> const prices_pkw{600, 1200, 1800, 2400, 3000, 3600, 4200};
+            QSet<uint32_t> const prices_bus{3000, 6000, 9000, 12000, 15000, 18000, 21000};
+
+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            s.setTime(QTime(12, 0, 0));
+
+            //calcState = compute_duration_for_parking_ticket(&cfg, s,
+            //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+            //qCritical() << end.toString(Qt::ISODate);
+            //qCritical() << calcState.toString();
+
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+            qCritical() << end.toString(Qt::ISODate);
+            qCritical() << calcState.toString();
+        }
+
+        if (zone == 2) {
+            //int minParkingTime = get_minimal_parkingtime(&cfg);
+            QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+            qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+
+            if (paymentOptionIndex < 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            QSet<uint32_t> const prices{600, 1200, 1800, 2400, 3000, 3600, 4200};
+
+            QDateTime end;
+            CalcState calcState;
+            QDateTime s(QDateTime::currentDateTime());
+
+            s.setTime(QTime(18, 0, 0));
+            calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                (double)600, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+            qCritical() << end.toString(Qt::ISODate);
+            qCritical() << calcState.toString();
+#if 0
+
+            for (int i=0; i<timeSteps.size(); ++i) {
+                int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
+                qCritical() << "nextTimeStep" << nextTimeStep;
+
+                uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i), paymentOptionIndex);
+
+                qCritical() << "price for" << timeSteps.at(i) << ": " << price;
+
+                uint32_t duration = Calculator::GetInstance().GetDurationForPrice(&cfg, price);
+
+                qCritical() << "duration for price" << price << "duration: " << duration;
+
+                if (!prices.contains(price)) {
+                    qCritical() << "ERROR nextTimeStep relative to start:"
+                                << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
+                                << "(price so far:" << price << ")";
+                    exit(-1);
+                }
+                qCritical() << "nextTimeStep relative to start:"
+                            << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
+                            << "(price so far:" << price << ")";
+
+            }
+#endif
+        }
+        if (zone == 3) {
+            //QDateTime xx(QDateTime::fromString("2024-07-31T00:00:00", Qt::ISODate));
+            //xx = xx.addSecs(-60); // -->  "2024-07-30T23:59:00"
+            //qCritical() << xx.toString(Qt::ISODate);
+
+            //QDateTime s(QDateTime::currentDateTime());
+            //s.setTime(QTime(12, 0, 0));
+            //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, s);
+            //qCritical() << timeSteps;
+            int Down = 0;
+            int Up = 1;
+
+            QDateTime const start = QDateTime::currentDateTime();
+            int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+
+            if (paymentOptionIndex != 0) {
+                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
+                            << "< 0 for start" << start.toString(Qt::ISODate);
+                exit(-1);
+            }
+
+            //QSet<uint32_t> const prices1{800, 1600, 2400, 3200, 4000, 4800, 5600};
+            //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
+
+            QDateTime end;
+            CalcState calcState;
+
+            QDateTime s(QDateTime::currentDateTime());
+            s.setTime(QTime(12, 0, 0));
+
+            int minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                                 paymentOptionIndex, s);
+
+#if 0
+            qCritical() << "minimal parking price" << minimal_parking_price;
+
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
+            }
+
+#else
+            s.setTime(QTime(15, 0, 0));
+
+            minimal_parking_price = get_minimal_parkingprice(&cfg,
+                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
+                                                             paymentOptionIndex, s);
+
+            qCritical() << "minimal parking price" << minimal_parking_price;
+
+            for (int i = 0; i < 8; ++i) {
+                calcState = compute_duration_for_parking_ticket(&cfg, s,
+                                                    (double)minimal_parking_price + i*800,
+                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
+                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
+            }
+#endif
+        }
+    }
+#endif
+
 #if NEUHAUSER_STOCKERAU==1
     std::ifstream input;
     int pop_min_time;
@@ -1306,7 +1579,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
@@ -1329,7 +1602,7 @@ int main() {
                         }
 
                         qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "PRICE=" << price1;
+                                    << timeSteps.at(i) << "PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
 
 
                         //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -1413,7 +1686,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1497,7 +1770,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1582,7 +1855,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1640,7 +1913,7 @@ int main() {
                         double cost = 0;
                         CalcState cs;
 
-                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                             cost = price.netto;
                             qCritical() << "step" << *step << ": cost" << cost;
                         } else {
@@ -1743,7 +2016,7 @@ int main() {
                 CalcState cs;
                 for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                     QDateTime end = start.addSecs(timeSteps.at(i)*60);
-                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                     qCritical() << endl;
                 }
 
@@ -1768,7 +2041,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);

main/main.pro

@@ -29,8 +29,10 @@ SOURCES += main.cpp
 
 # HEADERS +=
 
-# OTHER_FILES += \
+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