tests for galtuer

library/include/mobilisis/calculator_functions.h

@@ -91,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> &GetTimeSteps(Configuration *cfg, int paymentOptionIndex=0) const;
-    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0, QDateTime const &start = QDateTime::currentDateTime()) const {
+    QList<int> GetSteps(Configuration *cfg, int paymentOptionIndex=0) const { return GetTimeSteps(cfg, paymentOptionIndex); }
-        return GetTimeSteps(cfg, paymentOptionIndex, start);
-    }
 
     QList<int> GetPriceSteps(Configuration *cfg) const;
 
@@ -117,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,9 +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 <QVector>
 #include <optional>
@@ -44,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;
+    SpecialDaysWorktimeType SpecialDaysWorktime;
-	SpecialDaysType SpecialDays;
+    SpecialDaysType SpecialDays;
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-	ATBPaymentOptionType PaymentOption;
+    ATBPaymentOptionType PaymentOption;
-	multimap<int, ATBDailyTicket> DailyTicket;
+    multimap<int, ATBDailyTicket> DailyTicket;
-	TimeRangeType TimeRange;
+    TimeRangeType TimeRange;
-	multimap<int, ATBTimeStepConfig> TimeStepConfig;
+    multimap<int, ATBTimeStepConfig> TimeStepConfig;
-	multimap<int, ATBTimeBase> TimeBase;
+    multimap<int, ATBTimeBase> TimeBase;
-	multimap<int, ATBCustomer> Customer;
+    multimap<int, ATBCustomer> Customer;
-	TariffProductType TariffProduct;
+    TariffProductType TariffProduct;
-	TariffInterpolationType TariffInterpolations;
-	TariffPrepaidType TariffPrepaidOptions;
-	TariffCarryOverType TariffCarryOverOptions;
 
 	/// <summary>
 	/// Parse JSON string
@@ -94,9 +85,6 @@ public:
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) 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;
@@ -104,8 +92,6 @@ public:
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 
-    std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
-
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -114,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,
+    ProductType = 0x0F
-    InterpolationType = 0x10,
-    PrepaidType = 0x11,
-    CarryOverType = 0x12
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -24,15 +24,14 @@ 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;
@@ -49,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,
+    TWENTY_FOUR_HOURS_TICKET=9
-    SHORT_TERM_PARKING_PKW=10,
-    SHORT_TERM_PARKING_BUS=11,
-    SHORT_TERM_PARKING_CAMPER=12,
-    DAY_TICKET_PKW=13,
-    DAY_TICKET_BUS=14,
-    DAY_TICKET_CAMPER=15
 };
 
 struct PermitType {
@@ -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,25 +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;
+            return 8;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
-            return 10;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
-            return 11;
-        case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
-            return 12;
-        case PERMIT_TYPE::DAY_TICKET_PKW:
-            return 13;
-        case PERMIT_TYPE::DAY_TICKET_BUS:
-            return 14;
-        case PERMIT_TYPE::DAY_TICKET_CAMPER:
-            return 15;
         default:
             break;
         }
         return 7;
+
     }
 
     QString toString() {
@@ -142,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;
         }
@@ -180,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/library.pro

@@ -34,8 +34,7 @@ SOURCES += \
     src/configuration.cpp \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
-    src/ticket.cpp \
+    src/ticket.cpp
-    src/tariff_global_defines.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -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

@@ -213,26 +213,6 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
         }
 
     } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-        qCritical() << "TODO: SHORT_TERM_PARKING_PKW";
-    } 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: {
-        int const pop_daily_card_price = cfg->getPaymentOptions().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: {
-        qCritical() << "TODO: DAY_TICKET_BUS";
-    } break;
-    case PERMIT_TYPE::DAY_TICKET_CAMPER: {
-        qCritical() << "TODO: DAY_TICKET_CAMPER";
-    } break;
     default:
       break;
     }
@@ -410,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[0] - currentTimeMinutes) <= tolerance) {
-            if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
+            qCritical().noquote()
-                qCritical().noquote()
+                << QString("   compute_next_timestep() correction stepList[0]=%1 -> %2:")
-                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                                    .arg(stepList[0]).arg(currentTimeMinutes);
-                                    .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
+            stepList[0] = currentTimeMinutes;
-                stepList[i] = currentTimeMinutes;
+            qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
-                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
-            }
         }
 
         int currentStepIndex = stepList.indexOf(currentTimeMinutes);
@@ -558,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;
 
@@ -609,7 +586,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
         double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
 

library/src/calculator_functions.cpp

@@ -5,7 +5,6 @@
 #include "tariff_time_range.h"
 #include "ticket.h"
 #include "tariff_global_defines.h"
-#include "tariff_prepaid.h"
 
 #include <sstream>
 #include <algorithm>
@@ -31,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);
@@ -109,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;
         }
     }
@@ -129,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:
@@ -178,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
@@ -269,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 ((double)pra_price == cost) {
-                    if (pop_accumulate_prices) {
+                        int const durationId = itr->second.pra_payment_unit_id;
-                        price += pra_price;
+                        auto search = cfg->Duration.find(durationId);
-                    } else {
+                        if (search != cfg->Duration.end()) {
-                        price = pra_price;
+                            // 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" << duration.pun_duration;
-                            qCritical() << DBG_HEADER << "DURATION IN MINUTES" << durationInSecs / 60;
+                            qCritical() << DBG_HEADER << "DURATION IN SECONDS" << duration.pun_duration * 60;
-                            qCritical() << DBG_HEADER << "DURATION IN SECONDS" << durationInSecs;
                             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);
@@ -387,7 +362,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 #endif
 
                             return s.toStdString();
-                        } // if ((double)price == cost) {
+                        }
                     }
                 }
 
@@ -869,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);
@@ -904,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;
@@ -961,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
-                            //qCritical() << DBG_HEADER << "s: time range from" << s.getTimeFrom().toString(Qt::ISODate);
+                            //             << "startTime" << startTime.toString(Qt::ISODate);
-                            //qCritical() << DBG_HEADER << "s: time range until" << s.getTimeUntil().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()) {
 
@@ -2124,51 +2090,29 @@ QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
     return QList<int>();
 }
 
-
+QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const {
-#define DEBUG_GET_TIME_STEPS (1)
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
-
-QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
-                                     QDateTime const &s) const {
-
-    // TEST
-    // paymentOptionIndex = 1;
-
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
-    }
 
     if (m_timeSteps.size() > paymentOptionIndex) {
-
+        if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
-        //if (!m_timeSteps[paymentOptionIndex].isEmpty()) {
+            return m_timeSteps[paymentOptionIndex];
-        //    return m_timeSteps[paymentOptionIndex];
+        }
-        //}
-
-        // recompute time steps
-        m_timeSteps[paymentOptionIndex].clear();
-
     } else {
-        // int diff = paymentOp m_timeSteps.size()
         m_timeSteps.push_back(QList<int>());
     }
 
-    QDateTime start = s;
+    QDateTime start = QDateTime::currentDateTime();
-    start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
+    start.setTime(QTime(start.time().hour(), start.time().minute(), 0));
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).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);
-
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
-    if (DBG_LEVEL >= DBG_DEBUG) {
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       payment option carry over:" << pop_carry_over;
-        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;
-    }
 
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
@@ -2182,36 +2126,11 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
         } 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) {
@@ -2244,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);
@@ -2255,200 +2174,13 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
                     } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        if (DBG_LEVEL >= DBG_DEBUG) {
+                        // TODO
-                            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;
-
-                        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;
-                            }
-                        }
-
-                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                            int const durationId = itr->second.pra_payment_unit_id;
-                            // int const price = itr->second.pra_price;
-
-                            auto search = 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;
-                                }
-
-                                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) {
-
-                                        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);
-
-                                        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) {
-#if 0
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
-                                        QDateTime s = start.addSecs(runtimeInMinutes * 60);
-                                        int const minutes = s.time().secsTo(carryOverStart) / 60;
-
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            minutes:" << minutes;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            start:" << start.toString(Qt::ISODate);
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            s:" << s.toString(Qt::ISODate);
-                                        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);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (0):" << runtimeInMinutes;
-
-                                        runtimeInMinutes += duration.pun_duration;
-                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                  carry over start:" << carryOverStart.toString(Qt::ISODate);
-
-                                        // 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 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;
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
-
-                                        m_timeSteps[paymentOptionIndex] << duration.pun_duration;
-                                        search->second = duration;
-                                    } else {
-                                        cfg->Duration.erase(search);
-                                    }
-                                }
-                            }
-                        }
                     }
                 } else { // if (carryOverTimeRangeFrom == carryOverTimeRangeTo) {
                     // TODO
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                 }
             } else { // if (pop_carry_over) {
                 // TODO
-                 qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
             }
         }
     } else {
@@ -2471,33 +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 {
 
     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;
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -2507,18 +2218,8 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
         Q_ASSERT(pun_id == payment_unit_id);
 
         int const pun_duration = cfg->Duration.find(payment_unit_id)->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" << cfg->Duration.find(payment_unit_id)->second.pun_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
-
         if (timeStep == pun_duration) {
-            return price;
+            return (uint32_t)(itr->second.pra_price);
         }
     }
 

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
+                                            char const* start_datetime, // given in local time
-                                            double cost,
+                                            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;
+            if (current.time() >= to) {
-                    current = start;
+                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;
+            auto timeRangeIt = cfg->TimeRange.cbegin();
-            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+            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) {
+                for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                ++range;
+                    ++range;
 
-                QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
 
-                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-                if (current.time() >= to) {
-                    continue; // try to use next available work-time
-                } else
-                if (current.time() <= from) {
-                    if (prepaid) {
-                        lastCurrent = current;
-                        current.setTime(from); // move current forward (range==1),
-                                               // as prepaid is set
-                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                        durationMinutesBrutto += minutesMoved;
 
-                        if (range == 1) {
+                    if (current.time() >= to) {
-                            start_datetime = current;
+#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) {
+#if DEBUG==1
-
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    ATBTimeRange timeRange = timeRangeIt->second;
+                                << "from" << from.toString(Qt::ISODate)
-
+                                << "to" << to.toString(Qt::ISODate)
-                    timeRange.computeQTimes(current.time());
-
-                    int duration = timeRange.time_range_to_in_minutes_from_start -
-                                   timeRange.time_range_from_in_minutes_from_start;
-
-                    qCritical() << __func__ << ":" << __LINE__
                                 << "current" << current.toString(Qt::ISODate)
-                                << "duration" << duration
+                                << "durationMinutes" << durationMinutes;
-                                << "minsUsed" << minsUsed
+#endif
-                                << "minsToCarryOver" << minsToCarryOver;
 
+                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                        ATBTimeRange timeRange = timeRangeIt->second;
 
-                    //if (minsUsed > 0) {
+                        timeRange.computeQTimes(current.time());
-                    //    duration -= minsUsed;
-                    //    minsUsed = 0;
-                    //}
 
-                    if (current.addSecs(duration * 60).time() <= to) {
+                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                        if (minsToCarryOver > 0) {  // the price for this time range
+                                       timeRange.time_range_from_in_minutes_from_start;
-                                                    // has been is paid already
+
-                            if (minsUsed == 0) {
+#if DEBUG==1
-                                for(const auto &x: cfg->PaymentRate) {
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                    ATBPaymentRate const rate = x.second;
+                                    << "duration" << duration << timeRange.time_range_id
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_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) {
+#if DEBUG==1
-                                            end_datetime = current;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                                            return price;
+                                                    << "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;
+                            break;
-                                    durationMinutesNetto += duration;
-                                    durationMinutesBrutto += duration;
-
-                                    current = current.addSecs(duration * 60);
-                                    break;
-                                }
-                            }
                         }
-
-                        if (durationMinutes <= 0) {
-                            end_datetime = current;
-                            return price;
-                        }
-
-                        //++timeRangeIt;
-
-                    } else {
-
-                        lastCurrent = current;
-                        current.setTime(to);
-                        minsUsed = lastCurrent.secsTo(current) / 60;
-
-                        // mod duration: possibly discard some minutes in
-                        // the next time-range
-                        if (durationMinutes >= minsUsed) {
-                            minsToCarryOver = durationMinutes - minsUsed;
-                        }
-
-                        durationMinutes -= minsUsed;
-                        durationMinutesNetto += minsUsed;
-                        durationMinutesBrutto += minsUsed;
-
-                        if (minsUsed > 0) {
-                            for(const auto &x: cfg->PaymentRate) {
-                                ATBPaymentRate const rate = x.second;
-                                if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                    price += (uint)rate.pra_price;
-                                    break;
-                                }
-                            }
-                        }
-                        // break;
                     }
-                } // for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                }
 
                 end_datetime = start.addSecs(durationMinutesBrutto * 60);
+#if DEBUG==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "duration" << durationMinutesNetto
+                            << ", price" << std::max(price, minParkingPrice)
+                            << start.toString(Qt::ISODate)
+                            << end_datetime.toString(Qt::ISODate);
+#endif
                 return std::max(price, minParkingPrice);
             }
         }
@@ -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)
+        uint16_t timeStepCompensation = 0;
-            std::size_t const s = cfg->TimeRange.size();
-            for (std::size_t id = 1; id <= s; ++id) {
-                int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
-                m_timeSteps.append(step);
-            }
-        } else {
-            uint16_t timeStepCompensation = 0;
 
-            if (pop_carry_over) {
+        if (pop_carry_over) {
-                int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
+            int const pop_carry_over_time_range_id = cfg->getPaymentOptions().pop_carry_over_time_range_id;
-                QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
+            QTime const carryOverTimeRangeFrom = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_from;
-                QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
+            QTime const carryOverTimeRangeTo = cfg->TimeRange.find(pop_carry_over_time_range_id)->second.time_range_to;
 
-                if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
+            if (carryOverTimeRangeFrom.secsTo(carryOverTimeRangeTo) <= 60) { // carry over time point, usually 00:00:00
-                    if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
+                if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                            int const durationId = itr->second.pra_payment_unit_id;
+                        int const durationId = itr->second.pra_payment_unit_id;
-                            auto search = cfg->Duration.find(durationId);
+                        auto search = cfg->Duration.find(durationId);
-                            if (search != cfg->Duration.end()) {
+                        if (search != cfg->Duration.end()) {
-                                ATBDuration duration = search->second;
+                            ATBDuration duration = search->second;
-                                if (durationId == 1) {
+                            if (durationId == 1) {
-                                    QDateTime carryOver = start;
+                                QDateTime carryOver = start;
-                                    carryOver = carryOver.addDays(1);
+                                carryOver = carryOver.addDays(1);
-                                    carryOver.setTime(QTime(0, 0, 0));
+                                carryOver.setTime(QTime(0, 0, 0));
 
-                                    int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
+                                int const timeStep = std::ceil(start.secsTo(carryOver) / 60.0);
-                                    if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
+                                if (timeStep < duration.pun_duration_min || timeStep > duration.pun_duration_max) {
-                                        qCritical()
+                                    qCritical()
-                                            << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
+                                        << QString("ERROR timeStep (%1) < durationMin (%2) || timeStep (%3)) > durationMax (%4)")
-                                                .arg(timeStep).arg(duration.pun_duration_min)
+                                            .arg(timeStep).arg(duration.pun_duration_min)
-                                                .arg(timeStep).arg(duration.pun_duration_max);
+                                            .arg(timeStep).arg(duration.pun_duration_max);
-                                        break;
+                                    break;
-                                    }
-                                    qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-
-                                    // set dynamic minimal parking time
-                                    cfg->getPaymentOptions().pop_min_time = timeStep;
-
-                                    qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-
-                                    duration.pun_duration = timeStep;
-                                    timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
-                                    m_timeSteps << duration.pun_duration;
-                                } else {
-                                    duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
-                                    m_timeSteps << duration.pun_duration;;
                                 }
+                                qCritical() << __PRETTY_FUNCTION__ << "configured minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
 
-                                cfg->Duration.erase(search);
+                                // set dynamic minimal parking time
-                                cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
+                                cfg->getPaymentOptions().pop_min_time = timeStep;
 
-                            } else { // if (search != cfg->Duration.end()) {
+                                qCritical() << __PRETTY_FUNCTION__ << "  computed minimal parking time:" << cfg->getPaymentOptions().pop_min_time;
-                               // TODO
+
+                                duration.pun_duration = timeStep;
+                                timeStepCompensation = duration.pun_duration_max - duration.pun_duration;
+                                m_timeSteps << duration.pun_duration;
+                            } else {
+                                duration.pun_duration = duration.pun_duration_max - timeStepCompensation;
+                                m_timeSteps << duration.pun_duration;;
                             }
+
+                            cfg->Duration.erase(search);
+                            cfg->Duration.insert(pair<int, ATBDuration>(duration.pun_id, duration));
+
+                        } else { // if (search != cfg->Duration.end()) {
+                           // TODO
                         }
-                    } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        // TODO
                     }
-                } else { // if (carryOverTimeRangeFrom == 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/configuration.cpp

@@ -6,8 +6,6 @@
 #include "tariff_permit_type.h"
 #include "tariff_business_hours.h"
 #include "tariff_global_defines.h"
-#include "tariff_carryover.h"
-#include "tariff_global_defines.h"
 
 #include <QString>
 #include <QDebug>
@@ -16,108 +14,102 @@
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
 {
-    if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
+	if (strcmp(member_name, "Currency") == 0) return MemberType::CurrencyType;
-    if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
+	if (strcmp(member_name, "PaymentMethod") == 0) return MemberType::PaymentMethodType;
-    if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
+	if (strcmp(member_name, "PaymentRate") == 0) return MemberType::PaymentRateType;
-    if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
+	if (strcmp(member_name, "PaymentOption") == 0) return MemberType::PaymentOptionType;
-    if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
+	if (strcmp(member_name, "Duration") == 0) return MemberType::DurationType;
-    //if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
+	//if (strcmp(member_name, "WeekDays") == 0) return MemberType::WeekDaysType;
-    if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
+	if (strcmp(member_name, "WeekDaysWorktime") == 0) return MemberType::WeekDaysWorkTimeType;
-    if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
+	if (strcmp(member_name, "SpecialDaysWorktime") == 0) return MemberType::SpecialDaysWorktimeType;
-    if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
+	if (strcmp(member_name, "SpecialDays") == 0) return MemberType::SpecialDaysType;
-    if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
+	if (strcmp(member_name, "PeriodYear") == 0) return MemberType::PeriodYearType;
     if (strcmp(member_name, "DailyTicket") == 0) return MemberType::DailyTicketType;
     if (strcmp(member_name, "TimeBase") == 0) return MemberType::TimeBaseType;
     if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
     if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
     if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
     if (strcmp(member_name, "Product") == 0) return MemberType::ProductType;
-    if (strcmp(member_name, "Interpolation") == 0) return MemberType::InterpolationType;
-    if (strcmp(member_name, "Prepaid") == 0) return MemberType::PrepaidType;
-    if (strcmp(member_name, "CarryOver") == 0) return MemberType::CarryOverType;
     else return MemberType::UnknownType;
 }
 
 /// <inheritdoc/>
 bool Configuration::ParseJson(Configuration* cfg, const char* json)
 {
-        try
+	try
-        {
+	{
-            if (cfg == nullptr)
+		if (cfg == nullptr)
-            {
+		{
-                    printf("TariffConfiguration pointer not set\n");
+			printf("TariffConfiguration pointer not set\n");
-                    return false;
+			return false;
-            }
+		}
-            if (json == NULL)
+		if (json == NULL)
-            {
+		{
-                    printf("%s", "Input JSON string is NULL\n");
+			printf("%s", "Input JSON string is NULL\n");
-                    return false;
+			return false;
-            }
+		}
 
-            // Parse JSON to document
+		// Parse JSON to document
-            Document document;
+		Document document;
-            document.Parse(json);
+		document.Parse(json);
 
-            // Return if parse error has been found
+		// Return if parse error has been found
-            ParseErrorCode err = document.GetParseError();
+		ParseErrorCode err = document.GetParseError();
-            if (err != 0)
+		if (err != 0)
-            {
+		{
-                    printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
+			printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
-                    return false;
+			return false;
-            }
+		}
 
-            // Validate JSON, check if it's a JSON object
+		// Validate JSON, check if it's a JSON object
-            qCritical() << "JSON parsing has been successful";
+        qCritical() << "JSON parsing has been successful";
-                if (!document.IsObject()) {
+		if (!document.IsObject()) {
-                        printf("%s", "Error: not a (valid) JSON object\n");
+			printf("%s", "Error: not a (valid) JSON object\n");
-                        return false;
+			return false;
-                }
+		}
-            qCritical() << "Valid JSON object identified";
+        qCritical() << "Valid JSON object identified";
 
-                // Validate JSON, check configuration members
+		// Validate JSON, check configuration members
-                if (!document.HasMember("Currency")
+		if (!document.HasMember("Currency")
-                        || !document.HasMember("PaymentMethod")
+			|| !document.HasMember("PaymentMethod")
-                        || !document.HasMember("PaymentOption")
+			|| !document.HasMember("PaymentOption")
-                        || !document.HasMember("PaymentRate")
+			|| !document.HasMember("PaymentRate")
-                        || !document.HasMember("Duration")
+			|| !document.HasMember("Duration")
-                        //|| !document.HasMember("WeekDays")
+			//|| !document.HasMember("WeekDays")
-                    //|| !document.HasMember("SpecialDaysWorktime")
+            //|| !document.HasMember("SpecialDaysWorktime")
-                    //|| !document.HasMember("SpecialDays")
+            //|| !document.HasMember("SpecialDays")
-                )
+            )
-                {
+		{
-                        printf("%s", "Error: not a valid configuration JSON\n");
+			printf("%s", "Error: not a valid configuration JSON\n");
-                        return false;
+			return false;
-                }
+		}
-            qCritical() << "Valid JSON configuration identified";
+        qCritical() << "Valid JSON configuration identified";
 
-            ATBCurrency Currency;
+        ATBCurrency Currency;
-            ATBDuration Duration;
+        ATBDuration Duration;
-            ATBPaymentMethod PaymentMethod;
+        ATBPaymentMethod PaymentMethod;
-            ATBPaymentRate PaymentRate;
+        ATBPaymentRate PaymentRate;
-            ATBSpecialDaysWorktime SpecialDaysWorktime;
+        ATBSpecialDaysWorktime SpecialDaysWorktime;
-            ATBSpecialDays SpecialDays;
+        ATBSpecialDays SpecialDays;
-            ATBWeekDays  WeekDays;
+        ATBWeekDays  WeekDays;
-            ATBWeekDaysWorktime  WeekDaysWorktime;
+        ATBWeekDaysWorktime  WeekDaysWorktime;
-            ATBPeriodYear YearPeriod;
+        ATBPeriodYear YearPeriod;
-            ATBDailyTicket DailyTicket;
+        ATBDailyTicket DailyTicket;
-            ATBTimeBase TimeBase;
+        ATBTimeBase TimeBase;
-            ATBCustomer Customer;
+        ATBCustomer Customer;
-            ATBTimeRange TimeRange;
+        ATBTimeRange TimeRange;
-            ATBTimeStepConfig TimeStepConfig;
+        ATBTimeStepConfig TimeStepConfig;
-            ATBTariffProduct TariffProduct;
+        ATBTariffProduct TariffProduct;
-            ATBInterpolation TariffInterpolation;
-            ATBPrepaid TariffPrepaidOption;
-            ATBCarryOver TariffCarryOver;
 
-            MemberType mb_type = MemberType::UnknownType;
+        MemberType mb_type = MemberType::UnknownType;
-            this->currentPaymentOptions.clear();
+        this->currentPaymentOptions.clear();
 
-                // Get all JSON object members
+		// Get all JSON object members
-                // This code should run only once (to load JSON variables into memory)
+		// This code should run only once (to load JSON variables into memory)
-                for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
+		for (auto i = document.MemberBegin(); i != document.MemberEnd(); i++)
-                {
+		{
-                        // Get name of all general members of JSON, don't print name if NULL
+			// Get name of all general members of JSON, don't print name if NULL
-                        const char* mb_name = i->name.GetString();
+			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
             if (document[mb_name].IsString()) {
@@ -143,212 +135,35 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 
             qCritical() << " -" << mb_name;
 
-            // Get array for each JSON object member
+			// Get array for each JSON object member
-            auto mb_array = document[mb_name].GetArray();
+			auto mb_array = document[mb_name].GetArray();
-            if (mb_array.Size() <= 0) break;
+			if (mb_array.Size() <= 0) break;
 
-                        //Iterate over provided array
+			//Iterate over provided array
-            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++) {
+            for (rapidjson::SizeType j = 0; j < mb_array.Size(); j++)
-                // Get all inner objects, don't print name if NULL
+			{
-                auto inner_obj = mb_array[j].GetObject();
+				// Get all inner objects, don't print name if NULL
-                if (inner_obj.MemberCount() <= 0) break;
+				auto inner_obj = mb_array[j].GetObject();
+				if (inner_obj.MemberCount() <= 0) break;
 
-                // Iterate over inner object JSON members
+				// Iterate over inner object JSON members
-                for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
+				for (auto k = inner_obj.MemberBegin(); k != inner_obj.MemberEnd(); k++)
-                {
+				{
-                    // Get inner object JSON member, don't print name if NULL
+					// Get inner object JSON member, don't print name if NULL
-                    const char* inner_obj_name = k->name.GetString();
+					const char* inner_obj_name = k->name.GetString();
-                    if (inner_obj_name == NULL)
+					if (inner_obj_name == NULL)
-                    {
+					{
-                            printf("Inner object name is NULL\n");
+						printf("Inner object name is NULL\n");
-                            continue;
+						continue;
-                    }
+					}
 
-                    // Identify member type
+					// Identify member type
-                    mb_type = IdentifyJsonMember(mb_name);
+					mb_type = IdentifyJsonMember(mb_name);
 
-                    switch (mb_type)
+					switch (mb_type)
-                    {
+					{
-                    case MemberType::UnknownType:
+					case MemberType::UnknownType:
-                        break;
+						break;
-                    case MemberType::CarryOverType: {
-                        if (QString(inner_obj_name) == QString("carry_over_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffCarryOver.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("carry_over_week")) {
-                            if (k->value.IsArray()) {
-                                auto days = k->value.GetArray();
-                                for (rapidjson::SizeType j=0; j < days.Size(); ++j) {
-                                    if (days[j].IsObject()) {
-                                        auto weekday = days[j].GetObject();
-                                        for (auto w = weekday.MemberBegin(); w != weekday.MemberEnd(); ++w) {
-                                            int day = j+1; // 8 entries
-                                            QString member(QString::fromStdString(w->name.GetString()));
-                                            if (member == "carry_over_day") {
-                                                if (w->value.IsInt()) {
-                                                    rapidjson::SizeType const d = w->value.GetInt();
-                                                    if (d != (j+1)) {
-                                                        qCritical() << "ERROR: misconfigured jsonfile" << d << "!=" << (j+1);
-                                                    }
-                                                    TariffCarryOver.carryover[day].day = day;
-                                                }
-                                            } else
-                                            if (member == "carry_over_duration") {
-                                                if (w->value.IsInt()) {
-                                                    TariffCarryOver.carryover[day].duration = w->value.GetInt();
-                                                }
-                                            } else
-                                            if (member == "carry_over_seemless") {
-                                                if (w->value.IsBool()) {
-                                                    bool b = w->value.GetBool();
-                                                    TariffCarryOver.carryover[day].seemless = b;
-                                                }
-                                            } else
-                                            if (member == "carry_over_never") {
-                                                if (w->value.IsBool()) {
-                                                    bool b = w->value.GetBool();
-                                                    TariffCarryOver.carryover[day].never = b;
-                                                }
-                                            } else
-                                            if (member == "carry_over_static_start") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffCarryOver.carryover[day].static_start = t;
-                                                }
-                                            } else
-                                            if (member == "carry_over_static_end") {
-                                                if (w->value.IsString()) {
-                                                    QTime const &t = QTime::fromString(w->value.GetString(), Qt::ISODate);
-                                                    TariffCarryOver.carryover[day].static_end = t;
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    } break;
-                    case MemberType::PrepaidType: {
-                        if (QString(inner_obj_name) == QString("prepaid_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffPrepaidOption.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_anytime")) {
-                            if (k->value.IsBool()) {
-                                bool const &x = k->value.GetBool();
-                                TariffPrepaidOption.anytime = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_never")) {
-                            if (k->value.IsBool()) {
-                                bool const &x = k->value.GetBool();
-                                TariffPrepaidOption.never = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_static_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffPrepaidOption.static_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("prepaid_static_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffPrepaidOption.static_end = t;
-                            }
-                        }
-                    } break;
-                    case MemberType::InterpolationType: {
-                        if (QString(inner_obj_name) == QString("interpol_id")) {
-                            if (k->value.IsInt()) {
-                                int const &x = k->value.GetInt();
-                                TariffInterpolation.id = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.static_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.static_end = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_start_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.static_start_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_end_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.static_end_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_static_duration")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.static_duration = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_start")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.dynamic_start = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_end")) {
-                            if (k->value.IsString()) {
-                                QTime const &t = QTime::fromString(k->value.GetString(), Qt::ISODate);
-                                TariffInterpolation.dynamic_end = t;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_start_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.dynamic_start_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_end_str")) {
-                            if (k->value.IsString()) {
-                                QString const &s = k->value.GetString();
-                                TariffInterpolation.dynamic_end_str = s;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_duration")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.dynamic_duration = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_dynamic_until_price")) {
-                            if (k->value.IsInt()) {
-                                int const x = k->value.GetInt();
-                                TariffInterpolation.dynamic_until_price = x;
-                            }
-                        } else
-                        if (QString(inner_obj_name) == QString("interpol_seemless")) {
-                            if (k->value.IsBool()) {
-                                bool const x = k->value.GetBool();
-                                TariffInterpolation.seemless = x;
-                            }
-                        }
-                        if (QString(inner_obj_name) == QString("interpol_never")) {
-                            if (k->value.IsBool()) {
-                                bool const x = k->value.GetBool();
-                                TariffInterpolation.never = x;
-                            }
-                        }
-                    } break;
                     case MemberType::ProductType: {
                         if (QString(inner_obj_name) == QString("tariff_product_id")) {
                             if (k->value.IsInt()) {
@@ -560,22 +375,22 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         }
                         break;
                     case MemberType::CurrencyType:
-                        if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pcu_id") == 0) Currency.pcu_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pcu_sign") == 0) Currency.pcu_sign = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pcu_major") == 0) Currency.pcu_major = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pcu_minor") == 0) Currency.pcu_minor = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
+						else if (strcmp(inner_obj_name, "pcu_active") == 0) Currency.pcu_active = k->value.GetBool();
-                        break;
+						break;
-                    case MemberType::PaymentMethodType:
+					case MemberType::PaymentMethodType:
-                        if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pme_id") == 0) PaymentMethod.pme_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pme_label") == 0) PaymentMethod.pme_label = k->value.GetString();
-                        break;
+						break;
-                    case MemberType::PaymentRateType:
+					case MemberType::PaymentRateType:
-                        if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pra_payment_option_id") == 0) PaymentRate.pra_payment_option_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pra_payment_unit_id") == 0) PaymentRate.pra_payment_unit_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
+						else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
-                        break;
+						break;
-                    case MemberType::PaymentOptionType:
+					case MemberType::PaymentOptionType:
                         if (strcmp(inner_obj_name, "pop_id") == 0) {
                             this->currentPaymentOptions.append(ATBPaymentOption());
                             this->currentPaymentOptions.last().reset();
@@ -598,16 +413,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
                         } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
                             this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
-                        } else if (strcmp(inner_obj_name, "pop_prepaid_option_id") == 0) {
-                            this->currentPaymentOptions.last().pop_prepaid_option_id = k->value.GetInt();
-                        } else if (strcmp(inner_obj_name, "pop_truncate_last_interpolation_step") == 0) {
-                            this->currentPaymentOptions.last().pop_truncate_last_interpolation_step = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_accumulate_prices") == 0) {
-                            this->currentPaymentOptions.last().pop_accumulate_prices = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_accumulate_durations") == 0) {
-                            this->currentPaymentOptions.last().pop_accumulate_durations = k->value.GetBool();
-                        } else if (strcmp(inner_obj_name, "pop_carry_over_option_id") == 0) {
-                            this->currentPaymentOptions.last().pop_carry_over_option_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
                             this->currentPaymentOptions.last().pop_carry_over = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_carry_over_time_range_id") == 0) {
@@ -688,106 +493,103 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         }
                         break;
-                    case MemberType::DurationType:
+					case MemberType::DurationType:
-                        if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pun_duration") == 0) {
+						else if (strcmp(inner_obj_name, "pun_duration") == 0) Duration.pun_duration = k->value.GetDouble();
-                            Duration.pun_duration = k->value.GetDouble();
+                        else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
-                            Duration.pun_duration_saved = Duration.pun_duration;
-                        } else if (strcmp(inner_obj_name, "pun_duration_min") == 0) Duration.pun_duration_min = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pun_duration_max") == 0) Duration.pun_duration_max = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pun_interpolation_id") == 0) Duration.pun_interpolation_id = k->value.GetInt();
                         break;
-                     case MemberType::SpecialDaysWorktimeType:
+					case MemberType::SpecialDaysWorktimeType:
-                        if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pedwt_id") == 0) SpecialDaysWorktime.pedwt_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pedwt_period_exc_day_id") == 0) SpecialDaysWorktime.pedwt_period_exc_day_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pedwt_time_from") == 0) SpecialDaysWorktime.pedwt_time_from = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pedwt_time_to") == 0) SpecialDaysWorktime.pedwt_time_to = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
+						else if (strcmp(inner_obj_name, "pedwt_price") == 0) SpecialDaysWorktime.pedwt_price = k->value.GetDouble();
-                        break;
+						break;
-                /*case MemberType::WeekDaysType:
+					/*case MemberType::WeekDaysType:
-                        if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pdiw_id") == 0) WeekDays.pdiw_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pdiw_label") == 0) WeekDays.pdiw_label = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pdiw_index") == 0) WeekDays.pdiw_index = k->value.GetInt();
-                        break;*/
+						break;*/
-                     case MemberType::WeekDaysWorkTimeType:
+					case MemberType::WeekDaysWorkTimeType:
-                        if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
                         else if (strcmp(inner_obj_name, "pwd_time_to") == 0) WeekDaysWorktime.pwd_time_to = k->value.GetString();
                         break;
-                     case MemberType::SpecialDaysType:
+					case MemberType::SpecialDaysType:
-                        if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "ped_id") == 0) SpecialDays.ped_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
+						else if (strcmp(inner_obj_name, "ped_label") == 0) SpecialDays.ped_label = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
+						else if (strcmp(inner_obj_name, "ped_date_start") == 0) SpecialDays.ped_date_start = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
+						else if (strcmp(inner_obj_name, "ped_date_end") == 0) SpecialDays.ped_date_end = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "ped_period_special_day_id") == 0) SpecialDays.ped_period_special_day_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_payment_option_id") == 0) SpecialDays.ped_payment_option_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "ped_year") == 0) SpecialDays.ped_year = k->value.GetInt();
-                        break;
+						break;
-                     case MemberType::PeriodYearType:
+					case MemberType::PeriodYearType:
-                        if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
+						if (strcmp(inner_obj_name, "pye_id") == 0) YearPeriod.pye_id = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
+						else if (strcmp(inner_obj_name, "pye_label") == 0) YearPeriod.pye_label = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pye_start_month") == 0) YearPeriod.pye_start_month = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pye_start_day") == 0) YearPeriod.pye_start_day = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pye_end_month") == 0) YearPeriod.pye_end_month = k->value.GetInt();
-                        else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
+						else if (strcmp(inner_obj_name, "pye_end_day") == 0) YearPeriod.pye_end_day = k->value.GetInt();
-                        break;
+						break;
-                    default:
+					default:
-                        break;
+						break;
-                    }
+					}
 //#pragma endregion
-                }
+				}
 
-                                // Push to specific list depending on member type
+				// Push to specific list depending on member type
-                switch (mb_type) {
+				switch (mb_type)
-                case MemberType::UnknownType:
+				{
-                    break;
+				case MemberType::UnknownType:
-                case MemberType::PaymentMethodType:
+					break;
-                    cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
+				case MemberType::PaymentMethodType:
-                    break;
+					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
+					break;
                 case MemberType::PaymentRateType:
-                    // qCritical() << "PaymentRate" << PaymentRate.pra_price << PaymentRate.pra_payment_option_id;
+                    // qCritical() << "PaymentRate" << PaymentRate;
                     cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
-                    break;
+					break;
                 case MemberType::PaymentOptionType: {
                     if (!this->currentPaymentOptions.isEmpty()) {
                         ATBPaymentOption const &PaymentOption = this->currentPaymentOptions.last();
                         cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
                     }
                 } break;
-                case MemberType::DurationType:
+				case MemberType::DurationType:
-                                        cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
+					cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
-                    // qCritical() << Duration;
+					break;
-                    break;
+				case MemberType::SpecialDaysWorktimeType:
-                case MemberType::SpecialDaysWorktimeType:
+					cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
-                    cfg->SpecialDaysWorktime.insert(pair<int, ATBSpecialDaysWorktime>(SpecialDaysWorktime.pedwt_period_exc_day_id, SpecialDaysWorktime));
+					break;
-                    break;
+				//case MemberType::WeekDaysType:
-                                //case MemberType::WeekDaysType:
+				//	cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
-                                //      cfg->WeekDays.insert(pair<int, ATBWeekDays>(WeekDays.pdiw_index, WeekDays));
+				//	break;
-                                //      break;
+				case MemberType::WeekDaysWorkTimeType:
-                case MemberType::WeekDaysWorkTimeType:
+					cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
-                    cfg->WeekDaysWorktime.insert(pair<int, ATBWeekDaysWorktime>(WeekDaysWorktime.pwd_period_day_in_week_id, WeekDaysWorktime));
+					break;
-                    break;
+				case MemberType::SpecialDaysType:
-                case MemberType::SpecialDaysType:
+					cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
-                    cfg->SpecialDays.insert(pair<int, ATBSpecialDays>(SpecialDays.ped_id, SpecialDays));
+					break;
-                    break;
+				case MemberType::PeriodYearType:
-                case MemberType::PeriodYearType:
+					cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
-                    cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
+					break;
-                    break;
                 case MemberType::DailyTicketType:
                     cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
-                    // qCritical() << DailyTicket;
+                    qCritical() << DailyTicket;
                     DailyTicket.reset();
                     break;
                 case MemberType::CustomerType:
                     cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
-                    // qCritical() << Customer;
+                    qCritical() << Customer;
                     break;
                 case MemberType::TimeBaseType:
                     cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
-                    // qCritical() << TimeBase;
+                    qCritical() << TimeBase;
                     break;
                 case MemberType::TimeRangeType:
                     cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
@@ -799,152 +601,20 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     break;
                 case MemberType::ProductType:
                     cfg->TariffProduct.insert(pair<int, ATBTariffProduct>(TariffProduct.m_tariff_product_id, TariffProduct));
-                    // qCritical() << TariffProduct;
+                    qCritical() << TariffProduct;
-                    break;
-                case MemberType::InterpolationType:
-                    cfg->TariffInterpolations.insert(pair<int, ATBInterpolation>(TariffInterpolation.id, TariffInterpolation));
-                    // qCritical() << TariffInterpolation;
-                    break;
-                case MemberType::PrepaidType:
-                    cfg->TariffPrepaidOptions.insert(pair<int, ATBPrepaid>(TariffPrepaidOption.id, TariffPrepaidOption));
-                    // qCritical() << TariffPrepaidOption;
-                    break;
-                case MemberType::CarryOverType:
-                    cfg->TariffCarryOverOptions.insert(pair<int, ATBCarryOver>(TariffCarryOver.id, TariffCarryOver));
-                    // qCritical() << TariffCarryOver;
-                    break;
                 default:
-                     break;
+					break;
-                }
+				}
-            }
+			}
-        }
+		}
-        return true;
+		return true;
-    }
+	}
-    catch (...) {
+	catch (...) {
-        printf("%s\n", "General exception has occurred while parsing JSON\n");
+		printf("%s\n", "General exception has occurred while parsing JSON\n");
-        return false;
+		return false;
-    }
+	}
 }
 
-std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &start, int paymentOptionIndex) const {
-    int const pop_id = getPaymentOptions(paymentOptionIndex).pop_id;
-    int const pop_carry_over_option_id = getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-    int const pop_truncate_last_interpolation_step = getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
-    int const weekDay = start.date().dayOfWeek();
-    //QTime const &carryOverStart = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-    //QTime const &carryOverEnd = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
-    //bool const carry_over_seemless = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].seemless;
-    //bool const carry_over_never = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].never;
-    int const carryOverDuration  = TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
-
-    std::optional<QDateTime> value = std::nullopt;
-
-    QDateTime interpolationEndTime = start;
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
-
-    int price = 0;
-
-    for (auto[itr, rangeEnd] = PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-        int const durationId = itr->second.pra_payment_unit_id;
-        // int const price = itr->second.pra_price;
-
-        auto search = Duration.find(durationId);
-        if (search != Duration.end()) {
-            ATBDuration duration = search->second;
-
-            if (duration.pun_interpolation_id == -1) {
-                // should never happen -> misconfigured tariff-file
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ") ERROR pun_interpolation not set!";
-                qCritical() << "(" << __func__ << ":" << __LINE__ << ") See for instance customer_505/6";
-                break;
-            }
-
-            std::optional<ATBInterpolation> ipolCheck = getInterpolationType(duration.pun_interpolation_id);
-            if (ipolCheck) {
-                ATBInterpolation interpolation = ipolCheck.value();
-                switch (duration.pun_interpolation_id) {
-                    case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::STATIC_TIMEPOINT_AND_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_TIMEPOINT_AND_STATIC_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_DURATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE): {
-                        interpolation.dynamic_start = start.time();
-                        interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
-
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")               interpol start:" << interpolation.dynamic_start.toString(Qt::ISODate);
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << interpolationEndTime.toString(Qt::ISODate);
-
-                        if (interpolation.seemless) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        } else
-                        if (interpolation.never) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                        } else {
-                            QDateTime const &s = interpolationEndTime.addSecs(duration.pun_duration * 60);
-                            int const minutesToStaticEnd = s.time().secsTo(interpolation.static_end) / 60;
-
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed interpol end so far:" << s.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")          interpol static end:" << interpolation.static_end.toString(Qt::ISODate);
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")        minutes to static end:" << minutesToStaticEnd;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                       pun-id:" << duration.pun_id;
-
-                            int p = 0;
-                            for (auto[it, rangeEnd] = this->PaymentRate.equal_range(pop_id); it != rangeEnd; ++it) {
-                                if (it->second.pra_payment_unit_id == duration.pun_id) {
-                                    if (minutesToStaticEnd >= 0) {
-                                        // the end of the interpolation for this day must be before a possible carry over interval
-                                        p = it->second.pra_price;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
-                                        price += p;
-                                        interpolationEndTime = s;
-                                    } else {
-                                        if (pop_truncate_last_interpolation_step == false) {
-                                            p = it->second.pra_price;
-                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   next price:" << p;
-                                            price += p;
-                                            interpolationEndTime = s;
-                                            interpolationEndTime = interpolationEndTime.addSecs(carryOverDuration * 60);
-                                        } else {
-                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
-                                        }
-                                    }
-                                }
-                            }
-
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
-
-                            if (price >= interpolation.dynamic_until_price) {
-     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")                        price:" << price;
-     //                           qCritical() << "(" << __func__ << ":" << __LINE__ << ")        computed interpol end:" << interpolationEndTime.toString(Qt::ISODate);
-                                value = value.value_or(interpolationEndTime);
-                                break;
-                            }
-                        }
-                    }
-                    break;
-                    case static_cast<int>(ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_END_TIME):
-                    break;
-                    default:;
-                }
-            }
-        }
-    }
-
-    return value;
-}
-
-
 int Configuration::getPaymentOptionIndexIfSpecialDay(QDateTime const &dt) const {
     if (isSpecialDay(dt)) {
         int const numOptions = getAllPaymentOptions().size();
@@ -1170,51 +840,6 @@ Configuration::getDailyTicketsForAllKeys() const {
     return value;
 }
 
-std::optional<ATBInterpolation> Configuration::getInterpolationType(int key) const {
-    std::optional<ATBInterpolation> value;
-    for (auto[it, rangeEnd] = this->TariffInterpolations.equal_range(key); it != rangeEnd; ++it) {
-        value = value.value_or(it->second);
-    }
-    return value;
-}
-
-std::optional<ATBPrepaid> Configuration::getPrepaidType(int key) const {
-    std::optional<ATBPrepaid> value;
-    for (auto[it, rangeEnd] = this->TariffPrepaidOptions.equal_range(key); it != rangeEnd; ++it) {
-        value = value.value_or(it->second);
-    }
-    return value;
-}
-
-std::optional<QDateTime> Configuration::prepaidStart(QDateTime const &start, int prepaid_option_id) {
-    std::optional<QDateTime> value;
-    QDateTime s = start;
-
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid option id:" << prepaid_option_id;
-
-    std::optional<ATBPrepaid> prepaid_option = getPrepaidType(prepaid_option_id);
-    if (prepaid_option.has_value()) {
-        ATBPrepaid prepaid = prepaid_option.value();
-
-        if (prepaid.never == false) {
-            // start: 22:00, end: 08:00
-            QTime prepaidStart = TariffPrepaidOptions.find(prepaid_option_id)->second.static_start;
-            QTime prepaidEnd = TariffPrepaidOptions.find(prepaid_option_id)->second.static_end;
-
-            if (s.time() >= prepaidStart) {
-                s = s.addDays(1);
-                s.setTime(prepaidEnd);
-            } else
-            if (s.time() < prepaidEnd) {
-                s.setTime(prepaidEnd);
-            }
-            s.setTime(QTime(s.time().hour(), s.time().minute(), 0));
-            value = value.value_or(s);
-        }
-    }
-    return value;
-}
-
 std::optional<QVector<ATBDailyTicket>>
 Configuration::getDailyTicketsForKey(int key) const {
     QVector<ATBDailyTicket> tickets;

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