Declared iterator-arguments as const-references to get rid of compiler

warning: parameter passing for argument multi_map changed in gcc7.1

library/include/mobilisis/calculate_price.h

@@ -197,17 +197,18 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
                                                   int paymentOptionIndex=0);
 
-int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
                                                   int paymentOptionIndex=0);
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,
-                                                   int paymentOptionIndex=0);
+                                                   int paymentOptionIndex = 0,
+                                                   QDateTime const &start = QDateTime::currentDateTime());
 
 int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING,

library/include/mobilisis/configuration.h

@@ -39,6 +39,8 @@ public:
     using SpecialDaysType = std::multimap<int, ATBSpecialDays>;
     using SpecialDaysWorktimeType = std::multimap<int, ATBSpecialDaysWorktime>;
     using TimeRangeType = std::multimap<int, ATBTimeRange>;
+    using TariffProductType = std::multimap<int, ATBTariffProduct>;
+    using ATBPaymentOptionType = std::multimap<int, ATBPaymentOption>;
 
     ATBProject project;
     ATBCurrency Currency;
@@ -52,13 +54,13 @@ public:
 	multimap<int, ATBWeekDays> WeekDays;
 	multimap<int, ATBPeriodYear> YearPeriod;
 	multimap<int, ATBWeekDaysWorktime> WeekDaysWorktime;
-	multimap<int, ATBPaymentOption> PaymentOption;
+    ATBPaymentOptionType PaymentOption;
     multimap<int, ATBDailyTicket> DailyTicket;
     TimeRangeType TimeRange;
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
     multimap<int, ATBCustomer> Customer;
-    multimap<int, ATBTariffProduct> TariffProduct;
+    TariffProductType TariffProduct;
 
 	/// <summary>
 	/// Parse JSON string
@@ -86,6 +88,7 @@ public:
     std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 

library/include/mobilisis/payment_opt.h

@@ -5,6 +5,8 @@
 #include <string>
 #include <cinttypes>
 
+#include <QDateTime>
+
 class ATBPaymentOption
 {
 public:
@@ -22,6 +24,7 @@ public:
         pop_min_price = 0;
         pop_max_price = 0;
         pop_carry_over = -1;
+        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;
@@ -41,12 +44,21 @@ public:
     double pop_min_price;
     double pop_max_price;
     int pop_carry_over;
+    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;
     int pop_daily_card_price;
     uint64_t pop_business_hours;
     int pop_time_step_config;
+
+    struct ATBMaxDateTime {
+        int direction;
+        uint8_t week;
+        uint8_t day;
+        QTime time;
+    } pop_min_date_time,
+      pop_max_date_time;
 };
 
 #endif // PAYMENT_OPT_H_INCLUDED

library/include/mobilisis/tariff_business_hours.h

@@ -24,6 +24,10 @@
 #define _ONLY_OPEN_FOR_BUSINESS_DAYS_       (uint64_t)(1ULL << 16)    /* verkaufsoffen */
 #define _WITH_RESTRICTED_HOURS_             (uint64_t)(1ULL << 17)
 #define _ALL_DAYS_WITH_RESTRICTED_HOURS_    ((_WITH_RESTRICTED_HOURS_|_ALL_DAYS_))
+#define _WEEKEND_WITH_RESTRICTED_HOURS_     ((_WITH_RESTRICTED_HOURS_|_FRI_|_SAT_|_SUN_))
+#define _FRI_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_FRI_))
+#define _SAT_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_SAT_))
+#define _SUN_WITH_RESTRICTED_HOURS_         ((_WITH_RESTRICTED_HOURS_|_SUN_))
 #define _NOT_DEFINED_                       (uint64_t)(~0ULL)
 
 enum BusinessHours : std::uint64_t
@@ -57,6 +61,10 @@ enum BusinessHours : std::uint64_t
     ONLY_WEEKEND = _ONLY_WEEKEND_,
     ONLY_OPEN_FOR_BUSINESS_DAYS = _ONLY_OPEN_FOR_BUSINESS_DAYS_,
     ALL_DAYS_WITH_RESTRICTED_HOURS = _ALL_DAYS_WITH_RESTRICTED_HOURS_,
+    WEEKEND_WITH_RESTRICTED_HOURS = _WEEKEND_WITH_RESTRICTED_HOURS_,
+    FRI_WITH_RESTRICTED_HOURS = _FRI_WITH_RESTRICTED_HOURS_,
+    SAT_WITH_RESTRICTED_HOURS = _SAT_WITH_RESTRICTED_HOURS_,
+    SUN_WITH_RESTRICTED_HOURS = _SUN_WITH_RESTRICTED_HOURS_,
     NOT_DEFINED = _NOT_DEFINED_
 };
 

library/include/mobilisis/tariff_permit_type.h

@@ -4,15 +4,16 @@
 #include <QString>
 
 enum class PERMIT_TYPE : quint8 {
-    SHORT_TERM_PARKING,
-    DAY_TICKET,
-    SZEGED_START,
-    SZEGED_STOP,
-    DAY_TICKET_ADULT,
-    DAY_TICKET_TEEN,
-    DAY_TICKET_CHILD,
-    FOOD_STAMP,
-    INVALID
+    SHORT_TERM_PARKING=0,
+    DAY_TICKET=1,
+    SZEGED_START=2,
+    SZEGED_STOP=3,
+    DAY_TICKET_ADULT=4,
+    DAY_TICKET_TEEN=5,
+    DAY_TICKET_CHILD=6,
+    INVALID=7,
+    FOOD_STAMP=8,
+    TWENTY_FOUR_HOURS_TICKET=9
 };
 
 struct PermitType {
@@ -45,6 +46,9 @@ struct PermitType {
         case 7:
             m_permitType = PERMIT_TYPE::FOOD_STAMP;
             break;
+        case 8:
+            m_permitType = PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
+            break;
         default:
             m_permitType = PERMIT_TYPE::INVALID;
         }
@@ -74,6 +78,8 @@ struct PermitType {
             return 6;
         case PERMIT_TYPE::FOOD_STAMP:
             return 7;
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return 8;
         default:
             break;
         }
@@ -81,7 +87,7 @@ struct PermitType {
 
     }
 
-    operator QString () {
+    QString toString() {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:
             return QString("DAY_TICKET");
@@ -99,13 +105,15 @@ struct PermitType {
             return QString("SZEGED_STOP");
         case PERMIT_TYPE::FOOD_STAMP:
             return QString("FOOD_STAMP");
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return QString("TWENTY_FOUR_HOURS_TICKET");
         default:
             break;
         }
         return QString("INVALID");
     }
 
-    operator QString () const {
+    QString toString() const {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:
             return QString("DAY_TICKET");
@@ -123,11 +131,21 @@ struct PermitType {
             return QString("SZEGED_STOP");
         case PERMIT_TYPE::FOOD_STAMP:
             return QString("FOOD_STAMP");
+        case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET:
+            return QString("TWENTY_FOUR_HOURS_TICKET");
         default:
             break;
         }
         return QString("INVALID");
     }
+
+    operator QString () {
+        return toString();
+    }
+
+    operator QString () const {
+        return toString();
+    }
 };
 
 #endif // TARIFF_PERMIT_TYPE_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -79,12 +79,12 @@ namespace Utilities {
 	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
 
     QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it);
+    QTime SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
     QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
-    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it);
-    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
+    QTime SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it);
+    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
+    int WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr);
     // PaymentRate GetPaymentRate(Configuration const *cfg, );
     bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
     bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
@@ -100,4 +100,5 @@ namespace Utilities {
     uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
     double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
     QStringList dumpBusinessHours(uint64_t businessHours);
+    uint32_t getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId);
 }

library/library.pro

@@ -12,6 +12,10 @@ INCLUDEPATH += $$_PRO_FILE_PWD_/include/rapidjson
 #Version is set in yocto recipe with "EXTRA_QMAKEVARS_PRE"
 #VERSION=1.0.0
 
+# 04.06.2024: Fix for Szeged: read price for daily ticket directly from entry
+#             PaymentOptions in tariff-file if it is not given as part of a
+#             Json-Product-Array in tariff-file.
+
 CONFIG(debug, debug|release) {
     win32 {
         QMAKE_CXXFLAGS += -DCALCULATE_LIBRARY_EXPORTS

library/src/calculate_price.cpp

@@ -14,7 +14,7 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
 }
 
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
     int minTime = 0;
@@ -33,14 +33,14 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg,
         // for each new sell-procedure, recomute the timesteps. implicitly, set
         // the minimal parking time.
         Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
-        Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex);
+        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
         minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
     }
 
     return minTime;
 }
 
-int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
     int maxTime = 0;
@@ -59,11 +59,13 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg,
     }
 
     return maxTime;
+
 }
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    PERMIT_TYPE permitType,
-                                                   int paymentOptionIndex) {
+                                                   int paymentOptionIndex,
+                                                   QDateTime const &start) {
     int minPrice = -1;
 
     switch(permitType) {
@@ -76,6 +78,9 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     } break;
     case PERMIT_TYPE::DAY_TICKET_CHILD: {
     } break;
+    case PERMIT_TYPE::DAY_TICKET: {
+        minPrice = compute_product_price(cfg, permitType, start);
+    } break;
     default: ;
     }
 
@@ -144,6 +149,10 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
                 QTime const &startTime = p.getTimeStart();
                 QTime const &endTime = p.getTimeEnd();
 
+                // qCritical() << __LINE__ << startTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << endTime.toString(Qt::ISODate);
+                // qCritical() << __LINE__ << start.toString(Qt::ISODate);
+
                 if (start.time() >= startTime && start.time() < endTime) {
                     product_price = p.getProductPrice();
                     if (productStart && productEnd) {
@@ -154,8 +163,41 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
             }
 
             return product_price;
+        } else {
+            // SZEGED
+            int const pop_daily_card_price = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qDebug() << QString("(%1:%2) no products defined in tariff-file").arg(__func__).arg(__LINE__);
+            qDebug() << QString("(%1:%2) pop_daily_card_price=%3").arg(__func__).arg(__LINE__).arg(pop_daily_card_price);
+
+            // static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+            // return Utilities::getDailyTicketCardPrice(cfg, paymentMethodId);
+
+            return pop_daily_card_price;
         }
     } break;
+    case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            int product_price = 0;
+            QVector<ATBTariffProduct> product = products.value();
+
+            if (product.size() > 0) {
+                if (productStart && productEnd) {
+                    int pop_min_time = get_minimal_parkingtime(cfg); // in minutes
+                    int pop_max_time = get_maximal_parkingtime(cfg); // in minutes
+                    if (pop_max_time >= pop_min_time) {
+                        *productStart = start;
+                        *productEnd = start.addSecs(pop_max_time*60);
+                        product_price = product[0].getProductPrice();
+                    }
+                }
+            }
+
+            return product_price;
+        }
+
+    } break;
     default:
       break;
     }
@@ -453,6 +495,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
+                << "          paymentOptionIndex: " << paymentOptionIndex << endl
                 << "          start_parking_time: " << start_parking_time << endl
                 << "          netto_parking_time: " << netto_parking_time << endl
                 << "                      minMin: " << minMin << endl
@@ -479,15 +522,21 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     double cost = -1;
     if (start_parking_time.isValid()) {
-        if (tariff->getPaymentOptions().pop_payment_method_id == PaymentMethod::Steps) {
+        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps) {
             // hier muesste man unterscheiden: uebertrag oder nicht?
             calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                    netto_parking_time, paymentOptionIndex);
             if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
+                // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                //             << calcState.toString();
                 return calcState;
             }
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
             end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
+
+            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
         } else {
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
@@ -504,7 +553,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
 
         // DEBUG
-        qCritical() << "               -> calculated cost (price->netto) =  " << cost;
+        qCritical() << "            end_parking_time: " << end_parking_time;
+        qCritical() << "  -> calculated cost (netto): " << cost;
 
         price->brutto = price->vat = price->vat_percentage = 0;
         price->units = cost;

library/src/calculator_functions.cpp

@@ -628,12 +628,19 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
     if (paymentMethodId == PaymentMethod::Steps) {
         uint64_t const businessHours = cfg->getPaymentOptions(paymentOptionIndex).pop_business_hours;
+
         if (cfg->isDayIncluded(businessHours, start)) {
             if (businessHours == BusinessHours::NO_RESTRICTION_24_7) {
                 return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
                          QTime(0, 0, 0), QTime(23, 59, 59));
             }
+
             int const weekdayId = start.date().dayOfWeek();
+
+            // qCritical() << DBG_HEADER
+            //             << "weekdayId" << weekdayId
+            //             << "count" << cfg->WeekDaysWorktime.count(weekdayId);
+
             if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
                 using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
                 std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
@@ -649,8 +656,10 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                     QTime const &startTime = start.time();
 
                     if (startTime >= from && startTime <= until) {
-                        QTime const endTime = start.addSecs(netto_parking_time*60).time();
-                        if (endTime <= until) {
+                        QDateTime const end = start.addSecs(netto_parking_time*60);
+                        QTime const endTime = end.time();
+                        if (endTime <= until && start.date().dayOfWeek() == end.date().dayOfWeek()) {
+                            qCritical() << DBG_HEADER;
                             return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", from, until);
                         } else {
                             errorStr = QString("%1 startTime not in range (%2 not in [%3, %4))")
@@ -668,28 +677,59 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                     }
 
                     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
+
+                    // qCritical() << DBG_HEADER
+                    //             << "paymentOptionIndex" << paymentOptionIndex
+                    //             << "pop_carry_over" << pop_carry_over;
+
                     if (pop_carry_over == 1) {
-                        qCritical() << DBG_HEADER
-                                    << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
+                        // qCritical() << DBG_HEADER
+                        //             << "NO. CHECK IF PARKING IS ALLOWED WITH CARRY-OVER ...";
 
                         int const pop_carry_over_start_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_start_time_range;
                         int const pop_carry_over_end_time_range = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over_end_time_range;
 
+                        // qCritical() << DBG_HEADER
+                        //             << "pop_carry_over_start_time_range" << pop_carry_over_start_time_range
+                        //             << "pop_carry_over_end_time_range" << pop_carry_over_end_time_range;
+
+                        if ((int)cfg->TimeRange.count(pop_carry_over_start_time_range) <= 0 &&
+                            (int)cfg->TimeRange.count(pop_carry_over_end_time_range) <= 0) {
+
+                            qCritical() << DBG_HEADER << "PARKING_ALLOWED. startTime" << startTime.toString(Qt::ISODate);
+                            return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", startTime);
+
+                        } else
+                        // search entry in time-range-field of tariff-file
                         if (cfg->TimeRange.count(pop_carry_over_start_time_range) == 1 &&
                             cfg->TimeRange.count(pop_carry_over_end_time_range) == 1) {
 
                             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);
+
                             if (startTime >= s.getTimeFrom() && startTime <= s.getTimeUntil()) {
+
                                 QDateTime sd = start;
                                 sd.setTime(s.getTimeUntil());
 
+                                // 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);
+
                                 int const jumpSecs = sd.secsTo(ed);
+
+                                // qCritical() << DBG_HEADER << "jumpSecs" << jumpSecs;
+
                                 QDateTime const end = start.addSecs(netto_parking_time*60 + jumpSecs);
+
+                                // qCritical() << DBG_HEADER << "new end" << end.toString(Qt::ISODate);
+
                                 if (end.time() <= e.getTimeUntil()) {
 
                                     qCritical() << DBG_HEADER
@@ -699,13 +739,13 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                                     return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED",
                                                      startTime, end.time());
                                 } else {
-                                    errorStr = QString("endTime %1 exceeds [%2, %3))")
+                                    errorStr = QString("endTime %1 outside [%2, %3))")
                                                   .arg(end.toString(Qt::ISODate))
                                                   .arg(sd.toString(Qt::ISODate))
                                                   .arg(ed.toString(Qt::ISODate));
                                 }
                             } else {
-                                errorStr = QString("startTime %1 exceeds [%2, %3))")
+                                errorStr = QString("startTime %1 outside [%2, %3))")
                                               .arg(startTime.toString(Qt::ISODate))
                                               .arg(s.getTimeFrom().toString(Qt::ISODate))
                                               .arg(s.getTimeUntil().toString(Qt::ISODate));
@@ -728,6 +768,8 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
         }
     }
 
+    qCritical() << DBG_HEADER << "errorStr" << errorStr;
+
     return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, errorStr,
                      QTime(), QTime());
 }
@@ -2005,6 +2047,9 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
         if (dailyTickets) {
             QVector<ATBDailyTicket> const tickets = dailyTickets.value();
             switch (permitType) {
+                case PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET: {
+                    // TODO
+                } break;
                 case PERMIT_TYPE::FOOD_STAMP: {
                     // TODO
                 } break;

library/src/configuration.cpp

@@ -9,6 +9,7 @@
 
 #include <QString>
 #include <QDebug>
+#include <QRegularExpression>
 
 /// <inheritdoc/>
 MemberType Configuration::IdentifyJsonMember(const char* member_name)
@@ -436,6 +437,60 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             }
                         } else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) {
                             this->currentPaymentOptions.last().pop_time_step_config = k->value.GetInt();
+                        } else if ((strcmp(inner_obj_name, "pop_min_date_time") == 0)
+                                || (strcmp(inner_obj_name, "pop_max_date_time") == 0)) {
+                            if (k->value.IsString()) { // -w0dFriT16:20:00 or +w0dMonT00:00:00
+                                static const QRegularExpression re(R"(([+-])w([0-9]+)d([A-Za-z]{3})T([0-9]{2}:[0-9]{2}:[0-9]{2}))");
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                QRegularExpressionMatch match = re.match(s);
+                                if (match.hasMatch()) {
+                                    ATBPaymentOption::ATBMaxDateTime dt;
+                                    int lastCaptured = match.lastCapturedIndex();
+                                    if (lastCaptured == 4) {
+                                        dt.direction = (match.captured(1) == "-") ? -1 : +1;
+
+                                        bool ok;
+                                        uint8_t week = match.captured(2).toUInt(&ok);
+                                        if (ok) {
+                                            dt.week = week;
+                                        }
+
+                                        QString const &day = match.captured(3);
+                                        if (day.compare("Mon", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Monday;
+                                        } else if (day.compare("Tue", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Tuesday;
+                                        } else if (day.compare("Wed", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Wednesday;
+                                        } else if (day.compare("Thu", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Thursday;
+                                        } else if (day.compare("Fri", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Friday;
+                                        } else if (day.compare("Sat", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Saturday;
+                                        } else if (day.compare("Sun", Qt::CaseInsensitive) == 0) {
+                                            dt.day = (int)Qt::Sunday;
+                                        }
+
+                                        QTime t = QTime::fromString(match.captured(4), Qt::ISODate);
+                                        if (t.isValid()) {
+                                            dt.time = t;
+                                        }
+                                    }
+
+                                    if (strcmp(inner_obj_name, "pop_min_date_time") == 0) {
+                                        this->currentPaymentOptions.last().pop_min_date_time = dt;
+                                    } else
+                                    if (strcmp(inner_obj_name, "pop_max_date_time") == 0) {
+                                        this->currentPaymentOptions.last().pop_max_date_time = dt;
+                                    }
+                                }
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_carry_over_target") == 0) {
+                            if (k->value.IsBool()) {
+                                bool const v = k->value.GetBool();
+                                this->currentPaymentOptions.last().pop_carry_over_target = v;
+                            }
                         }
                         break;
 					case MemberType::DurationType:
@@ -583,7 +638,7 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         if (sd.ped_id != 0) {
             for (int opt=0; opt < numOptions; ++opt) {
                 uint64_t const pop_id = getPaymentOptions(opt).pop_id;
-                if (pop_id == sd.ped_payment_option_id) {
+                if (pop_id == (uint64_t)sd.ped_payment_option_id) {
                     return opt;
                 }
             }
@@ -627,7 +682,8 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         }
     }
 
-    return -1;
+    qCritical() << DBG_HEADER << "ERROR: DEFAULT VALUE OF '0' RETURNED AS STATIC VALUE";
+    return 0;
 }
 
 ATBSpecialDays Configuration::specialDay(QDateTime const &dt) const {
@@ -718,12 +774,38 @@ Configuration::getTariffProductForAllKeys() const {
 }
 
 std::optional<QVector<ATBTariffProduct>>
-Configuration::getTariffProductForProductId(PermitType permitType) const {
+Configuration::getTariffProductForProductTypeName(QString const &permitTypeName) const {
     QVector<ATBTariffProduct> products;
     std::optional<QVector<ATBTariffProduct>> value;
 
     products.clear();
 
+    for(const auto &product: this->TariffProduct) {
+        ATBTariffProduct const &v = product.second;
+        if (v.m_tariff_product_name == permitTypeName) {
+            products.append(v);
+        }
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(PermitType permitType) const {
+    QString permitTypeName(permitType);
+    return getTariffProductForProductTypeName(permitTypeName);
+
+    /*
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+
     for (auto[it, rangeEnd] = this->TariffProduct.equal_range(permitType); it != rangeEnd; ++it) {
         products.append(it->second);
     }
@@ -733,6 +815,7 @@ Configuration::getTariffProductForProductId(PermitType permitType) const {
     }
 
     return value;
+    */
 }
 
 std::optional<QVector<ATBTariffProduct>>

library/src/utilities.cpp

@@ -334,11 +334,11 @@ QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDa
     return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeFrom(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
     return QTime::fromString(it->second.pedwt_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator it) {
+QTime Utilities::SpecialDaysWorkTimeUntil(Configuration::SpecialDaysWorktimeType::const_iterator const &it) {
     return QTime::fromString(it->second.pedwt_time_to.c_str(), Qt::ISODate);
 }
 
@@ -346,15 +346,15 @@ QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialD
     return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
 }
 
-QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
 }
 
-int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+int Utilities::WeekDayId(std::multimap<int, ATBWeekDaysWorktime>::const_iterator const &itr) {
     return itr->second.pwd_period_day_in_week_id;
 }
 
@@ -406,6 +406,10 @@ uint32_t Utilities::getMaximalParkingPrice(Configuration const *cfg, PaymentMeth
     return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_price, 0);
 }
 
+uint32_t Utilities::getDailyTicketCardPrice(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_daily_card_price, 0);
+}
+
 uint32_t Utilities::getTimeRangeStep(Configuration const *cfg, int step, PaymentMethod methodId) {
     if (methodId == PaymentMethod::Progressive) {
         Configuration::TimeRangeType::const_iterator it = cfg->TimeRange.find(step);

main/main.cpp

@@ -28,19 +28,20 @@ extern "C" char* strptime(const char* s,
 #include <QDateTime>
 #include <QDir>
 #include <QFileInfo>
+#include <QSet>
+#include <initializer_list>
 
 #include <fstream>
 #include <sstream>
 #include "calculator_functions.h"
 #include "calculate_price.h"
 
-#define SZEGED                                  (0)
+#define SZEGED                                  (1)
 #define SCHOENAU_KOENIGSEE                      (0)
 #define NEUHAUSER_KORNEUBURG                    (0)
-#define NEUHAUSER_LINSINGER_MASCHINENBAU        (1)
+#define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
 #define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define NEUHAUSER_KIRCHDORF                     (0)
 #define BAD_NEUENAHR_AHRWEILER                  (0)
 #define NEUHAUSER_CHRISTOPH_REISEN              (0)
 #define NEUHAUSER_PERNEGG_AN_DER_MUR            (0)
@@ -207,6 +208,9 @@ int main() {
                        .arg(__LINE__)
                        .arg(start.time().toString(Qt::ISODate)) << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(6, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
@@ -216,6 +220,13 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__)
+                    << price;
+
+        price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
+        qCritical() << QString("line=%1 price:").arg(__LINE__) << price;
+
         start.setTime(QTime(15, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
@@ -225,6 +236,9 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(16, 0, 0));
         productStart = productEnd = QDateTime();
         price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
@@ -234,14 +248,35 @@ int main() {
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
 
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
         start.setTime(QTime(17, 0, 0));
         productStart = productEnd = QDateTime();
-        price = compute_product_price(&cfg, PERMIT_TYPE::INVALID, start, &productStart, &productEnd);
+        price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
         qCritical() << QString("line=%1 price (%2-%3) :")
                        .arg(__LINE__)
                        .arg(productStart.time().toString(Qt::ISODate))
                        .arg(productEnd.time().toString(Qt::ISODate))
                     << price;
+
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
+        price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET);
+        qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
+        for (int h = 0; h < 24; ++h) {
+            start.setTime(QTime(h, 0, 0));
+            productStart = productEnd = QDateTime();
+            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start, &productStart, &productEnd);
+            qCritical() << QString("line=%1 %2 price (%3-%4) :")
+                           .arg(__LINE__)
+                           .arg(start.time().toString(Qt::ISODate))
+                           .arg(productStart.time().toString(Qt::ISODate))
+                           .arg(productEnd.time().toString(Qt::ISODate))
+                        << price;
+        }
     }
 #endif
 
@@ -316,10 +351,13 @@ int main() {
 #endif
 
             QDateTime start = QDateTime::currentDateTime();
-            //start.setTime(QTime(0, 0, 0));
+            start.setTime(QTime(10, 2, 30));
+            start.setDate(QDate(2024, 5, 5));
+
+            // 2024-05-05 10:02:30
 
             struct price_t costs;
-            double const cost[] = {600, 700, 800, 1600, 2400, 3000, 3600};
+            double const cost[] = {600, 700, 800, 1600, 2400, 3200, 4000};
             double price1 = 0;
             double price2 = 0;
 
@@ -366,34 +404,41 @@ int main() {
     int pop_carry_over;
     int pop_carry_over_time_range_id;
 
-    for (int zone=2; zone < 3; ++zone) {
+    for (int zone=1; zone < 2; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
+            // standard-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json");
             //pop_max_time = 6*60;
         } break;
         case 2: {
+            // kuzzeit-1-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json");
             //pop_max_time = 5*60;
         } break;
         case 3: {
+            // kuzzeit-2-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json");
             //pop_max_time = 6*60;
         } break;
         case 4: {
+            // kuzzeit-3-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff04.json");
             //pop_max_time = 4*60;
         } break;
         case 5: {
+            // langzeit-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json");
             //pop_max_time = 6*60;
         } break;
         case 6: {
+            // sondertarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff06.json");
             //pop_max_time = 4*60;
         } break;
         case 7: {
+            // wochenend-tarif
             input.open("/opt/ptu5/opt/customer_249/etc/psa_tariff/tariff07.json");
             //pop_max_time = 4*60;
         } break;
@@ -589,6 +634,380 @@ int main() {
                     }
                 }
             }
+            if (zone == 3) {
+                pop_min_time = get_minimal_parkingtime(&cfg);
+                pop_max_time = get_maximal_parkingtime(&cfg);
+                pop_min_price = get_minimal_parkingprice(&cfg);
+                pop_max_price = get_maximal_parkingprice(&cfg);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << "        pop_min_time: " << pop_min_time;
+                qCritical() << "        pop_max_time: " << pop_max_time;
+                qCritical() << "       pop_min_price: " << pop_min_price;
+                qCritical() << "       pop_max_price: " << pop_max_price;
+                qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{20, 40, 60, 80, 100, 120});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "TimeSteps" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start;
+
+                for (int i=0; i < 5; ++i) {
+                    switch (i) {
+                    case 0:
+                        start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0));  // holiday
+                        fail = false;
+                    break;
+                    case 1:
+                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        fail = false;
+                    break;
+                    case 2:
+                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0));  // monday
+                        fail = false;
+                    break;
+                    case 3:
+                        start = QDateTime(QDate(2024, 4, 23), QTime(17, 30, 0)); // tuesday
+                        fail = true;
+                    break;
+                    case 4:
+                        start = QDateTime(QDate(2024, 4, 24), QTime(7, 30, 0)); // wednesday
+                        fail = true;
+                    break;
+                    default:;
+                    }
+
+                    QDateTime end;
+                    struct price_t price;
+
+                    //start = QDateTime::currentDateTime();
+                    QList<int> timeSteps;
+
+                    int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                    if (paymentOptionIndex != -1) {
+                        qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+                        timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, paymentOptionIndex);
+                        qCritical() << "TimeSteps" << timeSteps;
+
+                        QList<int>::const_iterator step;
+                        for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+
+                            double cost = 0;
+                            CalcState cs;
+
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                                cost = price.netto;
+                                qCritical() << "step" << *step << ": cost" << cost;
+                            } else {
+                                if (fail == false) {
+                                    qCritical() << "<<<ERROR>>> cs =" << QString(cs);
+                                }
+                            }
+                        }
+                    } else {
+                        qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                    }
+                }
+
+            }
+            if (zone == 4) {
+                pop_min_time = get_minimal_parkingtime(&cfg);
+                pop_max_time = get_maximal_parkingtime(&cfg);
+                pop_min_price = get_minimal_parkingprice(&cfg);
+                pop_max_price = get_maximal_parkingprice(&cfg);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << "        pop_min_time: " << pop_min_time;
+                qCritical() << "        pop_max_time: " << pop_max_time;
+                qCritical() << "       pop_min_price: " << pop_min_price;
+                qCritical() << "       pop_max_price: " << pop_max_price;
+                qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{20, 40, 60, 80, 100, 120});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "TimeSteps" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start;
+
+                for (int i=4; i < 5; ++i) {
+                    switch (i) {
+                    case 0:
+                        start = QDateTime(QDate(2024, 5, 1), QTime(16, 0, 0));  // holiday
+                        fail = false;
+                    break;
+                    case 1:
+                        start = QDateTime(QDate(2024, 4, 21), QTime(16, 0, 0)); // sunday
+                        fail = false;
+                    break;
+                    case 2:
+                        start = QDateTime(QDate(2024, 4, 22), QTime(8, 0, 0));  // monday
+                        fail = false;
+                    break;
+                    case 3:
+                        start = QDateTime(QDate(2024, 4, 23), QTime(17, 30, 0)); // tuesday
+                        fail = true;
+                    break;
+                    case 4:
+                        start = QDateTime(QDate(2024, 4, 24), QTime(7, 30, 0)); // wednesday
+                        fail = true;
+                    break;
+                    default:;
+                    }
+
+                    QDateTime end;
+                    struct price_t price;
+
+                    //start = QDateTime::currentDateTime();
+                    QList<int> timeSteps;
+
+                    int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                    if (paymentOptionIndex != -1) {
+                        qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+                        timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, paymentOptionIndex);
+                        qCritical() << "TimeSteps" << timeSteps;
+
+                        QList<int>::const_iterator step;
+                        for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+
+                            double cost = 0;
+                            CalcState cs;
+
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                                cost = price.netto;
+                                qCritical() << "step" << *step << ": cost" << cost;
+                            } else {
+                                if (fail == false) {
+                                    qCritical() << "<<<ERROR>>> cs =" << QString(cs);
+                                }
+                            }
+                        }
+                    } else {
+                        qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                    }
+                }
+            }
+            if (zone == 5) {    // langzeit-tarif
+                pop_min_time = get_minimal_parkingtime(&cfg);
+                pop_max_time = get_maximal_parkingtime(&cfg);
+                pop_min_price = get_minimal_parkingprice(&cfg);
+                pop_max_price = get_maximal_parkingprice(&cfg);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << zone << "        pop_min_time: " << pop_min_time;
+                qCritical() << zone << "        pop_max_time: " << pop_max_time;
+                qCritical() << zone << "       pop_min_price: " << pop_min_price;
+                qCritical() << zone << "       pop_max_price: " << pop_max_price;
+                qCritical() << zone << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{
+                        20, 40, 60, 80, 100, 120, 140, 160, 180, 200, 220, 240, 260, 1440, 4320, 10080
+                      });
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "( TimeSteps  :" << __LINE__ << ")" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                bool fail;
+                QDateTime start = QDateTime::currentDateTime();
+
+                int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
+                if (paymentOptionIndex != -1) {
+                    QDateTime end;
+                    struct price_t price;
+
+                    qCritical() << "paymentOptionIndex" << paymentOptionIndex;
+
+                    QList<int>::const_iterator step;
+                    int i = 0;
+                    for (step = timeSteps.cbegin(); step != timeSteps.cend(); ++step) {
+                        if (++i < 16) continue;
+
+                        double cost = 0;
+                        CalcState cs;
+
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            cost = price.netto;
+                            qCritical() << "step" << *step << ": cost" << cost;
+                        } else {
+                            if (fail == false) {
+                                qCritical() << "<<<ERROR>>> cs =" << QString(cs);
+                            }
+                        }
+                        exit(0);
+                    }
+                } else {
+                    qCritical() << "ERROR paymentOptionIndex =" << paymentOptionIndex;
+                }
+
+            }
+            if (zone == 6) {    // sondertarif: 24h ticket wohnmobile
+                                // 8 euro; hoechstparkdauer 24h
+                pop_min_time = get_minimal_parkingtime(&cfg);
+                pop_max_time = get_maximal_parkingtime(&cfg);
+                pop_min_price = get_minimal_parkingprice(&cfg);
+                pop_max_price = get_maximal_parkingprice(&cfg);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << zone << "        pop_min_time: " << pop_min_time;
+                qCritical() << zone << "        pop_max_time: " << pop_max_time;
+                qCritical() << zone << "       pop_min_price: " << pop_min_price;
+                qCritical() << zone << "       pop_max_price: " << pop_max_price;
+                qCritical() << zone << "pop_daily_card_price: " << pop_daily_card_price;
+
+                QDateTime start = QDateTime::currentDateTime();
+                start.setTime(QTime(0, 0, 0));
+
+                for (int i=0; i<1440; ++i) {
+
+                    QDateTime productStart;
+                    QDateTime productEnd;
+
+                    int v = compute_product_price(&cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET, start, &productStart, &productEnd);
+                    if (v != 800) {
+                        qCritical() << "ERROR [" << i << "]" << "price 24h-ticket"
+                                    << v << productStart.toString(Qt::ISODate)
+                                    << productEnd.toString(Qt::ISODate);
+                        exit(-1);
+                    } else {
+
+                        int const secs = productStart.secsTo(productEnd);
+                        if (secs != 86400) {
+                            qCritical() << "ERROR" << i << secs << v
+                                        << productStart.toString(Qt::ISODate)
+                                        << productEnd.toString(Qt::ISODate);
+                            exit(-1);
+                        } else {
+                        qCritical() << i << secs << v
+                                    << productStart.toString(Qt::ISODate)
+                                    << productEnd.toString(Qt::ISODate);
+                        }
+
+                    }
+                    start = start.addSecs(60);
+                }
+            }
+            if (zone == 7) {
+                pop_min_time = get_minimal_parkingtime(&cfg);
+                pop_max_time = get_maximal_parkingtime(&cfg);
+                pop_min_price = get_minimal_parkingprice(&cfg);
+                pop_max_price = get_maximal_parkingprice(&cfg);
+                pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+                qCritical() << zone << "        pop_min_time: " << pop_min_time;
+                qCritical() << zone << "        pop_max_time: " << pop_max_time;
+                qCritical() << zone << "       pop_min_price: " << pop_min_price;
+                qCritical() << zone << "       pop_max_price: " << pop_max_price;
+                qCritical() << zone << "pop_daily_card_price: " << pop_daily_card_price;
+
+                static QList<int> const stepsConfigured
+                    = QList(std::initializer_list<int>{
+                        20, 40, 60, 80, 100, 120, 140, 160, 180, 200, 220, 240, 260, 1440});
+
+                //static QList<double> const cost
+                //    = QList(std::initializer_list<double>{
+                //        0, 40, 80, 120, 160, 200, 240, 280, 320, 360, 400, 440, 480, 500});
+
+                static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+                qCritical() << "( TimeSteps  :" << __LINE__ << ")" << timeSteps;
+
+                if (stepsConfigured != timeSteps) {
+                    qCritical() << "TIME-STEPS SHOULD BE" << stepsConfigured;
+                    return -1;
+                }
+
+                QDateTime start = QDateTime::currentDateTime();
+
+                // testing
+                start.setDate(QDate(2024, 5, 5));
+                start.setTime(QTime(16, 0, 0));
+
+                struct price_t costs;
+                double price1 = 0;
+                double price2 = 0;
+
+                CalcState cs;
+                for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                    QDateTime end = start.addSecs(timeSteps.at(i)*60);
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                    qCritical() << endl;
+                }
+
+                exit(0);
+
+                for (int m=0; m < 1440; ++m) {
+                    start.setTime(QTime(0, 0, 0));
+                    start = start.addSecs(m*60);
+
+                    qCritical() << "START" << start.toString(Qt::ISODate);
+
+                    //int Down = 0;
+                    //int Up = 1;
+                    // for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                    //    int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
+                    //    qCritical() << "nextTimeStep" << nextTimeStep;
+                    //
+                    //    int prevTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Down);
+                    //    qCritical() << "prevTimeStep" << prevTimeStep;
+                    //}
+
+                    for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
+                        QDateTime end = start.addSecs(timeSteps.at(i)*60);
+
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        if (cs.getStatus() != CalcState::State::SUCCESS) {
+                            if (start.time().hour() >= 8 && start.time().hour() < 18) {
+                                qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
+                                exit(-1);
+                            } else {
+                                if (cs.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
+                                    qCritical() << "CALC-STATE=" << QString(cs);
+                                    continue;
+                                }
+                                qCritical() << "ERROR CALC-STATE-2=" << QString(cs);
+                                exit(-1);
+                            }
+                        }
+                        price1 = costs.netto;
+                        price2 = Calculator::GetInstance().GetCostFromDuration(&cfg, start, timeSteps.at(i));
+
+                        if (price1 != price2) {
+                            qCritical() << "ERROR DIFFERENT PRICES" << price1 << price2;
+                            exit(-1);
+                        }
+
+                        qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
+                                    << timeSteps.at(i) << "PRICE=" << price1;
+
+
+                        //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
+                        //                                                                     start.toString(Qt::ISODate).toStdString().c_str(),
+                        //                                                                     cost[i], false, true);
+                        //qCritical() << "duration" << duration.c_str();
+                    }
+                }
+            }
         }
     }
 #endif
@@ -638,9 +1057,179 @@ int main() {
                                      &cfg,
                                      start,
                                      timeSteps.at(i));
-                qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i)
+                qCritical() << "zone" << zone
+                            << "GetCostFromDuration() time: " << timeSteps.at(i)
                             << "(" << timeSteps.at(i)/60 << "h)"
                             << "price=" << price;
+
+                switch(timeSteps.at(i)) {
+                case 60:
+                    if (zone == 1) {
+                        if (price == 300.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 300.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 3) {
+                        if (price == 200.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 180:
+                    if (zone == 1) {
+                        if (price == 700.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 500.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 3) {
+                        if (price == 400.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 1440:
+                    if (zone == 1) {
+                        if (price == 900.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 600.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 3) {
+                        if (price == 500.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 2880:
+                    if (zone == 1) {
+                        if (price == 1800.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 1200.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 4320:
+                    if (zone == 1) {
+                        if (price == 2700.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 1800.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 5760:
+                    if (zone == 1) {
+                        if (price == 3600.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 2400.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 7200:
+                    if (zone == 1) {
+                        if (price == 4500.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 3000.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 8640:
+                    if (zone == 1) {
+                        if (price == 5400.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 3600.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 10080:
+                    if (zone == 1) {
+                        if (price == 6300.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 4200.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 11520:
+                    if (zone == 1) {
+                        if (price == 7200.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 4800.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 12960:
+                    if (zone == 1) {
+                        if (price == 8100.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 5400.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                case 14400:
+                    if (zone == 1) {
+                        if (price == 9000.0) {
+                            continue;
+                        }
+                    }
+                    if (zone == 2) {
+                        if (price == 6000.0) {
+                            continue;
+                        }
+                    }
+                    break;
+                default:
+                    qCritical() << "ERROR zone" << zone
+                                << "GetCostFromDuration() time: " << timeSteps.at(i)
+                                << "(" << timeSteps.at(i)/60 << "h)"
+                                << "price=" << price;
+                    exit(-1);
+                }
+
             }
         }
     }
@@ -1021,15 +1610,25 @@ int main() {
             exit(-1);
         }
 
+        QSet<uint32_t> const prices{700, 1400, 2100, 2800, 3500, 4200, 4900};
+
         for (int i=0; i<timeSteps.size(); ++i) {
             int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
             qCritical() << "nextTimeStep" << nextTimeStep;
 
             uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i), paymentOptionIndex);
             uint32_t duration = Calculator::GetInstance().GetDurationForPrice(&cfg, price);
+
+            if (!prices.contains(price)) {
+                qCritical() << "ERROR nextTimeStep relative to start:"
+                            << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
+                            << "(price so far:" << price << ")";
+                exit(-1);
+            }
             qCritical() << "nextTimeStep relative to start:"
                         << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
                         << "(price so far:" << price << ")";
+
         }
     }
 #endif
@@ -1064,6 +1663,11 @@ int main() {
             CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
                                                           PERMIT_TYPE::DAY_TICKET_ADULT,
                                                           &price);
+            if (price.netto != 800) {
+                qCritical() << "ERROR(ADULT) start=" << start.toString(Qt::ISODate)
+                            << "end" << end.toString(Qt::ISODate) << "price (ADULT)" << price.netto;
+                exit(-1);
+            }
             qCritical() << "start=" << start.toString(Qt::ISODate)
                         << "end" << end.toString(Qt::ISODate) << "price (ADULT)" << price.netto;
         }
@@ -1073,6 +1677,11 @@ int main() {
             CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
                                                           PERMIT_TYPE::DAY_TICKET_TEEN,
                                                           &price);
+            if (price.netto != 400) {
+                qCritical() << "ERROR(TEEN) start=" << start.toString(Qt::ISODate)
+                            << "end" << end.toString(Qt::ISODate) << "price (TEEN)" << price.netto;
+                exit(-1);
+            }
             qCritical() << "start=" << start.toString(Qt::ISODate)
                         << "end" << end.toString(Qt::ISODate) << "price (TEEN)" << price.netto;
         }
@@ -1095,6 +1704,11 @@ int main() {
 
     if (isParsed) {
         int const price = compute_product_price(&cfg, PERMIT_TYPE::FOOD_STAMP);
+        if (price != 300) {
+            qCritical() << "ERROR price food stamp" << price;
+            exit(-1);
+
+        }
         qCritical() << "price food stamp" << price;
     }
 #endif
@@ -1136,6 +1750,170 @@ int main() {
                                 << "duration" << duration
                                 << "cost" << cost;
 
+                    switch(duration) {
+                    case 30:
+                        if (cost == 60.0) {
+                            continue;
+                        }
+                        break;
+                    case 35:
+                        if (cost == 70.0) {
+                            continue;
+                        }
+                        break;
+                    case 40:
+                        if (cost == 80.0) {
+                            continue;
+                        }
+                        break;
+                    case 45:
+                        if (cost == 90.0) {
+                            continue;
+                        }
+                        break;
+                    case 50:
+                        if (cost == 100.0) {
+                            continue;
+                        }
+                        break;
+                    case 55:
+                        if (cost == 110.0) {
+                            continue;
+                        }
+                        break;
+                    case 60:
+                        if (cost == 120.0) {
+                            continue;
+                        }
+                        break;
+                    case 65:
+                        if (cost == 130.0) {
+                            continue;
+                        }
+                        break;
+                    case 70:
+                        if (cost == 140.0) {
+                            continue;
+                        }
+                        break;
+                    case 75:
+                        if (cost == 150.0) {
+                            continue;
+                        }
+                        break;
+                    case 80:
+                        if (cost == 160.0) {
+                            continue;
+                        }
+                        break;
+                    case 85:
+                        if (cost == 170.0) {
+                            continue;
+                        }
+                        break;
+                    case 90:
+                        if (cost == 180.0) {
+                            continue;
+                        }
+                        break;
+                    case 95:
+                        if (cost == 190.0) {
+                            continue;
+                        }
+                        break;
+                    case 100:
+                        if (cost == 200.0) {
+                            continue;
+                        }
+                        break;
+                    case 105:
+                        if (cost == 210.0) {
+                            continue;
+                        }
+                        break;
+                    case 110:
+                        if (cost == 220.0) {
+                            continue;
+                        }
+                        break;
+                    case 115:
+                        if (cost == 230.0) {
+                            continue;
+                        }
+                        break;
+                    case 120:
+                        if (cost == 240.0) {
+                            continue;
+                        }
+                        break;
+                    case 125:
+                        if (cost == 250.0) {
+                            continue;
+                        }
+                        break;
+                    case 130:
+                        if (cost == 260.0) {
+                            continue;
+                        }
+                        break;
+                    case 135:
+                        if (cost == 270.0) {
+                            continue;
+                        }
+                        break;
+                    case 140:
+                        if (cost == 280.0) {
+                            continue;
+                        }
+                        break;
+                    case 145:
+                        if (cost == 290.0) {
+                            continue;
+                        }
+                        break;
+                    case 150:
+                        if (cost == 300.0) {
+                            continue;
+                        }
+                        break;
+                    case 155:
+                        if (cost == 310.0) {
+                            continue;
+                        }
+                        break;
+                    case 160:
+                        if (cost == 320.0) {
+                            continue;
+                        }
+                        break;
+                    case 165:
+                        if (cost == 330.0) {
+                            continue;
+                        }
+                        break;
+                    case 170:
+                        if (cost == 340.0) {
+                            continue;
+                        }
+                        break;
+                    case 175:
+                        if (cost == 350.0) {
+                            continue;
+                        }
+                        break;
+                    case 180:
+                        if (cost == 360.0) {
+                            continue;
+                        }
+                        break;
+                    default:
+                        qCritical() << "ERROR(1) start" << start.toString(Qt::ISODate)
+                                    << "end" << end.toString(Qt::ISODate)
+                                    << "duration" << duration
+                                    << "cost" << cost;
+                        exit(-1);
+                    }
+
                     //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "start" << start.toString(Qt::ISODate)
@@ -1152,6 +1930,13 @@ int main() {
                 s.setTime(QTime(12, 0, 0));
                 int duration = 30;
                 double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, s, end, duration, nextDay, prePaid);
+                if (cost != 60.0) {
+                    qCritical() << "ERROR(2) start" << s.toString(Qt::ISODate)
+                                << "end" << end.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "cost" << cost;
+                    exit(-1);
+                }
                 qCritical() << "start" << s.toString(Qt::ISODate)
                             << "end" << end.toString(Qt::ISODate)
                             << "duration" << duration
@@ -1226,6 +2011,10 @@ int main() {
             qCritical() << "       pop_max_price: " << pop_max_price;
             qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
 
+
+            pop_daily_card_price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET);
+            qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
             if (pop_min_time > pop_max_time) {
                 qCritical() << "ERROR pop_min_time > pop_max_time"
                             << pop_min_time << pop_max_time;
@@ -1372,7 +2161,7 @@ int main() {
                     m.insert(115, 499);
                     m.insert(120, 520);
 
-                    m.insert(125, 524);
+                    m.insert(125, 542);
                     m.insert(130, 564);
                     m.insert(135, 585);
                     m.insert(140, 607);
@@ -1791,6 +2580,8 @@ int main() {
                             return -1;
                         }
 
+                        // this->getDayTicketPrice(PERMIT_TYPE::DAY_TICKET)
+
                         // start = s.addSecs(offset * 60);
                         // end = QDateTime();
                         // if (compute_duration_for_daily_ticket(&cfg, start, end)) {
@@ -1801,7 +2592,7 @@ int main() {
                         //    return -1;
                         // }
 
-                        ++cnt;
+                        // ++cnt;
                     }
                 }
             }