tests for galtuer

library/include/mobilisis/calculate_price.h

@@ -266,8 +266,7 @@ 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, PermitType const &permitType);
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 
@@ -298,8 +297,7 @@ 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,
-                                            PermitType permitType);
+                                            struct price_t *price);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
@@ -307,28 +305,24 @@ 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,
-                                            PermitType permitType);
+                                            QString &duration);
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
                                             double cost,
-                                            QDateTime &ticketEndTime,
-                                            PermitType permitType);      // return value
+                                            QDateTime &ticketEndTime);      // return value
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
-                                            QDateTime &ticketEndTime,
-                                            PermitType permitType);
+                                            QDateTime &ticketEndTime);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                             parking_tariff_t *tariff,

library/include/mobilisis/calculator_functions.h

@@ -70,8 +70,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,
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
+	std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -82,8 +81,7 @@ public:
     /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
-                               PermitType permitType, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);
 
     // Daily ticket
     QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
@@ -93,10 +91,8 @@ 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, QDateTime const &start = QDateTime::currentDateTime()) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const {
-        return GetTimeSteps(cfg, paymentOptionIndex, start);
-    }
+    QList<int> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
+    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
 
     QList<int> GetPriceSteps(Configuration *cfg) const;
 
@@ -119,7 +115,7 @@ public:
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes, int paymentOptionIndex=0) const;
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end, int paymentOptionIndex=0) const;
 
-private:
+// private:
     Ticket private_GetCostFromDuration(Configuration const* cfg,
                                        QDateTime const &start,
                                        int durationMinutes,

library/include/mobilisis/configuration.h

@@ -25,10 +25,6 @@
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
 #include "tariff_product.h"
-#include "tariff_interpolation.h"
-#include "tariff_prepaid.h"
-#include "tariff_carryover.h"
-#include "tariff_permit_type.h"
 
 #include <QVector>
 #include <optional>
@@ -45,32 +41,26 @@ public:
     using TimeRangeType = std::multimap<int, ATBTimeRange>;
     using TariffProductType = std::multimap<int, ATBTariffProduct>;
     using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
-    using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
-    using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
-    using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
 
     ATBProject project;
     ATBCurrency Currency;
-    ATBDuration duration;
+	ATBDuration duration;
 
 	multimap<int, ATBDuration> Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
-	SpecialDaysWorktimeType SpecialDaysWorktime;
-	SpecialDaysType SpecialDays;
+    SpecialDaysWorktimeType SpecialDaysWorktime;
+    SpecialDaysType SpecialDays;
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-	ATBPaymentOptionType PaymentOption;
-	multimap<int, ATBDailyTicket> DailyTicket;
-	TimeRangeType TimeRange;
-	multimap<int, ATBTimeStepConfig> TimeStepConfig;
-	multimap<int, ATBTimeBase> TimeBase;
-	multimap<int, ATBCustomer> Customer;
-	TariffProductType TariffProduct;
-	TariffInterpolationType TariffInterpolations;
-	TariffPrepaidType TariffPrepaidOptions;
-	TariffCarryOverType TariffCarryOverOptions;
+    ATBPaymentOptionType PaymentOption;
+    multimap<int, ATBDailyTicket> DailyTicket;
+    TimeRangeType TimeRange;
+    multimap<int, ATBTimeStepConfig> TimeStepConfig;
+    multimap<int, ATBTimeBase> TimeBase;
+    multimap<int, ATBCustomer> Customer;
+    TariffProductType TariffProduct;
 
 	/// <summary>
 	/// Parse JSON string
@@ -92,28 +82,15 @@ public:
     bool isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime const &dt) const;
     bool isDayIncludedAsSpecialDay(uint64_t businessHours, int specialDayId) const;
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
-    std::optional<QVector<ATBPaymentOption>> getPaymentOptionsForAllKeys() const;
-    std::optional<ATBPaymentOption> getPaymentOptionForId(int key) const;
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(PERMIT_TYPE permitType) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(int permitType) const;
-    std::optional<ATBPaymentOption> getPaymentOptionForKey(QString const &permitType) const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
-    std::optional<ATBInterpolation> getInterpolationType(int type) const;
-    std::optional<QDateTime> getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const;
-    std::optional<ATBPrepaid> getPrepaidType(int type) const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
-    std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
-
-    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
-    int getPaymentOptionIndex(PERMIT_TYPE permitType);
-    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;
 
 private:
 	/// <summary>
@@ -123,5 +100,5 @@ private:
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
 
-	QVector<ATBPaymentOption> currentPaymentOptions;
+    QVector<ATBPaymentOption> currentPaymentOptions;
 };

library/include/mobilisis/duration.h

@@ -1,40 +1,11 @@
 #include <string>
 
-#include <QDebug>
-
 class ATBDuration
 {
 public:
-    explicit ATBDuration()
-      : pun_id(0)
-      , pun_label("")
-      , pun_duration(0)
-      , pun_duration_saved(0)
-      , pun_duration_min(0)
-      , pun_duration_max(0)
-      , pun_interpolation_id(-1) {
-    }
-
-    friend QDebug operator<<(QDebug debug, ATBDuration const &td) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "              pun_id: " << td.pun_id << "\n"
-            << "           pun_label: " << QString::fromStdString(td.pun_label) << "\n"
-            << "        pun_duration: " << td.pun_duration << "\n"
-            << "  pun_duration_saved: " << td.pun_duration_saved << "\n"
-            << "    pun_duration_min: " << td.pun_duration_min << "\n"
-            << "    pun_duration_max: " << td.pun_duration_max << "\n"
-            << "pun_interpolation_id: " << td.pun_interpolation_id << "\n";
-
-        return debug;
-    }
-
 	int pun_id;
 	std::string pun_label;
 	int pun_duration;
-    int pun_duration_saved;
     int pun_duration_min;
     int pun_duration_max;
-    int pun_interpolation_id;
 };

library/include/mobilisis/member_type.h

@@ -19,10 +19,7 @@ enum MemberType
     TimeBaseType = 0x0C,
     TimeRangeType = 0x0D,
     TimeStepConfigType = 0x0E,
-    ProductType = 0x0F,
-    InterpolationType = 0x10,
-    PrepaidType = 0x11,
-    CarryOverType = 0x12
+    ProductType = 0x0F
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -15,8 +15,6 @@ 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,29 +24,22 @@ public:
         pop_min_price = 0;
         pop_max_price = 0;
         pop_carry_over = -1;
-        pop_carry_over_option_id = -1;
-        pop_prepaid_option_id = -1;
-        pop_truncate_last_interpolation_step = false;
-        pop_accumulate_prices = false;
-        pop_accumulate_durations = false;
         pop_carry_over_target = false;
         pop_carry_over_time_range_id = -1;
         pop_carry_over_start_time_range = -1;
         pop_carry_over_end_time_range = -1;
+        pop_prepay = false;
+        pop_prepay_time_range_id = -1;
+        pop_prepay_over_start_time_range = -1;
+        pop_prepay_end_time_range = -1;
         pop_daily_card_price = -1;
         pop_business_hours = -1;
         pop_time_step_config = -1;
-        pop_use_only_upto_datetime = "";
-        pop_use_only_for_duration = 0;
     }
 
     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;
@@ -57,18 +48,17 @@ public:
     double pop_min_price;
     double pop_max_price;
     int pop_carry_over;
-    int pop_carry_over_option_id;
-    bool pop_truncate_last_interpolation_step;
-    int pop_prepaid_option_id;
     bool pop_carry_over_target;
     int pop_carry_over_time_range_id;
     int pop_carry_over_start_time_range;
     int pop_carry_over_end_time_range;
+    bool pop_prepay;
+    int pop_prepay_time_range_id;
+    int pop_prepay_over_start_time_range;
+    int pop_prepay_end_time_range;
     int pop_daily_card_price;
     uint64_t pop_business_hours;
     int pop_time_step_config;
-    bool pop_accumulate_prices;
-    bool pop_accumulate_durations;
 
     struct ATBMaxDateTime {
         int direction;

library/include/mobilisis/tariff_carryover.h

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

library/include/mobilisis/tariff_global_defines.h

@@ -3,18 +3,4 @@
 
 #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

@@ -1,95 +0,0 @@
-#ifndef TARIFF_INTERPOLATION_H_INCLUDED
-#define TARIFF_INTERPOLATION_H_INCLUDED
-
-#include <QTime>
-#include <QString>
-
-struct ATBInterpolation {
-
-    enum Type {
-        NO_INTERPOLATION = 1,
-        STATIC_WALLCLOCK_TIME_VALUES = 2,
-        STATIC_TIMEPOINT_AND_DURATION = 3,
-        DYNAMIC_TIMEPOINT_AND_STATIC_DURATION = 4,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION = 5,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE = 6,
-        DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME = 7
-    };
-
-    static QString name(int i) {
-        switch(i) {
-        case (int)(NO_INTERPOLATION):
-            return QString("%1: NO_INTERPOLATION").arg(i);
-        case (int)(STATIC_WALLCLOCK_TIME_VALUES):
-            return QString("%1: STATIC_WALLCLOCK_TIME_VALUES").arg(i);
-        case (int)(STATIC_TIMEPOINT_AND_DURATION):
-            return QString("%1: STATIC_TIMEPOINT_AND_DURATION").arg(i);
-        case (int)(DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
-            return QString("%1: DYNAMIC_TIMEPOINT_AND_STATIC_DURATION").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE").arg(i);
-        case (int)(DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
-            return QString("%1: DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME").arg(i);
-        default:;
-        }
-        return "ERROR";
-    }
-
-    explicit ATBInterpolation()
-      : id(0)
-      , static_start(QTime())
-      , static_end(QTime())
-      , static_start_str(QString())
-      , static_end_str(QString())
-      , static_duration(0)
-      , dynamic_start(QTime())
-      , dynamic_end(QTime())
-      , dynamic_start_str(QString())
-      , dynamic_end_str(QString())
-      , dynamic_duration(0)
-      , dynamic_until_price(0)
-      , seemless(false)
-      , never(false) {
-    }
-
-    int id;
-    QTime static_start;
-    QTime static_end;
-    QString static_start_str;
-    QString static_end_str;
-    int static_duration;
-    QTime dynamic_start;
-    QTime dynamic_end;
-    QString dynamic_start_str;
-    QString dynamic_end_str;
-    int dynamic_duration;
-    int dynamic_until_price;
-    bool seemless;
-    bool never;
-
-    friend QDebug operator<<(QDebug debug, ATBInterpolation const &i) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "                 id: " << name(i.id) << "\n"
-            << "       static_start: " << i.static_start.toString(Qt::ISODate) << "\n"
-            << "         static_end: " << i.static_end.toString(Qt::ISODate) << "\n"
-            << "   static_start_str: " << i.static_start_str << "\n"
-            << "     static_end_str: " << i.static_end_str << "\n"
-            << "    static_duration: " << i.static_duration << "\n"
-            << "      dynamic_start: " << i.dynamic_start.toString(Qt::ISODate) << "\n"
-            << "        dynamic_end: " << i.dynamic_end.toString(Qt::ISODate) << "\n"
-            << "  dynamic_start_str: " << i.dynamic_start_str << "\n"
-            << "    dynamic_end_str: " << i.dynamic_end_str << "\n"
-            << "   dynamic_duration: " << i.dynamic_duration << "\n"
-            << "dynamic_until_price: " << i.dynamic_until_price << "\n"
-            << "           seemless: " << i.seemless << "\n"
-            << "              never: " << i.never << "\n";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_INTERPOLATION_H_INCLUDED

library/include/mobilisis/tariff_permit_type.h

@@ -13,13 +13,7 @@ enum class PERMIT_TYPE : quint8 {
     DAY_TICKET_CHILD=6,
     INVALID=7,
     FOOD_STAMP=8,
-    TWENTY_FOUR_HOURS_TICKET=9,
-    SHORT_TERM_PARKING_PKW=10,
-    SHORT_TERM_PARKING_BUS=11,
-    SHORT_TERM_PARKING_CAMPER=12,
-    DAY_TICKET_PKW=13,
-    DAY_TICKET_BUS=14,
-    DAY_TICKET_CAMPER=15
+    TWENTY_FOUR_HOURS_TICKET=9
 };
 
 struct PermitType {
@@ -49,30 +43,12 @@ struct PermitType {
         case 6:
             m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
             break;
-        case 8:
+        case 7:
             m_permitType = PERMIT_TYPE::FOOD_STAMP;
             break;
-        case 9:
+        case 8:
             m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
             break;
-        case 10:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
-            break;
-        case 11:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
-            break;
-        case 12:
-            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
-            break;
-        case 13:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_PKW;
-            break;
-        case 14:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_BUS;
-            break;
-        case 15:
-            m_permitType = PERMIT_TYPE::DAY_TICKET_CAMPER;
-            break;
         default:
             m_permitType = PERMIT_TYPE::INVALID;
         }
@@ -101,78 +77,14 @@ struct PermitType {
         case PERMIT_TYPE::DAY_TICKET_TEEN:
             return 6;
         case PERMIT_TYPE::FOOD_STAMP:
-            return 8;
+            return 7;
         case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
-            return 9;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return 10;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return 11;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return 12;
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return 13;
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return 14;
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return 15;
+            return 8;
         default:
             break;
         }
         return 7;
-    }
 
-    static PERMIT_TYPE toPermitType(QString const permitTypeStr) {
-        if (permitTypeStr == "DAY_TICKET") {
-            return PERMIT_TYPE::DAY_TICKET;
-        } else
-        if (permitTypeStr == "DAY_TICKET_ADULT") {
-            return PERMIT_TYPE::DAY_TICKET_ADULT;
-        } else
-        if (permitTypeStr == "DAY_TICKET_CHILD") {
-            return PERMIT_TYPE::DAY_TICKET_CHILD;
-        } else
-        if (permitTypeStr == "DAY_TICKET_ADULT") {
-            return PERMIT_TYPE::DAY_TICKET_ADULT;
-        } else
-        if (permitTypeStr == "DAY_TICKET_TEEN") {
-            return PERMIT_TYPE::DAY_TICKET_TEEN;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING;
-        } else
-        if (permitTypeStr == "SZEGED_START") {
-            return PERMIT_TYPE::SZEGED_START;
-        } else
-        if (permitTypeStr == "SZEGED_STOP") {
-            return PERMIT_TYPE::SZEGED_STOP;
-        } else
-        if (permitTypeStr == "FOOD_STAMP") {
-            return PERMIT_TYPE::FOOD_STAMP;
-        } else
-        if (permitTypeStr == "TWENTY_FOUR_HOURS_TICKET") {
-            return PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_PKW") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_BUS") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
-        } else
-        if (permitTypeStr == "SHORT_TERM_PARKING_CAMPER") {
-            return PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
-        } else
-        if (permitTypeStr == "DAY_TICKET_PKW") {
-            return PERMIT_TYPE::DAY_TICKET_PKW;
-        } else
-        if (permitTypeStr == "DAY_TICKET_BUS") {
-            return PERMIT_TYPE::DAY_TICKET_BUS;
-        } else
-        if (permitTypeStr == "DAY_TICKET_CAMPER") {
-            return PERMIT_TYPE::DAY_TICKET_CAMPER;
-        }
-
-        return PERMIT_TYPE::INVALID;
     }
 
     QString toString() {
@@ -195,18 +107,6 @@ struct PermitType {
             return QString("FOOD_STAMP");
         case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
             return QString("TWENTY_FOUR_HOURS_TICKET");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return QString("SHORT_TERM_PARKING_PKW");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return QString("SHORT_TERM_PARKING_BUS");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return QString("SHORT_TERM_PARKING_CAMPER");
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return QString("DAY_TICKET_PKW");
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return QString("DAY_TICKET_BUS");
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return QString("DAY_TICKET_CAMPER");
         default:
             break;
         }
@@ -233,18 +133,6 @@ struct PermitType {
             return QString("FOOD_STAMP");
         case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
             return QString("TWENTY_FOUR_HOURS_TICKET");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return QString("SHORT_TERM_PARKING_PKW");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return QString("SHORT_TERM_PARKING_BUS");
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return QString("SHORT_TERM_PARKING_CAMPER");
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return QString("DAY_TICKET_PKW");
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return QString("DAY_TICKET_BUS");
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return QString("DAY_TICKET_CAMPER");
         default:
             break;
         }

library/include/mobilisis/tariff_prepaid.h

@@ -1,29 +0,0 @@
-#ifndef TARIFF_PREPAID_H_INCLUDED
-#define TARIFF_PREPAID_H_INCLUDED
-
-#include <QTime>
-#include <QString>
-
-struct ATBPrepaid {
-    explicit ATBPrepaid() = default;
-    int id;
-    bool anytime;
-    bool never;
-    QTime static_start;
-    QTime static_end;
-
-    friend QDebug operator<<(QDebug debug, ATBPrepaid const &pp) {
-        QDebugStateSaver saver(debug);
-
-        debug.nospace()
-            << "                 id: " << pp.id << "\n"
-            << "       static_start: " << pp.static_start.toString(Qt::ISODate) << "\n"
-            << "         static_end: " << pp.static_end.toString(Qt::ISODate) << "\n"
-            << "            anytime: " << pp.anytime << "\n"
-            << "              never: " << pp.never << "\n";
-
-        return debug;
-    }
-};
-
-#endif // TARIFF_PREPAID_H_INCLUDED

library/include/mobilisis/weekdays_worktime.h

@@ -4,10 +4,8 @@
 class ATBWeekDaysWorktime
 {
 public:
-    int pwd_id;
-    int pwd_pop_id;
-    int pwd_next_id;
-    int pwd_period_week_day_id;
+	int pwd_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,8 +34,7 @@ SOURCES += \
     src/configuration.cpp \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
-    src/ticket.cpp \
-    src/tariff_global_defines.cpp
+    src/ticket.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -85,10 +84,6 @@ HEADERS += \
     include/mobilisis/tariff_timestep_config.h \
     include/mobilisis/tariff_product.h \
     include/mobilisis/tariff_permit_type.h \
-    include/mobilisis/tariff_global_defines.h \
-    include/mobilisis/tariff_interpolation.h \
-    include/mobilisis/tariff_prepaid.h \
-    include/mobilisis/tariff_carryover.h \
     include/mobilisis/tariff_global_defines.h
 
 OTHER_FILES += src/main.cpp \

library/src/calculate_price.cpp

@@ -34,16 +34,9 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   int paymentOptionIndex) {
     int minTime = 0;
 
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
-
-    qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
-    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
-
     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;
@@ -55,19 +48,16 @@ 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);
-        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        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) {
@@ -81,10 +71,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,
@@ -92,7 +82,6 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    int paymentOptionIndex,
                                                    QDateTime const &start) {
     int minPrice = -1;
-    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
@@ -107,8 +96,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     case PERMIT_TYPE::DAY_TICKET: {
         minPrice = compute_product_price(cfg, permitType, start);
     } break;
-    default:
-        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+    default: ;
     }
 
     return minPrice;
@@ -225,52 +213,6 @@ 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;
     }
@@ -284,8 +226,6 @@ 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) {
@@ -309,18 +249,6 @@ 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:
-        break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-        break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-        break;
     default: ;
     }
 
@@ -390,13 +318,11 @@ 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);
     }
 
@@ -413,41 +339,30 @@ 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, PermitType const &permitType)
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
 {
-
     qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
     qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
-    std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
-    if (!paymentOption.has_value()) {
-        return currentTimeMinutes;
-    }
-
-    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    qCritical() << "   compute_next_timestep()   payment option index: " << paymentOptionIndex;
-
-
     Configuration const *cfg = tariff;
 
     // compute payment method id (e.g. Linear=3, Steps=4)
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
     switch (paymentMethodId) {
     case PaymentMethod::Progressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Progressive";
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Progressive";
         break;
     case PaymentMethod::Degressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Degressive";
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Degressive";
         break;
     case PaymentMethod::Linear:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Linear";
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Linear";
         break;
     case PaymentMethod::Steps:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Steps";
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Steps";
         break;
     case PaymentMethod::Undefined:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Undefined";
+        qCritical() << "   compute_next_timestep()     paymentMethodId: Undefined";
         break;
     }
 
@@ -457,9 +372,7 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
         (paymentMethodId == PaymentMethod::Progressive))
     {
-        // int paymentOptionIndex = 1;
-
-        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff);
         int const size = stepList.size();
         if (size == 0) {
             qCritical() << "compute_next_timestep() *ERROR empty step-list*";
@@ -477,14 +390,12 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
             maxStep = stepList[1] - stepList[0];
         }
         int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
-        for (int i=0; i < stepList.size(); ++i) {
-            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
-                qCritical().noquote()
-                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
-                                    .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
-                stepList[i] = currentTimeMinutes;
-                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
-            }
+        if (std::abs(stepList[0] - currentTimeMinutes) <= tolerance) {
+            qCritical().noquote()
+                << QString("   compute_next_timestep() correction stepList[0]=%1 -> %2:")
+                                    .arg(stepList[0]).arg(currentTimeMinutes);
+            stepList[0] = currentTimeMinutes;
+            qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
         }
 
         int currentStepIndex = stepList.indexOf(currentTimeMinutes);
@@ -549,16 +460,12 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
 // this is currently not used
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
-        time_t start_parking_time,  // in minutes
-        time_t end_parking_time,    // netto time in minutes
-        struct price_t *price,
-        PermitType permitType) {    // permitType maps to product
+        time_t start_parking_time, // in minutes
+        time_t end_parking_time,   // netto time in minutes
+        struct price_t *price) {
     CalcState calcState;
-
-    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;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -591,13 +498,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     if (start.isValid()) {
         double cost = Calculator::GetInstance().GetCostFromDuration(
                     tariff,
-                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     start,
                     end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
         price->units = cost;
@@ -615,7 +522,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         int netto_parking_time,
         QDateTime &end_parking_time,
         struct price_t *price,
-        PermitType permitType,
         bool prepaid)
 {
     CalcState calcState;
@@ -630,7 +536,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 << "          paymentOptionIndex: " << paymentOptionIndex << endl
                 << "          start_parking_time: " << start_parking_time << endl
                 << "          netto_parking_time: " << netto_parking_time << endl
-                << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                 << "                      minMin: " << minMin << endl
                 << "                      maxMin: " << maxMin;
 
@@ -655,30 +560,15 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     double cost = -1;
     if (start_parking_time.isValid()) {
-
-        // qCritical() << __func__ << __LINE__;
-
-        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
-            tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Degressive) {
-        // qCritical() << __func__ << __LINE__;
+        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps) {
             // hier muesste man unterscheiden: uebertrag oder nicht?
             calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                    netto_parking_time, paymentOptionIndex);
             if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
-                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                             << calcState.toString();
-        // qCritical() << __func__ << __LINE__;
+                // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                //             << calcState.toString();
                 return calcState;
             }
-        // qCritical() << __func__ << __LINE__;
-
-            QList<int> lll = Calculator::GetInstance().GetTimeSteps(tariff);
-
-            // netto_parking_time = compute_next_timestep(tariff, netto_parking_time, 1, permitType);
-
-            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
-
-        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
             end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
 
@@ -686,7 +576,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
             //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
 
         } else {
-        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
                         tariff->getPaymentOptions().pop_payment_method_id,
@@ -695,10 +584,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                         netto_parking_time,         // minutes, netto
                         false, prepaid);
         }
-        // qCritical() << __func__ << __LINE__;
         double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
 
@@ -721,8 +609,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         time_t start_parking_time,
         double price,
-        QString &duration,
-        PermitType permitType) {
+        QString &duration) {
     CalcState calcState;
     QDate const d(1970, 1, 1);
     QTime const t(0, 0, 0);
@@ -756,8 +643,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         QDateTime const &start_parking_time,
         double price,
-        QDateTime &ticketEndTime,
-        PermitType permitType)
+        QDateTime &ticketEndTime)
 {
     CalcState calcState;
     if (start_parking_time.isValid()) {
@@ -845,10 +731,7 @@ 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,
-                                                                  PermitType PermitType)
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
 {
     CalcState calcState;
     if (start_parking_time.isValid()) {

library/src/calculator_functions.cpp

@@ -5,11 +5,9 @@
 #include "tariff_time_range.h"
 #include "ticket.h"
 #include "tariff_global_defines.h"
-#include "tariff_prepaid.h"
 
 #include <sstream>
 #include <algorithm>
-#include <optional>
 #include <QDateTime>
 #include <QScopedArrayPointer>
 #include <QDebug>
@@ -32,8 +30,6 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
         return QDateTime();
     }
 
-    // qCritical() << __func__ << start_datetime.toString(Qt::ISODate);
-
     double day_price = 0.0f;
     int current_special_day_id = -1;
     bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
@@ -110,7 +106,7 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
             int diff = abs(inputDateTime.time().secsTo(worktime_to));
             inputDateTime = inputDateTime.addSecs(diff);
 
-            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
+            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;            
             return inputDateTime;
         }
     }
@@ -122,7 +118,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             uint8_t payment_option,
                                             char const *startDatetimePassed, // given in local time
                                             double cost,
-                                            PermitType permitType,
                                             bool nextDay,
                                             bool prepaid)
 {
@@ -131,13 +126,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     // Get input date
     QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
+
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-
-    //qCritical() << DBG_HEADER << "          start" << inputDate.toString(Qt::ISODate);
-    //qCritical() << DBG_HEADER << "paymentMethodId" << static_cast<int>(paymentMethodId);
-
-    Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate);
-
     if (paymentMethodId == PaymentMethod::Steps) {
         if (tariffIs24_7(cfg)) {
             // use tariff with structure as for instance Schoenau, Koenigsee:
@@ -155,7 +145,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 }
 
                 // TODO: man braucht den richtigen Index
-                int paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
+                int paymentOptionIndex = 0;
                 int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                 int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                 int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
@@ -180,7 +170,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     // in this case, adapt inputDate accordingly.
 
 
-// #define DEBUG_GET_DURATION_FROM_COST 1
+//#define DEBUG_GET_DURATION_FROM_COST 1
 #if DEBUG_GET_DURATION_FROM_COST==1
                     qCritical() << DBG_HEADER << "PRE-PAID-OPTION: ADAPT-INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
@@ -271,41 +261,24 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 qCritical() << DBG_HEADER << "  CURRENT WORKING-TIME-TO" << current_working_time_to.toString(Qt::ISODate);
 #endif
 
-
-                int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
-                // int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
-                int price = 0;
-                int durationInSecs = 0;
                 for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                     int const pra_price = itr->second.pra_price;
-                    int const durationId = itr->second.pra_payment_unit_id;
-                    if (pop_accumulate_prices) {
-                        price += pra_price;
-                    } else {
-                        price = pra_price;
-                    }
+                    if ((double)pra_price == cost) {
+                        int const durationId = itr->second.pra_payment_unit_id;
+                        auto search = cfg->Duration.find(durationId);
+                        if (search != cfg->Duration.end()) {
+                            // found now the duration in minutes
+                            // check if we are still inside the working-time-range
+                            ATBDuration duration = search->second;
 
-                    //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+                            int durationInSecs = duration.pun_duration * 60;
 
-                    auto search = cfg->Duration.find(durationId);
-                    if (search != cfg->Duration.end()) {
-                        // found now the duration in minutes
-                        // check if we are still inside the working-time-range
-                        ATBDuration duration = search->second;
-                        //if (pop_accumulate_durations) {
-                        //    durationInSecs += duration.pun_duration * 60;
-                        //} else {
-                            durationInSecs = duration.pun_duration * 60;
-                        //}
-
-                        if ((double)price == cost) {
                             QDateTime current_working_date_time_to = inputDate;
                             current_working_date_time_to.setTime(current_working_time_to);
 
 #if DEBUG_GET_DURATION_FROM_COST==1
-                            qCritical() << DBG_HEADER << "        DURATION ID" << duration.pun_id;
-                            qCritical() << DBG_HEADER << "DURATION IN MINUTES" << durationInSecs / 60;
-                            qCritical() << DBG_HEADER << "DURATION IN SECONDS" << durationInSecs;
+                            qCritical() << DBG_HEADER << "DURATION IN MINUTES" << duration.pun_duration;
+                            qCritical() << DBG_HEADER << "DURATION IN SECONDS" << duration.pun_duration * 60;
                             qCritical() << DBG_HEADER << "CURRENT-WORKING-DATE-TIME-TO"
                                                       << current_working_date_time_to.toString(Qt::ISODate);
                             qCritical() << DBG_HEADER << "NEW INPUT DATE" << inputDate.addSecs(durationInSecs).toString(Qt::ISODate);
@@ -389,7 +362,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 #endif
 
                             return s.toStdString();
-                        } // if ((double)price == cost) {
+                        }
                     }
                 }
 
@@ -843,11 +816,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
                                          int paymentOptionIndex) const {
     // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
     // special days, nonstop.
-    qCritical() << __func__ << __LINE__;
-
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    if (paymentMethodId == PaymentMethod::Steps ||
-        paymentMethodId == PaymentMethod::Degressive) {
+    if (paymentMethodId == PaymentMethod::Steps) {
         QDateTime const end = start.addSecs(timeStepInMinutes*60);
         return GetCostFromDuration(cfg, start, end, paymentOptionIndex);
     }
@@ -859,15 +829,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          QDateTime const &end,
                                          int paymentOptionIndex) const {
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-
-    qCritical() << __func__ << __LINE__;
-
-    if (paymentMethodId == PaymentMethod::Steps ||
-        paymentMethodId == PaymentMethod::Degressive) {
+    if (paymentMethodId == PaymentMethod::Steps) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
-
-        qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
-
         return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
     }
     return 0;
@@ -881,9 +844,6 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
     qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
                 << "paymentOptionIndex" << paymentOptionIndex;
 
-    // TODO: wieder entfernen
-    return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", QTime(), QTime());
-
     QString errorStr = "UNKNOWN ERROR";
 
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
@@ -916,13 +876,8 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
 
                     QTime const &startTime = start.time();
 
-                    // qCritical() << DBG_HEADER << "START TIME" << startTime.toString(Qt::ISODate);
-
                     if (startTime >= from && startTime <= until) {
                         QDateTime const end = start.addSecs(netto_parking_time*60);
-
-                        //qCritical() << DBG_HEADER << "END-DATE-TIME" << end.toString(Qt::ISODate);
-
                         QTime const endTime = end.time();
                         if (endTime <= until && start.date().dayOfWeek() == end.date().dayOfWeek()) {
                             qCritical() << DBG_HEADER;
@@ -973,29 +928,28 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                             ATBTimeRange s = cfg->TimeRange.find(pop_carry_over_start_time_range)->second;
                             ATBTimeRange e = cfg->TimeRange.find(pop_carry_over_end_time_range)->second;
 
-                            //qCritical() << DBG_HEADER << "startTime" << startTime.toString(Qt::ISODate);
-                            //qCritical() << DBG_HEADER << "s: time range from" << s.getTimeFrom().toString(Qt::ISODate);
-                            //qCritical() << DBG_HEADER << "s: time range until" << s.getTimeUntil().toString(Qt::ISODate);
+                            // qCritical() << DBG_HEADER
+                            //             << "startTime" << startTime.toString(Qt::ISODate);
 
                             if (startTime >= s.getTimeFrom() && startTime <= s.getTimeUntil()) {
 
                                 QDateTime sd = start;
                                 sd.setTime(s.getTimeUntil());
 
-                                //qCritical() << DBG_HEADER << "jumpFrom" << sd.toString(Qt::ISODate);
+                                // qCritical() << DBG_HEADER << "jumpFrom" << sd.toString(Qt::ISODate);
 
                                 QDateTime ed = start.addDays(1);
                                 ed.setTime(e.getTimeFrom());
 
-                                //qCritical() << DBG_HEADER << "to" << ed.toString(Qt::ISODate);
+                                // qCritical() << DBG_HEADER << "to" << ed.toString(Qt::ISODate);
 
                                 int const jumpSecs = sd.secsTo(ed);
 
-                                //qCritical() << DBG_HEADER << "jumpSecs" << jumpSecs;
+                                // qCritical() << DBG_HEADER << "jumpSecs" << jumpSecs;
 
                                 QDateTime const end = start.addSecs(netto_parking_time*60 + jumpSecs);
 
-                                //qCritical() << DBG_HEADER << "new end" << end.toString(Qt::ISODate);
+                                // qCritical() << DBG_HEADER << "new end" << end.toString(Qt::ISODate);
 
                                 if (end.time() <= e.getTimeUntil()) {
 
@@ -1251,25 +1205,23 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                        QDateTime &start_datetime,
                                        QDateTime &end_datetime,
                                        int durationMinutes,
-                                       PermitType permitType,
                                        bool nextDay,
                                        bool prepaid) {
     Q_UNUSED(payment_option);
     Q_UNUSED(nextDay);
 
-    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     if (paymentMethodId == PaymentMethod::Steps) {
         if (tariffIs24_7(cfg)) {
             end_datetime = start_datetime.addSecs(durationMinutes*60);
-            return GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
+            return GetCostFromDuration(cfg, start_datetime, end_datetime);
         } else {
             if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
                 if (!prepaid) {
                     CalcState cs = isParkingAllowed(cfg, start_datetime);
                     if (cs) {
                         end_datetime = start_datetime.addSecs(durationMinutes*60);
-                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
+                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
                         end_datetime = start_datetime;
                         end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                         return cost;
@@ -2138,54 +2090,29 @@ QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
     return QList<int>();
 }
 
-
-#define DEBUG_GET_TIME_STEPS (1)
-
-QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
-                                     QDateTime const &s) const {
-
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
-    }
+QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const {
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
 
     if (m_timeSteps.size() > paymentOptionIndex) {
-
-        //if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-        //    return m_timeSteps[paymentOptionIndex];
-        //}
-
-        // recompute time steps
-        m_timeSteps[paymentOptionIndex].clear();
-
-    } else {
-        while (m_timeSteps.size() <= paymentOptionIndex) {
-            m_timeSteps.push_back(QList<int>());
+        if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
+            return m_timeSteps[paymentOptionIndex];
         }
+    } else {
+        m_timeSteps.push_back(QList<int>());
     }
 
-    QDateTime start = s;
-    start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
+    QDateTime start = QDateTime::currentDateTime();
+    start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                          pop_id:" << pop_id;
-    }
-
     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
-    int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 
     static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
     qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
-
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")         time step configuration:" << pop_time_step_config;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")               prepaid option id:" << pop_prepaid_option_id;
-    }
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       payment option carry over:" << pop_carry_over;
 
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
@@ -2196,168 +2123,14 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                 int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
                 m_timeSteps[paymentOptionIndex].append(step);
             }
-        } else
-        if (paymentMethodId == PaymentMethod::Degressive) { // e.g. fuchs, valser alm (fane) (502)
-            // with growing time, the price goes down
-            // for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8
-            // for the following days: 8 euros
-
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")       degressive";
-            m_timeSteps[paymentOptionIndex].clear();
-
-            // lookup pop_next_id in worktimes;
-            std::optional<QVector<ATBWeekDaysWorktime>> const &w = cfg->getAllWeekDayWorkTimes();
-            if (w.has_value()) {
-                QVector<ATBWeekDaysWorktime> const &vec = w.value();
-
-                if (pop_carry_over) {
-                    for (int i = 0; i < vec.size(); ++i) {
-                        QTime const &from = QTime::fromString(QString::fromStdString(vec[i].pwd_time_from), Qt::ISODate);
-                        QString const &toStr = QString::fromStdString(vec[i].pwd_time_to);
-                        QTime const &to = QTime::fromString(toStr, Qt::ISODate);
-
-                        int weekDayId = vec[i].pwd_period_day_in_week_id;
-                        if (start.date().dayOfWeek() == weekDayId) {
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
-
-                            if (start.time() >= from) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
-                                if (start.time() < to) {
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
-
-                                    int runtimeInMinutes = (start.time().secsTo(to) / 60);
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
-
-                                    m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
-
-                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
-
-                                    int pop_id = vec[i].pwd_pop_id;
-                                    int pwd_id = vec[i].pwd_id;
-                                    int pop_next_id = vec[i].pwd_next_id;
-
-                                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                        int const durationId = itr->second.pra_payment_unit_id;
-
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
-                                        // int const price = itr->second.pra_price;
-
-                                        auto search = cfg->Duration.find(durationId);
-                                        if (search != cfg->Duration.end()) {
-                                            ATBDuration duration = search->second;
-                                            duration.pun_duration = runtimeInMinutes;
-                                            search->second = duration;
-                                        }
-                                    }
-
-                                    if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
-                                        // on the same day
-                                        start.setTime(to);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                    } else {
-                                        // on the next day
-                                        start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
-                                        start = start.addDays(1);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                    }
-
-
-                                    while ((s.secsTo(start) / 60) < 5000) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-
-                                        pop_id = vec[i].pwd_pop_id;
-                                        pwd_id = vec[i].pwd_id;
-                                        pop_next_id = vec[i].pwd_next_id;
-
-                                        runtimeInMinutes += (start.time().secsTo(to) / 60);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pwd_id " << pwd_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id " << pop_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_next_id " << pop_next_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep" << nextTimeStep;
-
-                                        // ATBPaymentOption o = cfg->getPaymentOptionForId();
-
-                                        m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX pop" << pop_id;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX index" << paymentOptionIndex;
-
-#if 0
-                                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                            int const durationId = itr->second.pra_payment_unit_id;
-
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << durationId;
-                                            // int const price = itr->second.pra_price;
-
-                                            auto search = cfg->Duration.find(durationId);
-                                            if (search != cfg->Duration.end()) {
-                                                ATBDuration duration = search->second;
-                                                duration.pun_duration = runtimeInMinutes;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << runtimeInMinutes;
-                                                search->second = duration;
-                                            }
-                                        }
-#endif
-
-                                        if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
-                                            // on the same day
-                                            start.setTime(to);
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                        } else {
-                                            // on the next day
-                                            start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
-                                            start = start.addDays(1);
-
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
-                                        }
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") until" << s.secsTo(start) / 60;
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
         } else {
             uint16_t timeStepCompensation = 0;
 
-            if (DBG_LEVEL >= DBG_DEBUG) {
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       payment option carry over:" << pop_carry_over;
-            }
-
             if (pop_carry_over) {
                 int const pop_carry_over_time_range_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_time_range_id;
-                int const pop_carry_over_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-                int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
                 QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
                 QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
-                if (DBG_LEVEL >= DBG_DEBUG) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range id:" << pop_carry_over_time_range_id;
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")            carry over option id:" << pop_carry_over_time_range_id;
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")            carry over time from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              carry over time to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
-                }
-
-                int weekDay = start.date().dayOfWeek();
-                QTime const carryOverStart = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-                QTime const carryOverEnd = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
-                int const carryOverDuration = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
-
-                if (DBG_LEVEL >= DBG_DEBUG) {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         carry over start:" << carryOverStart.toString(Qt::ISODate);
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")           carry over end:" << carryOverEnd.toString(Qt::ISODate);
-                }
-
-                // TODO: reparieren
-
                 if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
                     if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
                         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
@@ -2390,7 +2163,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                 } else {
                                     duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
+                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;;
                                 }
 
                                 cfg->Duration.erase(search);
@@ -2401,232 +2174,13 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
                     } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        if (DBG_LEVEL >= DBG_DEBUG) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")          carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
-                        }
-
-                        m_timeSteps[paymentOptionIndex].clear();
-
-                        std::optional<QDateTime> prepaidStart = cfg->prepaidStart(start, pop_prepaid_option_id);
-                        // TODO: zusaetzlicher faktor falls vorkauf-option zieht
-                        if (prepaidStart) {
-                            start = prepaidStart.value();
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid adapted start:" << start.toString(Qt::ISODate);
-                            }
-                        } else {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        }
-
-                        // TODO: check if needed
-                        QDateTime interpolationEnd;
-                        std::optional<QDateTime> interpolationEndDate = cfg->getInterpolationEnd(start, paymentOptionIndex);
-                        if (interpolationEndDate) {
-                            interpolationEnd = interpolationEndDate.value();
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")             interpolation end:" << interpolationEnd.toString(Qt::ISODate);
-                            }
-                        } else {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        }
-
-                        // int const start_time = start.time().hour() * 60 + start.time().minute();
-                        QDateTime nextTimeStep = start;
-                        int runtimeInMinutes = 0;
-
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
-
-                        int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
-
-                        // TODO: auslagern
-                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                            int const durationId = itr->second.pra_payment_unit_id;
-
-                            auto search = cfg->Duration.find(durationId);
-                            if (search != cfg->Duration.end()) {
-                                ATBDuration duration = search->second;
-                                duration.pun_duration = duration.pun_duration_saved;
-                                search->second = duration;
-                            }
-                        }
-
-                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
-
-                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                            int const durationId = itr->second.pra_payment_unit_id;
-
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
-                            // int const price = itr->second.pra_price;
-
-                            auto search = cfg->Duration.find(durationId);
-                            if (search != cfg->Duration.end()) {
-                                ATBDuration duration = search->second;
-                                ATBDuration &previous = 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;
-                                }
-
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
-
-                                std::optional<ATBInterpolation> ipolCheck = cfg->getInterpolationType(duration.pun_interpolation_id);
-                                if (ipolCheck) {
-                                    ATBInterpolation interpolation = ipolCheck.value();
-
-                                    if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
-
-                                        interpolation.dynamic_start = start.time();
-                                        interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
-
-                                        // int const end_time = interpolation.dynamic_end.hour() * 60 + interpolation.dynamic_end.minute();
-
-                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun_duration:" << duration.pun_duration;
-                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                 pun_interpolation:" << duration.pun_interpolation_id;
-                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         interpolation dynamic end:" << interpolationEnd.toString(Qt::ISODate);
-                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")    interpolation dynamic end time:" << end_time;
-
-                                        int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
-
-                                        runtimeInMinutes += duration.pun_duration;
-                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
-
-                                        if (nextTimeStep.time() > carryOverStart) {
-                                            int const backTime = carryOverStart.secsTo(nextTimeStep.time()) / 60;
-                                            runtimeInMinutes -= backTime;
-                                            nextTimeStep.setTime(carryOverStart);
-                                            nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
-                                            runtimeInMinutes += (backTime + carryOverDuration);
-                                        }
-
-                                        if (DBG_LEVEL >= DBG_DEBUG) {
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                runtime in minutes:" << runtimeInMinutes;
-                                        }
-
-                                        int rest = nextTimeStep.secsTo(interpolationEnd);
-                                        if (nextTimeStep <= interpolationEnd) {
-                                            if (rest > 0 && rest < duration.pun_duration) {
-                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    rest minutes:" << rest;
-                                                // last time step before switching to dayticket (see Schnals 505/506)
-                                                //if (duration.pun_duration > 0) {
-                                                //    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
-                                                //}
-                                            } else {
-                                                m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
-                                            }
-                                        }
-
-                                        duration.pun_duration = runtimeInMinutes;
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
-
-                                        search->second = duration;
-                                    } else
-                                    if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
-
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
-
-                                        if (paymentOptionIndex == 1) { // testing TODO: muss in die payment options hinein
-                                            if (runtimeInMinutes == 0) {
-                                                if (start.time() < carryOverStart) {
-                                                    runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
-                                                    duration.pun_duration = runtimeInMinutes;
-                                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
-                                                    search->second = duration;
-                                                    continue;
-                                                }
-                                            }
-                                        }
-
-                                        if (runtimeInMinutes == 0) {
-                                            if (start.time() < carryOverStart) {
-                                                runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
-                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
-                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                                duration.pun_duration = runtimeInMinutes;
-                                                m_timeSteps[paymentOptionIndex] << duration.pun_duration;
-                                                search->second = duration;
-                                                cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
-                                            }
-                                            continue;
-                                        }
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
-
-
-                                        QDateTime s = start.addSecs(runtimeInMinutes * 60);
-                                        int const minutes = s.time().secsTo(carryOverStart) / 60;
-
-#if 0
-                                        if (minutes > 0) {
-                                            runtimeInMinutes += minutes;
-                                            previous.pun_duration += minutes;
-
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")      previous:" << previous.pun_duration;
-
-                                            if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-                                                m_timeSteps[paymentOptionIndex].last() += minutes;
-                                            }
-                                        }
-#endif
-
-
-                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
-
-                                        runtimeInMinutes += duration.pun_duration;
-                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
-
-                                        // TOOO: truncate-flag == false
-                                        if (nextTimeStep.time() > carryOverStart) {
-                                            int const backTime = carryOverStart.secsTo(nextTimeStep.time());
-                                            runtimeInMinutes -= backTime;
-                                            nextTimeStep.setTime(carryOverStart);
-                                            nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
-                                            runtimeInMinutes += (backTime + carryOverDuration);
-                                        } else
-                                        if (nextTimeStep.time() < carryOverStart) {
-                                            int const forwardTime = nextTimeStep.time().secsTo(carryOverStart) / 60;
-                                            runtimeInMinutes += forwardTime;
-                                            nextTimeStep.setTime(carryOverStart);
-                                        }
-
-                                        //if (DBG_LEVEL >= DBG_DEBUG) {
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
-                                        //}
-
-                                        duration.pun_duration = runtimeInMinutes;
-                                        m_timeSteps[paymentOptionIndex] << duration.pun_duration;
-                                        search->second = duration;
-                                    } else {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
-                                        cfg->Duration.erase(search);
-                                    }
-                                }
-                            }
-                        }
+                        // TODO
                     }
                 } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                     // TODO
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                 }
             } else { // if (pop_carry_over) {
                 // TODO
-                 qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
             }
         }
     } else {
@@ -2649,37 +2203,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
 
     qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
 
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
-
-        for (int i = 0; i < m_timeSteps[paymentOptionIndex].size(); ++i) {
-            QDateTime nextTime = s;
-            // nextTime.setTime(QTime(0, 0, 0));
-            int const secs = m_timeSteps[paymentOptionIndex][i] * 60;
-            nextTime = nextTime.addSecs(secs);
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") step"
-                        << i << secs << m_timeSteps[0][i] << "->" << nextTime.toString(Qt::ISODate);
-
-        }
-    }
-
     return m_timeSteps[paymentOptionIndex];
 }
 
-#undef DEBUG_GET_TIME_STEPS
-
 uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const {
 
-    // test
-    // paymentOptionIndex = 1;
-
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-    int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
-
-    uint32_t price = 0;
-
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -2688,31 +2217,9 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
 
         Q_ASSERT(pun_id == payment_unit_id);
 
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
-
-
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(1)->second.pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(2)->second.pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(3)->second.pun_duration;
-
         int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
-        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
-        if (pop_accumulate_prices) {
-            price += itr->second.pra_price;
-        } else {
-            price = (uint32_t)(itr->second.pra_price);
-        }
-
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
-
         if (timeStep == pun_duration) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
-            return price;
+            return (uint32_t)(itr->second.pra_price);
         }
     }
 
@@ -2851,53 +2358,14 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                 }
                 // [[fallthrough]];
                 case PERMIT_TYPE::DAY_TICKET: {
-                } break;
-                case PERMIT_TYPE::DAY_TICKET_PKW: {
-                    PermitType const permitType(PERMIT_TYPE::DAY_TICKET_PKW);
-                    std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
-                    if (paymentOption) {
-                        ATBPaymentOption option = paymentOption.value();
-                        int pop_id = option.pop_id;
-                        int pop_daily_card_price = option.pop_daily_card_price;
-                        qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
-                        qCritical() << "            PERMIT-TYPE:" << permitType.toString();
-                        qCritical() << "              option id:" << pop_id;
-                        qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
-
-                        price.netto = pop_daily_card_price;
-                        value = value.value_or(price);
-                    }
-                } break;
-                case PERMIT_TYPE::DAY_TICKET_BUS: {
-                } break;
-                case PERMIT_TYPE::DAY_TICKET_CAMPER: {
-                } break;
-                case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-                    PermitType const permitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-                    std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
-                    if (paymentOption) {
-                        ATBPaymentOption option = paymentOption.value();
-                        int pop_id = option.pop_id;
-                        int pop_daily_card_price = option.pop_daily_card_price;
-                        qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
-                        qCritical() << "            PERMIT-TYPE:" << permitType.toString();
-                        qCritical() << "              option id:" << pop_id;
-                        qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
-
-                        price.netto = pop_daily_card_price;
-                        value = value.value_or(price);
-                    }
-                } break;
-                case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
-                } break;
-                case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER: {
-                } break;
-                case PERMIT_TYPE::SZEGED_START: {
-                } break;
-                case PERMIT_TYPE::SZEGED_STOP: {
-                } break;
-                case PERMIT_TYPE::INVALID: {
-                } break;
+                }
+                // [[fallthrough]];
+                case PERMIT_TYPE::SZEGED_START:
+                    // [[fallthrough]];
+                case PERMIT_TYPE::SZEGED_STOP:
+                    // [[fallthrough]];
+                case PERMIT_TYPE::INVALID:
+                    break;
             }
         } else {
             // for projects which have not defined a daily ticket in their

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 *startDatetimePassed, // given in local time
-                                            double cost,
+                                            char const* start_datetime, // given in local time
+                                            double price,
                                             bool nextDay,
                                             bool prepaid)
 {
@@ -124,14 +124,14 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     Q_UNUSED(nextDay);
 
     // Get input date
-    QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
+    QDateTime inputDate = QDateTime::fromString(start_datetime,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, cost) * 60);
+            inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
             return inputDate.toString(Qt::ISODate).toStdString();
         } else {
             if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
@@ -147,226 +147,9 @@ 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, cost, prepaid);
+    Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
 
     // qCritical().noquote() << t;
 
@@ -496,11 +279,9 @@ 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;
             }
@@ -518,18 +299,34 @@ 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 (cfg->WeekDaysWorktime.count(weekdayId) == 0) {
+            while ((timeRanges = cfg->WeekDaysWorktime.count(weekdayId)) == 0) {
                 current = current.addDays(1);
                 weekdayId = current.date().dayOfWeek();
                 if (weekdayId == weekdayIdLast) {
@@ -538,6 +335,11 @@ 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);
 
@@ -545,169 +347,235 @@ 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) {
-                if (carryOverNotSet) {
-                    end_datetime = start;
-                    return 0;
-                } else {
-                    QDateTime const dt = start;
-                    start = start.addDays(1);
-                    start.setTime(QTime(0, 0, 0));
 
-                    durationMinutesBrutto += dt.secsTo(start) / 60;
-                    current = start;
-                }
+            if (current.time() >= to) {
+                QDateTime const dt = start;
+                start = start.addDays(1);
+                start.setTime(QTime(0, 0, 0));
+
+                durationMinutesBrutto += dt.secsTo(start) / 60;
+                current = start;
             } else {
+
+#if DEBUG==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
                 break;
             }
         }
 
+#if DEBUG==1
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                    << "timeRanges" << timeRanges << weekdayId
+                    << "durationMinutesBrutto" << durationMinutesBrutto
+                    << "start" << start.toString(Qt::ISODate)
+                    << "current" << current.toString(Qt::ISODate);
+#endif
+
         int durationMinutesNetto = 0;
         uint price = 0;
 
         if (carryOverNotSet) {
             int range = 0;
             int minsToCarryOver = 0; // from one work-time to the other on the same day
-            int minsUsed = 0;
             QDateTime lastCurrent = QDateTime();
 
-            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+            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;
+                for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                    ++range;
 
-                QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
 
-                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-                if (current.time() >= to) {
-                    continue; // try to use next available work-time
-                } else
-                if (current.time() <= from) {
-                    if (prepaid) {
-                        lastCurrent = current;
-                        current.setTime(from); // move current forward (range==1),
-                                               // as prepaid is set
-                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                        durationMinutesBrutto += minutesMoved;
 
-                        if (range == 1) {
-                            start_datetime = current;
+                    if (current.time() >= to) {
+#if DEBUG==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "from" << from.toString(Qt::ISODate)
+                                    << "to" << to.toString(Qt::ISODate);
+#endif
+                        continue; // try to use next available work-time
+                    } else
+                    if (current.time() <= from) {
+                        if (prepaid) {
+                            lastCurrent = current;
+                            current.setTime(from); // move current forward (range==1),
+                                                   // as prepaid is set
+                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+#if DEBUG==1
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                        << "current" << current.toString(Qt::ISODate)
+                                        << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                        << "minutesMoved" << minutesMoved
+                                        << "durationMinutes" << durationMinutes;
+#endif
+                            durationMinutesBrutto += minutesMoved;
+
+                            if (range == 1) {
+                                start_datetime = current;
+                            }
                         }
                     }
-                }
 
-                for (auto timeRangeIt = cfg->TimeRange.cbegin(); timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-
-                    ATBTimeRange timeRange = timeRangeIt->second;
-
-                    timeRange.computeQTimes(current.time());
-
-                    int duration = timeRange.time_range_to_in_minutes_from_start -
-                                   timeRange.time_range_from_in_minutes_from_start;
-
-                    qCritical() << __func__ << ":" << __LINE__
+#if DEBUG==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "from" << from.toString(Qt::ISODate)
+                                << "to" << to.toString(Qt::ISODate)
                                 << "current" << current.toString(Qt::ISODate)
-                                << "duration" << duration
-                                << "minsUsed" << minsUsed
-                                << "minsToCarryOver" << minsToCarryOver;
+                                << "durationMinutes" << durationMinutes;
+#endif
 
+                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                        ATBTimeRange timeRange = timeRangeIt->second;
 
-                    //if (minsUsed > 0) {
-                    //    duration -= minsUsed;
-                    //    minsUsed = 0;
-                    //}
+                        timeRange.computeQTimes(current.time());
 
-                    if (current.addSecs(duration * 60).time() <= to) {
-                        if (minsToCarryOver > 0) {  // the price for this time range
-                                                    // has been is paid already
-                            if (minsUsed == 0) {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                        int duration = timeRange.time_range_to_in_minutes_from_start -
+                                       timeRange.time_range_from_in_minutes_from_start;
+
+#if DEBUG==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "duration" << duration << timeRange.time_range_id
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minsToCarryOver" <<  minsToCarryOver
+                                    << "durationMinutes" << durationMinutes;
+#endif
+
+                        if (current.addSecs(duration * 60).time() <= to) {
+
+                            for(const auto &x: cfg->PaymentRate) {
+                                ATBPaymentRate const rate = x.second;
+                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                    if (minsToCarryOver > 0) {
+                                        durationMinutes -= minsToCarryOver;
+                                        durationMinutesNetto += minsToCarryOver;
+                                        durationMinutesBrutto += minsToCarryOver;
+                                        current = current.addSecs(minsToCarryOver*60);
+                                        minsToCarryOver = 0;
+#if DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "durationMinutes" << durationMinutes
+                                                    << "durationMinutesNetto" << durationMinutesNetto
+                                                    << "durationMinutesBrutto" << durationMinutesBrutto
+                                                    << "current" << current.toString(Qt::ISODate);
+#endif
+                                    } else {
                                         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 (durationMinutes <= 0) {
-                                            end_datetime = current;
-                                            return price;
-                                        }
+#if DEBUG==1
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                    << "current" << current.toString(Qt::ISODate)
+                                                    << "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;
 
-                                    durationMinutes -= duration;
-                                    durationMinutesNetto += duration;
-                                    durationMinutesBrutto += duration;
-
-                                    current = current.addSecs(duration * 60);
-                                    break;
-                                }
-                            }
+                            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);
             }
         }
@@ -1204,8 +1072,6 @@ 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;
@@ -1213,71 +1079,63 @@ 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";
 
-        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;
+        uint16_t timeStepCompensation = 0;
 
-            if (pop_carry_over) {
-                int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
-                QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
-                QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+        if (pop_carry_over) {
+            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
-                if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                            int const durationId = itr->second.pra_payment_unit_id;
-                            auto search = cfg->Duration.find(durationId);
-                            if (search != cfg->Duration.end()) {
-                                ATBDuration duration = search->second;
-                                if (durationId == 1) {
-                                    QDateTime carryOver = start;
-                                    carryOver = carryOver.addDays(1);
-                                    carryOver.setTime(QTime(0, 0, 0));
+            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                        int const durationId = itr->second.pra_payment_unit_id;
+                        auto search = cfg->Duration.find(durationId);
+                        if (search != cfg->Duration.end()) {
+                            ATBDuration duration = search->second;
+                            if (durationId == 1) {
+                                QDateTime carryOver = start;
+                                carryOver = carryOver.addDays(1);
+                                carryOver.setTime(QTime(0, 0, 0));
 
-                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                        qCritical()
-                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                                .arg(timeStep).arg(duration.pun_duration_min)
-                                                .arg(timeStep).arg(duration.pun_duration_max);
-                                        break;
-                                    }
-                                    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;;
+                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                    qCritical()
+                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                            .arg(timeStep).arg(duration.pun_duration_min)
+                                            .arg(timeStep).arg(duration.pun_duration_max);
+                                    break;
                                 }
+                                qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
 
-                                cfg->Duration.erase(search);
-                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
+                                // set dynamic minimal parking time
+                                cfg->getPaymentOptions().pop_min_time = timeStep;
 
-                            } else { // if (search != cfg->Duration.end()) {
-                               // TODO
+                                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;;
                             }
+
+                            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 == carryOverTimeRangeTo) {
+                } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
                     // TODO
                 }
-            } else { // if (pop_carry_over) {
+            } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                 // TODO
             }
+        } else { // if (pop_carry_over) {
+            // TODO
         }
     } else {
         qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::STATIC";
@@ -1450,18 +1308,6 @@ 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/tariff_global_defines.cpp

@@ -1,5 +0,0 @@
-#include "tariff_global_defines.h"
-
-int DBG_LEVEL = DBG_NOTICE;
-// int DBG_LEVEL = DBG_INFORMATION;
-// int DBG_LEVEL = DBG_DEBUG;

main/cc_iuc_asynchpos.h

@@ -0,0 +1,113 @@
+#ifndef CC_IUC_ASYNCHPOS_H
+#define CC_IUC_ASYNCHPOS_H
+
+/*
+ * cc_iuc_asynchpos.c
+ *
+ * Created: 21.11.2017
+ *  Author: Matthias
+ */
+
+#include <cstdlib>
+#include <cinttypes>
+
+//#define IUC_ASYCHNPOS_TESTMODE 1
+
+#define IUC_ASYNCHPOS_COINCOIDE_H               0x09
+#define IUC_ASYNCHPOS_COINCOIDE_L               0x78
+#define IUC_ASYNCHPOS_MAX_ARRAY_SIZE	        1024
+#define IUC_ASYNCHPOS_MAX_TX_MESSAGE_SIZE	    300
+#define IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE	    10000   // 17000
+#define IUC_ASYNCHPOS_MIN_PACKET_SIZE	        16
+#define IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE        32
+#define IUC_ASYNCHPOS_MIN_BASE_BYTE_DATA_SIZE   16
+#define IUC_ASYNCHPOS_POLYNOME	                0xedb88320	// 0x04C11DB7
+#define IUC_ASYNCHPOS_POLYNOME_INITIAL	        0		    // 0xFFFFFFFF
+#define IUC_ASYNCHPOS_PRINTTIMOUT               1000
+//#define IUC_ASYNCHPOS_RECEIPT_LENGTH 16384
+
+#define STX     0x01
+#define ETX1    0x02
+#define ETX2    0x03
+#define EOT     0x04
+#define ENQ     0x05
+#define ACK1    0x06
+#define ACK2    0x07
+#define DLE     0x10
+#define NAK     0x15
+
+unsigned static char terminalID[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+unsigned static char terminalAPAK[IUC_ASYNCHPOS_MIN_BASE_DATA_SIZE];
+unsigned static char rxAsynchData[IUC_ASYNCHPOS_MAX_RX_MESSAGE_SIZE];
+unsigned static char terminalSignature[16];
+//unsigned static char messageData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
+unsigned static char receiptData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE + 1];
+unsigned static char txAsynchData[IUC_ASYNCHPOS_MAX_ARRAY_SIZE];
+unsigned static char ENQrecieved;
+unsigned static int rxCounter;
+unsigned static int messageLength;
+unsigned static long timeInitalized;
+unsigned static long timeHoldISMAS;
+unsigned static long crcTable[256];
+unsigned static char tableCreated;
+unsigned static int asynchState;
+unsigned static char asynchSessionClosed;
+unsigned static char iuc_asynch_PRNrecieved;
+unsigned static char iuc_asynch_keepAlive;
+unsigned static char iuc_asynch_PrintControl;
+unsigned static char iuc_asynchpos_crc_old;
+unsigned static int iuc_print_counter;
+unsigned static int iuc_asynch_printTimeout;
+unsigned static char iucAsynchpoxDataContext;
+//Prozessdaten - highly private
+struct billAsynchData {
+	unsigned char time[20]; //UCHAR tagValue[] = "2017-12-19 13:40:00";
+	unsigned char id[37];
+	unsigned char printId[129];
+	unsigned char docNr[33];
+	//unsigned char amount[10];
+	//unsigned char token[25];
+	//unsigned char result[8];
+	//unsigned char authCode[7];
+	//unsigned char rrn[13];
+	//unsigned char stan[7];
+	//unsigned char cardtype[33];
+	unsigned char errCode[17];
+	//unsigned char receiptData[IUC_ASYNCHPOS_RECEIPT_LENGTH];
+};
+
+//private
+unsigned int iuc_asynchpos_send(unsigned char packetType, unsigned char* pData, unsigned int length, unsigned char needRTS);
+
+//void iuc_asynchpos_interpretCommand(unsigned int readLength_);
+
+//public
+void iuc_asynchpos_setTerminalID(unsigned char *pID, unsigned int length);
+void iuc_asynchpos_setTerminalAPAK(unsigned char *pAPAK, unsigned int length);
+unsigned char iuc_asynchpos_recieve_serial(unsigned char waitforACK);
+void iuc_asynchpos_init();
+void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
+int iuc_asynchpos_checkTime();
+unsigned char iuc_asynchpos_getIsSaleRunning();
+
+//commands
+void iuc_asynchpos_command_ping_terminal(void);
+void iuc_asynchpos_command_Login();
+void iuc_asynchpos_command_Logout();
+void iuc_asynchpos_command_authorize(unsigned int vkPreis);
+void iuc_asynchpos_command_cancel_authorize();
+void iuc_asynchpos_command_close_Document(unsigned char isStorno);
+void iuc_asynchpos_command_print_Result(unsigned char status);
+
+//void iuc_asynchpos_handleCommand(unsigned char command, unsigned char status);
+//void iuc_asynchpos_init();
+//int iuc_asynchpos_checkTime();
+
+//unsigned char iuc_asynchpos_getCurrentStatus();
+
+//int iuc_asynchpos_heartbeat();
+
+
+uint32_t iuc_asynchpos_sub_updateCRC(uint32_t crc, char* pData, size_t len);
+
+#endif

main/main.pro

@@ -25,12 +25,19 @@ CONFIG(debug, debug|release) {
     }
 }
 
-SOURCES += main.cpp
+SOURCES += main.cpp \
+    aes128.cpp \
+    cc_iuc_asynchpos.cpp \
+    terminal_utils.cpp \
+    MessageHelper.cpp
 
-# HEADERS +=
+HEADERS += aes128.h \
+    cc_iuc_asynchpos.h \
+    terminal_utils.h \
+    MessageHelper.h
+
+# OTHER_FILES += \
 
-OTHER_FILES += \
-    /home/linux/customer_505/etc/psa_tariff/tariff01.json