Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental

library/include/mobilisis/calculator_functions.h

@@ -40,12 +40,12 @@ public:
     }
 
     void ResetTimeSteps(int paymentOptionIndex) {
-        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
+        if (m_timeSteps.size() > 0) {
             m_timeSteps[paymentOptionIndex].clear();
         }
     }
     QList<int> timeSteps(int paymentOptionIndex=0) const {
-        if (m_timeSteps.size() > 0 && paymentOptionIndex < m_timeSteps.size()) {
+        if (m_timeSteps.size() > 0) {
             return m_timeSteps[paymentOptionIndex];
         }
         return QList<int>();
@@ -133,10 +133,10 @@ private:
                               int durationMinutes);
 
     //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const;
-    //uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-    //    return GetPriceForTimeStep(cfg, step, 0);
-    //}
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex=0) const;
+    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
+        return GetPriceForTimeStep(cfg, step);
+    }
     uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
     uint32_t GetStepForPrice(Configuration *cfg, int price) const {
         return GetDurationForPrice(cfg, price);

library/include/mobilisis/configuration.h

@@ -48,13 +48,12 @@ public:
     using TariffInterpolationType = std::multimap<int, ATBInterpolation>;
     using TariffPrepaidType = std::multimap<int, ATBPrepaid>;
     using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
-    using TariffDurationType = std::multimap<int, ATBDuration>;
 
     ATBProject project;
     ATBCurrency Currency;
     ATBDuration duration;
 
-    TariffDurationType Duration;
+	multimap<int, ATBDuration> Duration;
 	multimap<int, ATBPaymentMethod> PaymentMethod;
 	multimap<int, ATBPaymentRate> PaymentRate;
 	SpecialDaysWorktimeType SpecialDaysWorktime;

library/include/mobilisis/payment_opt.h

@@ -38,10 +38,8 @@ public:
         pop_daily_card_price = -1;
         pop_business_hours = -1;
         pop_time_step_config = -1;
-        pop_use_only_upto_datetime = ""; // deprecated
-        pop_use_only_for_duration = 0;   // deprecated
-        pop_plus_steps = 1;  // +: jump <x=1> steps forward
-        pop_minus_steps = 1; // -: jump <x=1> steps backward
+        pop_use_only_upto_datetime = "";
+        pop_use_only_for_duration = 0;
     }
 
     int pop_id;
@@ -71,8 +69,6 @@ public:
     int pop_time_step_config;
     bool pop_accumulate_prices;
     bool pop_accumulate_durations;
-    int pop_plus_steps;
-    int pop_minus_steps;
 
     struct ATBMaxDateTime {
         int direction;

library/include/mobilisis/utilities.h

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

library/src/calculate_price.cpp

@@ -3,8 +3,6 @@
 #include "calculator_functions.h"
 #include "payment_option.h"
 #include "utilities.h"
-#include "tariff_global_defines.h"
-#include "period_year.h"
 
 #include <QFile>
 #include <QFileInfo>
@@ -36,11 +34,10 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   int paymentOptionIndex) {
     int minTime = 0;
 
-    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
-
     paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
 
     qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+    qCritical() << __func__ << __LINE__ << "permit" << PermitType(permitType).toString();
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
@@ -97,40 +94,6 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     int minPrice = -1;
     paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
 
-    int payment_method_id = cfg->getPaymentOptions(paymentOptionIndex).pop_payment_method_id;
-
-    if (payment_method_id == PaymentMethod::Degressive) {
-        // Degressive: new for Fuchs Technik (500), ValserAlm (Fane):
-        // the minimal price has to be calculated, in cannot be hard coded into
-        // the tariff file.
-        // The working times have a reference into the payment rates. Two special
-        // entries (with the numbers 1000/1001) point to the respective prices.
-        switch(permitType) {
-            default: {
-                // find the correct work time range
-                int weekDay = start.date().dayOfWeek();
-                std::optional<QVector<ATBWeekDaysWorktime>> const &wd = cfg->getAllWeekDayWorkTimes();
-                if (wd.has_value()) {
-                    QVector<ATBWeekDaysWorktime> const &vec = wd.value();
-                    for (int i = 0; i < vec.size(); ++i) {
-                        ATBWeekDaysWorktime const &wt = vec[i];
-                        if (wt.pwd_period_day_in_week_id == weekDay) {
-                            if (start.time() >= QTime::fromString(QString::fromStdString(wt.pwd_time_from), Qt::ISODate)
-                             && start.time() <= QTime::fromString(QString::fromStdString(wt.pwd_time_to), Qt::ISODate)) {
-                                // found worktime range
-                                int pop_id = wt.pwd_pop_id; // 1000 or 1001
-                                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                    i = vec.size(); // to leave outer loop
-                                    minPrice = itr->second.pra_price; // this is now the minimal price
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    } else {
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
         minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
@@ -147,7 +110,6 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     default:
         minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
     }
-    }
 
     return minPrice;
 }
@@ -249,8 +211,8 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
 
             if (product.size() > 0) {
                 if (productStart && productEnd) {
-                    int pop_min_time = get_minimal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
-                    int pop_max_time = get_maximal_parkingtime(cfg, PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET); // in minutes
+                    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);
@@ -353,20 +315,10 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
         break;
     case PERMIT_TYPE::DAY_TICKET_PKW:
         break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
-        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
-        if (po.has_value()) {
-            ATBPaymentOption option = po.value();
-            return option.pop_max_price;
-        }
-    } break;
-    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-        std::optional<ATBPaymentOption> po = cfg->getPaymentOptionForKey(permitType);
-        if (po.has_value()) {
-            ATBPaymentOption option = po.value();
-            return option.pop_max_price;
-        }
-    } break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+        break;
     case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
         break;
     default: ;
@@ -465,23 +417,17 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
                                                 int UpDown, PermitType const &permitType)
 {
 
-    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
-    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+    qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
-    // FIXME
-    //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
-    //if (!paymentOption.has_value()) {
-    //    qCritical() << "   compute_next_timestep() ERROR";
-    //    return currentTimeMinutes;
-    //}
+    std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
+    if (!paymentOption.has_value()) {
+        return currentTimeMinutes;
+    }
 
     int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    int const &pop_plus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_plus_steps;
-    int const &pop_minus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_minus_steps;
+    qCritical() << "   compute_next_timestep()   payment option index: " << paymentOptionIndex;
 
-    qCritical() << __LINE__ << "compute_next_timestep()   payment option index: " << paymentOptionIndex;
-    qCritical() << __LINE__ << "compute_next_timestep()             plus steps: " << pop_plus_steps;
-    qCritical() << __LINE__ << "compute_next_timestep()            minus steps: " << pop_minus_steps;
 
     Configuration const *cfg = tariff;
 
@@ -509,106 +455,61 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     // without given YearPeriod, SpecialDays and SpecialDaysWorktime
     if ((paymentMethodId == PaymentMethod::Steps) ||
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
-        (paymentMethodId == PaymentMethod::Progressive) ||
-        // degressive tariff: e.g. Fuchs Technik (500)
-        (paymentMethodId == PaymentMethod::Degressive))
+        (paymentMethodId == PaymentMethod::Progressive))
     {
-        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
+        // int paymentOptionIndex = 1;
 
+        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
         int const size = stepList.size();
         if (size == 0) {
             qCritical() << "compute_next_timestep() *ERROR empty step-list*";
             return  currentTimeMinutes;
         }
 
-        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
-        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
-        qCritical() << __LINE__ << "compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+        qCritical() << "   compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << "   compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
 
         // consider time shift: the step-list might have been computed at a
         // slightly different time point
-
-        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
-        if (currentStepIndex == -1) {
-            unsigned minimalDistance = ~0;
-            int j = -1;
-            for (int i = 0; i < stepList.size(); ++i) {
-                unsigned distance = std::abs(stepList[i] - currentTimeMinutes);
-                if (distance < minimalDistance) {
-                    minimalDistance = distance;
-                    j = i;
-                }
-            }
-            // max. tolerance set to 3 minutes
-            unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
-            if (j != -1) {
-                stepList[j] = currentTimeMinutes;
-            }
-        }
-
-#if 0
         int maxStep = -1;
         if (size >= 2) {
             maxStep = stepList[1] - stepList[0];
         }
-        // max. tolerance set to 5 minutes
-        int const tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
         for (int i=0; i < stepList.size(); ++i) {
             if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
                 qCritical().noquote()
-                    << __LINE__ << QString("compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
                                     .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
                 stepList[i] = currentTimeMinutes;
-                qCritical() << __LINE__ << "compute_next_timestep()        NEW timeSteps:" << stepList;
+                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
             }
         }
 
         int currentStepIndex = stepList.indexOf(currentTimeMinutes);
-#endif
-
-        currentStepIndex = stepList.indexOf(currentTimeMinutes);
-        qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
 
         if (currentStepIndex == -1) {
-            qCritical() << __LINE__ << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
             return  currentTimeMinutes;
         }
 
         if (UpDown == 1) { // UP
             if (stepList[currentStepIndex] == stepList.last()) {
-                qCritical() << __LINE__ << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                 return  currentTimeMinutes;
             }
             else {
-                int const rest = currentStepIndex % pop_plus_steps;
-
-                if (rest) {
-                    currentStepIndex -= rest;
-                }
-
-                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
-
-                int const nextStepIndex = currentStepIndex + pop_plus_steps;
-
-                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
-                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
-                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
-                    return stepList[nextStepIndex];
-                }
+                return stepList[currentStepIndex + 1];
             }
         }
         if (UpDown == 0) { // DOWN
             if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << __LINE__ << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                 return  currentTimeMinutes;
             }
             else {
-                int const nextStepIndex = currentStepIndex - pop_minus_steps;
-                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
-                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
-                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
-                    return stepList[nextStepIndex];
-                }
+                return stepList[currentStepIndex - 1];
             }
         }
     } else
@@ -652,7 +553,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         time_t end_parking_time,    // netto time in minutes
         struct price_t *price,
         PermitType permitType) {    // permitType maps to product
-
     CalcState calcState;
 
     int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
@@ -711,7 +611,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
-        QDateTime &start_parking_time_,
+        QDateTime &start_parking_time,
         int netto_parking_time,
         QDateTime &end_parking_time,
         struct price_t *price,
@@ -720,18 +620,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 {
     CalcState calcState;
 
-    QDateTime start_parking_time(start_parking_time_);
-
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-
-    QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex);
-    //Q_UNUSED(tlist);
+    int paymentOptionIndex = tariff->getPaymentOptionIndex(start_parking_time);
 
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
 
-    // netto_parking_time = minMin;
-
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
                 << "          paymentOptionIndex: " << paymentOptionIndex << endl
@@ -739,9 +632,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 << "          netto_parking_time: " << netto_parking_time << endl
                 << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                 << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin << endl
-                << "                     prepaid: " << prepaid << endl
-                << "                  permitType: " << permitType.toString();
+                << "                      maxMin: " << maxMin;
+
 
     if (netto_parking_time < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
@@ -749,86 +641,52 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARKING_TIME);
     }
-
     if (netto_parking_time > maxMin) {
         calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
         return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
     }
-
     if (netto_parking_time < minMin) {
         calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
-
     if (netto_parking_time == 0) {
         return calcState.set(CalcState::State::SUCCESS);
     }
 
     double cost = -1;
     if (start_parking_time.isValid()) {
+
+        // qCritical() << __func__ << __LINE__;
+
         if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
             tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Degressive) {
+        // qCritical() << __func__ << __LINE__;
             // hier muesste man unterscheiden: uebertrag oder nicht?
             calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                    netto_parking_time, paymentOptionIndex);
             if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
                  qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                              << calcState.toString();
+        // qCritical() << __func__ << __LINE__;
                 return calcState;
             }
+        // qCritical() << __func__ << __LINE__;
 
+            QList<int> lll = Calculator::GetInstance().GetTimeSteps(tariff);
 
-            // compute cost (price)
+            // netto_parking_time = compute_next_timestep(tariff, netto_parking_time, 1, permitType);
+
+            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
+
+        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
+            end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
 
-            int weekDay = start_parking_time.date().dayOfWeek();
-            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-
-            std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
-            if (yperiod.has_value()) {
-                ATBPeriodYear const &period = yperiod.value();
-                pop_carry_over_option_id = period.pye_id;
-                qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
-            }
-
-            QTime const carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
-
-            qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
-
-            // handle prepaid option
-            QDateTime effectiveStartTime(start_parking_time);
-            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
-            if (prepaidOption.has_value()) {
-                ATBPrepaid const &p = prepaidOption.value();
-                if (p.never) {
-                    qCritical() << __func__ << __LINE__ << "prepaid: no";
-                } else {
-                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
-                        effectiveStartTime.setTime(p.static_end);
-                    } else
-                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
-                        effectiveStartTime.setTime(p.static_start);
-                        effectiveStartTime == effectiveStartTime.addSecs(carryOverDuration * 60);
-                    }
-                }
-            }
-
-            // handle carry over
-            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-            if (netto_parking_time >= minutesUntilCarryOver) {
-                int const rest = netto_parking_time - minutesUntilCarryOver;
-                QDateTime s(effectiveStartTime);
-                s = s.addSecs(minutesUntilCarryOver * 60);
-                s = s.addSecs(carryOverDuration * 60);
-                end_parking_time = s.addSecs(rest * 60);
-            } else {
-                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
-            }
+            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+            //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
 
         } else {
+        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
                         tariff->getPaymentOptions().pop_payment_method_id,
@@ -845,8 +703,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
 
         // DEBUG
-        //qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
-        //qCritical() << __LINE__ << "  -> calculated cost (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;
@@ -856,12 +714,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::INVALID_START_DATE);
     }
 
-    if (end_parking_time.time().hour() == 0 && end_parking_time.time().minute() == 0) {
-        end_parking_time = end_parking_time.addDays(-1);
-        end_parking_time.setTime(QTime(23, 59, 0));
-    }
-    qCritical() << __func__ << __LINE__ << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
-
     return calcState.set(CalcState::State::SUCCESS);
 }
 
@@ -879,25 +731,15 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     if (start.isValid()) {
         QString cs = start.toString(Qt::ISODate);
 
-        bool prepaid = true;
-        int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-        int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-        if (prepaid_option_id == 2) { // see tariff03.json for 502: 2 means no prepaid-option
-            prepaid = false;
-        }
-        bool const nextDay = false;
-
         // DEBUG
-        qCritical() << "compute_duration_for_parking_ticket(1): ";
-        qCritical() << " payment option index: " << paymentOptionIndex;
-        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "compute_duration_for_parking_ticket(): ";
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
         duration = Calculator::GetInstance().GetDurationFromCost(tariff,
-                                                  tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
-                                                  price, permitType, nextDay, prepaid).c_str();
+                                                  price, false, true).c_str();
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
@@ -918,30 +760,13 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         PermitType permitType)
 {
     CalcState calcState;
-
-    bool prepaid = true;
-    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
-    if (prepaid_option_id == 2) {
-        prepaid = false;
-    }
-    bool const nextDay = false;
-
-    // DEBUG
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "compute_duration_for_parking_ticket(2): ";
-        qCritical() << " payment option index: " << paymentOptionIndex;
-        qCritical() << "              prepaid: " << prepaid;
-        qCritical() << "                price: " << price;
-    }
-
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = Calculator::GetInstance().GetDurationFromCost(
                     tariff,
                     tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
-                    price, permitType, nextDay, prepaid).c_str();
+                    price, false, true).c_str();
 
         if (endTime == CalcState::SUCCESS) {
             calcState.setDesc(QString("SUCCESS"));

library/src/calculator_functions.cpp

@@ -131,113 +131,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     // Get input date
     QDateTime inputDate = QDateTime::fromString(startDatetimePassed,Qt::ISODate);
-    inputDate.setTime(QTime(inputDate.time().hour(), inputDate.time().minute(), 0));
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
 
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
-        qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
-        qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
-        qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
-        qCritical() << DBG_HEADER << "   cost (price):" << cost;
-    }
+    //qCritical() << DBG_HEADER << "          start" << inputDate.toString(Qt::ISODate);
+    //qCritical() << DBG_HEADER << "paymentMethodId" << static_cast<int>(paymentMethodId);
 
-    QList<int> tsteps = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, inputDate);
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << DBG_HEADER << "     time steps:" << tsteps;
-    } else {
-        Q_UNUSED(tsteps);
-    }
+    Calculator::GetInstance().GetTimeSteps(cfg, 0, inputDate);
 
-    if (paymentMethodId == PaymentMethod::Degressive) {
-
-        if (static_cast<int>(cost) < cfg->getPaymentOptions(paymentOptionIndex).pop_min_price) {
-            // minimal price is set by GetTimeSteps()
-            qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
-            qCritical() << DBG_HEADER << "configured minimal price:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
-            return CalcState::BELOW_MIN_PARKING_PRICE.toStdString();
-        }
-
-        if (prepaid == false) {
-            int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-            int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
-            int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
-
-            // qCritical() << DBG_HEADER << "   pop id:" << pop_id;
-
-            int price = 0;
-            int new_price = 0;
-            int durationInMinutes = 0;
-            uint32_t duration_previous = 0;
-            // bool found = false;
-
-            for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                int const pra_price = itr->second.pra_price;
-                int const durationId = itr->second.pra_payment_unit_id;
-                if (pop_accumulate_prices) {
-                    price += pra_price;
-                } else {
-                    price = pra_price;
-                }
-
-                //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
-                //qCritical() << DBG_HEADER << "  duration id" << durationId;
-
-                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_prices) {
-                        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
-
-                        new_price += pra_price;
-                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")  old price" << price << ", new_price:" << new_price;
-                        if (new_price <= cost) {
-                            duration_previous = durationUnit;
-                            if (pop_accumulate_durations) {
-                                durationInMinutes += durationUnit;
-                            }
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  old price" << price << ", new_price:" << new_price;
-                        } else {
-                            //found = true;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
-                            QDateTime d(inputDate.addSecs(duration_previous * 60));
-
-                            qCritical() << DBG_HEADER << "                    provided price (cost):" << cost;
-                            qCritical() << DBG_HEADER << "        computed time for price (minutes):" << duration_previous;
-                            qCritical() << DBG_HEADER << "configured minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
-
-                            if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
-                                return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
-                            }
-                            return d.toString(Qt::ISODate).toStdString();
-                        }
-                    }
-
-                    if ((double)price == cost) {
-                        QDateTime d(inputDate.addSecs(durationInMinutes * 60));
-
-                        QString const durationStr(d.toString(Qt::ISODate));
-
-                        qCritical() << DBG_HEADER << "     duration in minutes:" << durationInMinutes;
-                        qCritical() << DBG_HEADER << "   provided price (cost):" << cost;
-                        qCritical() << DBG_HEADER << "      duration for price:" << durationStr;
-
-                        return durationStr.toStdString();
-                    }
-                }
-            }
-
-        } else {
-            qCritical() << DBG_HEADER << "   TODO";
-        }
-    } else
     if (paymentMethodId == PaymentMethod::Steps) {
         if (tariffIs24_7(cfg)) {
             // use tariff with structure as for instance Schoenau, Koenigsee:
@@ -254,14 +154,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     }
                 }
 
+                // TODO: man braucht den richtigen Index
+                int paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
                 int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                 int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                 int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
 
                 if (cost > pop_max_price) {
-                    cost = pop_max_price;
                     qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
-                    //return CalcState::OVERPAID.toStdString();
+                    return CalcState::OVERPAID.toStdString();
                 }
 
                 if (cost < pop_min_price) {
@@ -279,7 +180,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     // in this case, adapt inputDate accordingly.
 
 
-#define DEBUG_GET_DURATION_FROM_COST 0
+// #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
@@ -293,9 +194,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                         QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                         QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
 
-                        //qCritical() << DBG_HEADER << "from" << pwd_time_from.toString(Qt::ISODate);
-                        //qCritical() << DBG_HEADER << "  to" << pwd_time_to.toString(Qt::ISODate);
-
                         if (inputDate.time() < pwd_time_from) {
                             inputDate.setTime(pwd_time_from);
                             useWeekDaysWorkTimeOfOtherDay = false;
@@ -332,19 +230,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                             }
                         }
                     }
-                } else {
-                    qCritical() << "(" << __func__ << ":" << __LINE__ << "no prepaid";
                 }
 
 #if DEBUG_GET_DURATION_FROM_COST==1
                 qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
+
                 // inputDate is now located in a valid operational-working-range
                 // find this working-time-range
                 int pwd_period_day_in_week_id = inputDate.date().dayOfWeek();
-                //qCritical() << __func__ << __LINE__ << pwd_period_day_in_week_id;
-                //qCritical() << __func__ << __LINE__ << cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id);
-
                 if (cfg->WeekDaysWorktime.count(pwd_period_day_in_week_id) == 0) {
                     qCritical() << DBG_HEADER
                                 << "ERROR" << inputDate.toString(Qt::ISODate)
@@ -358,9 +252,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(pwd_period_day_in_week_id); iter != rEnd; ++iter) {
                     QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                     QTime pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
-                //qCritical() << __func__ << pwd_time_from.toString(Qt::ISODate);
-                //qCritical() << __func__ << pwd_time_to.toString(Qt::ISODate);
-                //qCritical() << __func__ << inputDate.toString(Qt::ISODate);
                     if (pwd_time_from <= inputDate.time() && inputDate.time() <= pwd_time_to) {
                         current_working_time_from = pwd_time_from;
                         current_working_time_to = pwd_time_to;
@@ -380,14 +271,11 @@ 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 new_price = 0;
                 int durationInSecs = 0;
-                uint32_t duration_previous = 0;
-                bool found = false;
-
                 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;
@@ -404,30 +292,11 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                         // found now the duration in minutes
                         // check if we are still inside the working-time-range
                         ATBDuration duration = search->second;
-
-                        if (pop_accumulate_prices) {
-                            uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
-
-                            new_price += pra_price;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX    price:" << price;
-                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  YYYYYY    new_price:" << new_price;
-                            if (new_price <= cost) {
-                               duration_previous = durationUnit;
-                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") ZZZZZZ duration_previous" << duration_previous;
-                            } else {
-                                found = true;
-                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") WWWWWW duration_previous" << duration_previous;
-                                QString s = inputDate.toString(Qt::ISODate);
-                                QDateTime d(QDateTime::fromString(s, Qt::ISODate));
-                                d = d.addSecs(duration_previous * 60);
-                                //qCritical() << DBG_HEADER << "XXXXXXXXXXXXXXXXXXXXX" << d;
-                                return d.toString(Qt::ISODate).toStdString();
-                            }
-                        } else {
-                            durationInSecs = cfg->Duration.find(durationId)->second.pun_duration * 60;
-                            //qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
-                            //qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
-                        }
+                        //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;
@@ -474,30 +343,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                                     QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                                                     if (next_working_time_from < pwd_time_from) {
                                                         next_working_time_from = pwd_time_from;
-                                                        qCritical() << DBG_HEADER << "next working time from" << next_working_time_from.toString(Qt::ISODate);
                                                         break;
                                                     }
                                                 }
 
-                                                //qCritical() << DBG_HEADER << "DAYS" << days;
-                                                //qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
-                                                //qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
-
                                                 QDateTime upper = inputDate.addDays(days);
                                                 upper.setTime(next_working_time_from);
 
-                                                //qCritical() << DBG_HEADER << "UPPER" << upper.toString(Qt::ISODate);
-
                                                 QDateTime lower = inputDate;
                                                 lower.setTime(current_working_time_to);
 
-                                                //qCritical() << DBG_HEADER << "LOWER" << lower.toString(Qt::ISODate);
-
-                                                // inputDate = inputDate.addSecs(lower.secsTo(upper));
-
-                                                //qCritical() << DBG_HEADER << "NEW INPUT" << inputDate.toString(Qt::ISODate);
-
-                                                inputDate = inputDate.addSecs(durationInSecs);
+                                                inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
 #if DEBUG_GET_DURATION_FROM_COST==1
                                                 qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
 #endif
@@ -534,11 +390,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                             return s.toStdString();
                         } // if ((double)price == cost) {
-                        else {
-                            //qCritical() << DBG_HEADER;
-                        }
-                    } else {
-                        //qCritical() << __func__ << __LINE__;
                     }
                 }
 
@@ -992,7 +843,7 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
                                          int paymentOptionIndex) const {
     // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
     // special days, nonstop.
-    //qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+    qCritical() << __func__ << __LINE__;
 
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     if (paymentMethodId == PaymentMethod::Steps ||
@@ -1009,15 +860,12 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          int paymentOptionIndex) const {
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
-    // qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+    qCritical() << __func__ << __LINE__;
 
     if (paymentMethodId == PaymentMethod::Steps ||
         paymentMethodId == PaymentMethod::Degressive) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
-        QList<int> tlist = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, start);
-        qCritical() << DBG_HEADER << "       start" << start.toString(Qt::ISODate);
-        qCritical() << DBG_HEADER << "         end" << end.toString(Qt::ISODate);
-        qCritical() << DBG_HEADER << "timeStepList" << timeStepInMinutes << tlist;
+
         qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
 
         return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
@@ -1030,8 +878,8 @@ CalcState Calculator::isParkingAllowedForWeekDay(Configuration const *cfg,
                                                  int netto_parking_time,
                                                  int paymentOptionIndex) {
 
-    //qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
-    //            << "paymentOptionIndex" << paymentOptionIndex;
+    qCritical() << DBG_HEADER << "start" << start.toString(Qt::ISODate)
+                << "paymentOptionIndex" << paymentOptionIndex;
 
     // TODO: wieder entfernen
     return CalcState(CalcState::State::SUCCESS, "PARKING_ALLOWED", QTime(), QTime());
@@ -2318,23 +2166,24 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
     QDateTime start = s;
     start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
 
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start:" << start.toString(Qt::ISODate);
-    }
-
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
 
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                          pop_id:" << pop_id;
+    }
+
     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
     int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
 
     static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
+
     if (DBG_LEVEL >= DBG_DEBUG) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")              start parking time:" << start.toString(Qt::ISODate);
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")               payment option id:" << pop_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  payment method id:" << static_cast<int>(paymentMethodId);
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ")   time step config:" << pop_time_step_config;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")         time step configuration:" << pop_time_step_config;
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")               prepaid option id:" << pop_prepaid_option_id;
     }
 
@@ -2353,8 +2202,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
             // for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8
             // for the following days: 8 euros
 
-            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")         degressive:";
-            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ")       degressive";
             m_timeSteps[paymentOptionIndex].clear();
 
             // lookup pop_next_id in worktimes;
@@ -2362,93 +2210,121 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
             if (w.has_value()) {
                 QVector<ATBWeekDaysWorktime> const &vec = w.value();
 
-                //if (pop_carry_over == false) {
-                for (int i = 1; i <= vec.size(); ++i) {
-                    QTime const &from = QTime::fromString(QString::fromStdString(vec[i-1].pwd_time_from), Qt::ISODate);
-                    QString const &toStr = QString::fromStdString(vec[i-1].pwd_time_to);
+                if (pop_carry_over) {
+                    for (int i = 0; i < vec.size(); ++i) {
+                        QTime const &from = QTime::fromString(QString::fromStdString(vec[i].pwd_time_from), Qt::ISODate);
+                        QString const &toStr = QString::fromStdString(vec[i].pwd_time_to);
                         QTime const &to = QTime::fromString(toStr, Qt::ISODate);
 
-                    int weekDayId = vec[i-1].pwd_period_day_in_week_id;
+                        int weekDayId = vec[i].pwd_period_day_in_week_id;
                         if (start.date().dayOfWeek() == weekDayId) {
-                        if (DBG_LEVEL >= DBG_DEBUG) {
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+
+                            if (start.time() >= from) {
                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
-                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
+                                if (start.time() < to) {
                                     qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
-                        }
 
-                        if (start.time() >= from && start.time() < to) {
                                     int runtimeInMinutes = (start.time().secsTo(to) / 60);
-                            if (to.hour() == 23 && to.minute() == 59) {
-                                runtimeInMinutes += 1;
-                            }
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
                                     qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
                                     qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
-                            }
-                            // m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+
+                                    m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
 
                                     cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
 
-                            int pop_id = vec[i-1].pwd_pop_id;
-                            // int pwd_id = vec[i-1].pwd_id;
-                            // int pwd_next_id = vec[i-1].pwd_next_id;
-
-                            if (DBG_LEVEL >= DBG_DEBUG) {
-                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
-                            }
-
-                            int price = -1;
-                            int durationId = -1;
+                                    int pop_id = vec[i].pwd_pop_id;
+                                    int pwd_id = vec[i].pwd_id;
+                                    int pop_next_id = vec[i].pwd_next_id;
 
                                     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                durationId = itr->second.pra_payment_unit_id;
+                                        int const durationId = itr->second.pra_payment_unit_id;
 
-                                price = itr->second.pra_price;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                                        // int const price = itr->second.pra_price;
 
                                         auto search = cfg->Duration.find(durationId);
                                         if (search != cfg->Duration.end()) {
                                             ATBDuration duration = search->second;
                                             duration.pun_duration = runtimeInMinutes;
                                             search->second = duration;
-                                    break;
                                         }
                                     }
 
-                            if (price >= 0 && durationId >= 0) {
-                                if (DBG_LEVEL >= DBG_DEBUG) {
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
-                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       price" << price;
+                                    if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
+                                        // on the same day
+                                        start.setTime(to);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                    } else {
+                                        // on the next day
+                                        start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
+                                        start = start.addDays(1);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
                                     }
 
-                                pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-                                for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
-                                    if (durationId == itr->second.pra_payment_unit_id) {
-                                        itr->second.pra_price = price;
-                                        cfg->getPaymentOptions(paymentOptionIndex).pop_min_price = price;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") park min price" << price;
-                                        break;
-                                    }
-                                }
-                            }
 
-                            break;
-                        } // if (start.time() >= from && start.time() < to) {
-                    } // if (start.date().dayOfWeek() == weekDayId) {
-                } // for (int i = 1; i <= vec.size(); ++i) {
+                                    while ((s.secsTo(start) / 60) < 5000) {
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+
+                                        pop_id = vec[i].pwd_pop_id;
+                                        pwd_id = vec[i].pwd_id;
+                                        pop_next_id = vec[i].pwd_next_id;
+
+                                        runtimeInMinutes += (start.time().secsTo(to) / 60);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pwd_id " << pwd_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id " << pop_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_next_id " << pop_next_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep" << nextTimeStep;
+
+                                        // ATBPaymentOption o = cfg->getPaymentOptionForId();
 
-                m_timeSteps[paymentOptionIndex].clear();
-                int runtimeInMinutes = 0;
-                for (Configuration::TariffDurationType::const_iterator it = cfg->Duration.cbegin();
-                     it != cfg->Duration.cend();
-                     ++it) {
-                    runtimeInMinutes +=  it->second.pun_duration;
                                         m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX pop" << pop_id;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX index" << paymentOptionIndex;
+
+#if 0
+                                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                            int const durationId = itr->second.pra_payment_unit_id;
+
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << durationId;
+                                            // int const price = itr->second.pra_price;
+
+                                            auto search = cfg->Duration.find(durationId);
+                                            if (search != cfg->Duration.end()) {
+                                                ATBDuration duration = search->second;
+                                                duration.pun_duration = runtimeInMinutes;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << runtimeInMinutes;
+                                                search->second = duration;
+                                            }
+                                        }
+#endif
+
+                                        if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
+                                            // on the same day
+                                            start.setTime(to);
+                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                        } else {
+                                            // on the next day
+                                            start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
+                                            start = start.addDays(1);
+
+                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                        }
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") until" << s.secsTo(start) / 60;
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
-                //} // if (pop_carry_over == false) {
-            } // if (w.has_value()) {
         } else {
             uint16_t timeStepCompensation = 0;
 
@@ -2552,14 +2428,14 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")             interpolation end:" << interpolationEnd.toString(Qt::ISODate);
                             }
                         } else {
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                         }
 
                         // int const start_time = start.time().hour() * 60 + start.time().minute();
                         QDateTime nextTimeStep = start;
                         int runtimeInMinutes = 0;
 
-                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
 
                         int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
 
@@ -2575,12 +2451,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
 
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
 
                         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                             int const durationId = itr->second.pra_payment_unit_id;
 
-                            // qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
                             // int const price = itr->second.pra_price;
 
                             auto search = cfg->Duration.find(durationId);
@@ -2597,15 +2473,14 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     break;
                                 }
 
-                                //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
 
                                 std::optional<ATBInterpolation> ipolCheck = cfg->getInterpolationType(duration.pun_interpolation_id);
                                 if (ipolCheck) {
                                     ATBInterpolation interpolation = ipolCheck.value();
 
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::DYNAMIC_ABSTRACT_TIMEPOINT_AND_STATIC_PRICE) {
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")     payment option id:" << pop_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  pun_intnerpolation_id:" << duration.pun_interpolation_id;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
 
                                         interpolation.dynamic_start = start.time();
                                         interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
@@ -2659,11 +2534,10 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     } else
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
 
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
-                                        //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;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
 
                                         if (paymentOptionIndex == 1) { // testing TODO: muss in die payment options hinein
                                             if (runtimeInMinutes == 0) {
@@ -2672,8 +2546,6 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                                     duration.pun_duration = runtimeInMinutes;
                                                     m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                                     search->second = duration;
-                                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
-                                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")       pop_min_time" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
                                                     continue;
                                                 }
                                             }
@@ -2682,8 +2554,6 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         if (runtimeInMinutes == 0) {
                                             if (start.time() < carryOverStart) {
                                                 runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
-                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       start:" << start.toString(Qt::ISODate);
-                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")       carryOverStart:" << carryOverStart.toString(Qt::ISODate);
                                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
                                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
                                                 duration.pun_duration = runtimeInMinutes;
@@ -2693,7 +2563,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                             }
                                             continue;
                                         }
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+
 
                                         QDateTime s = start.addSecs(runtimeInMinutes * 60);
                                         int const minutes = s.time().secsTo(carryOverStart) / 60;
@@ -2717,9 +2588,6 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         runtimeInMinutes += duration.pun_duration;
                                         nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")       carryOverStart:" << carryOverStart.toString(Qt::ISODate);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
-
                                         // TOOO: truncate-flag == false
                                         if (nextTimeStep.time() > carryOverStart) {
                                             int const backTime = carryOverStart.secsTo(nextTimeStep.time());
@@ -2727,29 +2595,25 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                             nextTimeStep.setTime(carryOverStart);
                                             nextTimeStep = nextTimeStep.addSecs((backTime + carryOverDuration) * 60);
                                             runtimeInMinutes += (backTime + carryOverDuration);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  runTimeInMinutes:" << runtimeInMinutes;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
                                         } else
                                         if (nextTimeStep.time() < carryOverStart) {
                                             int const forwardTime = nextTimeStep.time().secsTo(carryOverStart) / 60;
                                             runtimeInMinutes += forwardTime;
                                             nextTimeStep.setTime(carryOverStart);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  runTimeInMinutes:" << runtimeInMinutes;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  nextTimeStep.time():" << nextTimeStep.time().toString(Qt::ISODate);
                                         }
 
-                                        if (DBG_LEVEL >= DBG_DEBUG) {
+                                        //if (DBG_LEVEL >= DBG_DEBUG) {
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
-                                        }
+                                        //}
 
                                         duration.pun_duration = runtimeInMinutes;
-                                        // duration.pun_duration = runtimeInMinutes - carryOverDuration;
                                         m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                         search->second = duration;
                                     } else {
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
                                         cfg->Duration.erase(search);
                                     }
                                 }
@@ -2783,7 +2647,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
         }
     }
 
-    // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
 
     if (DBG_LEVEL >= DBG_DEBUG) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")                   NEW timeSteps:" << m_timeSteps;
@@ -2810,19 +2674,12 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
     // paymentOptionIndex = 1;
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
-    int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
     int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
 
     uint32_t price = 0;
-    int pun_duration = 0;
 
-    if (DBG_LEVEL >= DBG_DEBUG) {
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
     qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
     qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_accumulate_prices" << pop_accumulate_prices;
-        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_accumulate_durations" << pop_accumulate_durations;
-    }
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -2831,29 +2688,27 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
 
         Q_ASSERT(pun_id == payment_unit_id);
 
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
 
-        if (pop_accumulate_durations) {
-            pun_duration += cfg->Duration.find(payment_unit_id)->second.pun_duration;
-        } else {
-            pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
-        }
 
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(1)->second.pun_duration;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(2)->second.pun_duration;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(3)->second.pun_duration;
+
+        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
         if (pop_accumulate_prices) {
             price += itr->second.pra_price;
         } else {
             price = (uint32_t)(itr->second.pra_price);
         }
 
-        if (DBG_LEVEL >= DBG_DEBUG) {
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")";
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
         qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
-        }
 
         if (timeStep == pun_duration) {
             qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
@@ -2866,13 +2721,8 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
 
 uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
     int const pop_id = cfg->getPaymentOptions().pop_id;
-    int const pop_accumulate_prices = cfg->getPaymentOptions().pop_accumulate_prices;
 
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") accumulate prices" << pop_accumulate_prices;
-
-    int new_price = 0;
     uint32_t duration = 0;
-    uint32_t duration_previous = 0;
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -2888,22 +2738,8 @@ uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
         if (pra_price < price) {
             duration = durationUnit;
         }
-
-        if (pop_accumulate_prices) {
-            new_price += pra_price;
-            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pra_price:" << pra_price;
-            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      new_price:" << new_price;
-            if (new_price <= price) {
-               duration_previous = durationUnit;
-               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
-            } else {
-               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
-               return duration_previous;
-            }
-        }
     }
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration" << duration << "for price" << price;
     return duration;
 }
 

library/src/configuration.cpp

@@ -598,14 +598,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             if (k->value.IsInt()) {
                                 this->currentPaymentOptions.last().pop_use_only_for_duration = k->value.GetInt();
                             }
-                        } else if (strcmp(inner_obj_name, "pop_plus_steps") == 0) {
-                            if (k->value.IsInt()) {
-                                this->currentPaymentOptions.last().pop_plus_steps = k->value.GetInt();
-                            }
-                        } else if (strcmp(inner_obj_name, "pop_minus_steps") == 0) {
-                            if (k->value.IsInt()) {
-                                this->currentPaymentOptions.last().pop_minus_steps = k->value.GetInt();
-                            }
                         } else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
                             this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
@@ -890,7 +882,7 @@ std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &sta
                 ATBInterpolation interpolation = ipolCheck.value();
                 switch (duration.pun_interpolation_id) {
                     case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
                     break;
                     case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
@@ -995,9 +987,6 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
             for (int opt=0; opt < numOptions; ++opt) {
                 uint64_t const pop_id = getPaymentOptions(opt).pop_id;
                 if (pop_id == (uint64_t)sd.ped_payment_option_id) {
-
-                    qCritical() << __func__ << __LINE__ << opt;
-
                     return opt;
                 }
             }
@@ -1007,9 +996,6 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
     for (int opt=0; opt < numOptions; ++opt) {
         uint64_t const pop_business_hours = getPaymentOptions(opt).pop_business_hours;
 
-        if (pop_business_hours == 0) { // 0 == 24/7
-            return opt;
-        }
 
         uint64_t p = 0;
         int const dayOfWeek = dt.date().dayOfWeek();
@@ -1040,9 +1026,6 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
         }
 
         if ((pop_business_hours & p) == p) {
-
-            qCritical() << __func__ << __LINE__ << opt;
-
             return opt;
         }
     }
@@ -1165,7 +1148,6 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
     if (paymentOptions) {
         QVector<ATBPaymentOption> const vec = paymentOptions.value();
         PermitType const p(permitType);
-
         for (int i = 0; i < vec.size(); ++i) {
             if (vec[i].pop_product_name == p.toString()) {
                return i;
@@ -1179,11 +1161,8 @@ int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
 int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
     std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
     if (paymentOptions) {
-
-
         QVector<ATBPaymentOption> const vec = paymentOptions.value();
         PermitType const p(permitType);
-
         for (int i = 0; i < vec.size(); ++i) {
             if (vec[i].pop_product_name == p.toString()) {
                return i;
@@ -1331,14 +1310,11 @@ Configuration::getPaymentOptionsForAllKeys() const {
     return value;
 }
 
-// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(PERMIT_TYPE permitType) const {
     return getPaymentOptionForKey(static_cast<int>(permitType));
 }
 
-
-// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(int permitType) const {
     std::optional<ATBPaymentOption> value;
@@ -1355,7 +1331,6 @@ Configuration::getPaymentOptionForKey(int permitType) const {
     return value;
 }
 
-// TODO: umbenennen: getPaymentOptionForPermitType
 std::optional<ATBPaymentOption>
 Configuration::getPaymentOptionForKey(QString const &permitTypeStr) const {
     PERMIT_TYPE permitType = PermitType::toPermitType(permitTypeStr);

library/src/utilities.cpp

@@ -215,43 +215,6 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
     return true;
 }
 
-std::optional<ATBPeriodYear>
-Utilities::GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime) {
-
-    ATBPeriodYear period;
-    std::optional<ATBPeriodYear> value;
-
-    for (multimap<int, ATBPeriodYear>::const_iterator it = cfg->YearPeriod.cbegin();
-         it != cfg->YearPeriod.cend();
-         ++it) {
-        QDate const s(currentDateTime.date().year(), it->second.pye_start_month, it->second.pye_start_day);
-        QDate const e(currentDateTime.date().year(), it->second.pye_end_month, it->second.pye_end_day);
-
-        QDateTime start(currentDateTime);
-        QDateTime end(currentDateTime);
-
-        start.setDate(s);
-        end.setDate(e);
-
-        if (start.date().dayOfYear() < end.date().dayOfYear()) {
-            // start and end in the same year
-            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() &&
-                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
-                value = value.value_or(it->second);
-                break;
-            }
-        } else {
-            if (currentDateTime.date().dayOfYear() >= start.date().dayOfYear() ||
-                currentDateTime.date().dayOfYear() <= end.date().dayOfYear()) {
-                value = value.value_or(it->second);
-                break;
-            }
-        }
-    }
-
-    return value;
-}
-
 /// <inheritdoc/>
 bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
 {

main/main.cpp

@@ -354,7 +354,7 @@ int main() {
         QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
         qCritical() << "TimeSteps" << timeSteps;
 
-        // return 0;
+        return 0;
 
         CalcState cs;
         double cost;
@@ -363,7 +363,7 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 7, 29 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime s(QDate(2024, 5, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
             QDateTime end;
 
             switch (day) {
@@ -401,11 +401,9 @@ int main() {
                                                         bool prepaid = true);
             */
 
-            //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 540; minutes <= 540; ++minutes) {
-                // QDateTime start = s.addSecs(minutes * 60);
-                QDateTime start(QDateTime::currentDateTime());
-                QDateTime effectiveStart(QDateTime::currentDateTime());
+            for (int minutes = 0; minutes < 1440; ++minutes) {
+                QDateTime start = s.addSecs(minutes * 60);
+                QDateTime effectiveStart = start;
 
                 if (start.time() < QTime(8, 0, 0)) {
                     effectiveStart.setTime(QTime(8, 0, 0));
@@ -417,18 +415,55 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
-                for (int i = 30; i <= 30; i += 10) {
+                for (int i = 0; i <= 2100; i += 10) {
                 //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
-                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                                    << "> end" << end.toString(Qt::ISODate);
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                        durationInMinutes = pop_min_time;
+                        if (i > 0) {
+                            durationInMinutes += (i/10) * 4;
+                        }
+                        offsetInMinutes = 0;
+
+                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
+                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
+                                offsetInMinutes = 600; // 22:00 -> 8:00
+                            }
+                        }
+
+                        if (i == 0) {
+                            i += 20;
+                        }
+
+                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
+
+                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
+                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
+                                qCritical() << "| cost ............................." << cost;
+                                qCritical() << "| durationInMinutes ................" << durationInMinutes
+                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
+                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
+                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
+                            }
+
+                            continue;
+                        }
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
+                    } else {
+                        qCritical() << cs.toString();
                     }
+                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
+                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
+                    qCritical() << __LINE__ << "cost ............................." << cost;
+                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
+                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
+                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
+                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
+                    exit(-1);
                 }
             }
         }
@@ -517,7 +552,7 @@ int main() {
             */
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 480; minutes <= 480; minutes += 1) {
+            for (int minutes = 0; minutes < 1440; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
                 // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -534,32 +569,66 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
-/*
                 for (int i = 10; i <= 400; i += 10) {
+                //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+
+
                         qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
                                     << "> end" << end.toString(Qt::ISODate);
+
+                        durationInMinutes = pop_min_time;
+                        if (i > 0) {
+                            durationInMinutes += (i/10) * 4;
+                        }
+                        offsetInMinutes = 0;
+
+                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
+                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
+                                offsetInMinutes = 780; // 19:00 -> 8:00
+                            }
+                        }
+
+                        if (i == 0) {
+                            i += 20;
+                        }
+
+#if 0
+                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
+
+                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
+                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
+                                qCritical() << "| cost ............................." << cost;
+                                qCritical() << "| durationInMinutes ................" << durationInMinutes
+                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
+                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
+                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
+                            }
+
+                            continue;
+                        }
+#endif
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
+                    } else {
+//                        qCritical() << cs.toString();
                     }
-                }
-*/
-                int netto_parking_time = 60;
-                struct price_t price;
 
-                qCritical() << "start" << start.toString(Qt::ISODate);
+#if 0
+                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
+                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
+                    qCritical() << __LINE__ << "cost ............................." << cost;
+                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
+                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
+                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
+                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
+                    exit(-1);
+#endif
 
-                QDateTime const s = start;
-
-                if ((cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
-                        qCritical() << "start" << s.toString(Qt::ISODate)
-                                    << "netto_parking_time" << netto_parking_time
-                                    << "< price" << price.netto
-                                    << "> end" << end.toString(Qt::ISODate);
                 }
             }
         }
@@ -575,8 +644,8 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    input.open("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
-    //input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+    //input.open("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
+    input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
@@ -588,13 +657,10 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        //PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
-        PermitType permitType(PERMIT_TYPE::DAY_TICKET_PKW);
-
-        pop_min_time = get_minimal_parkingtime(&cfg, permitType);
-        pop_max_time = get_maximal_parkingtime(&cfg, permitType);
-        pop_min_price = get_minimal_parkingprice(&cfg, permitType);
-        pop_max_price = get_maximal_parkingprice(&cfg, permitType);
+        pop_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;
@@ -652,10 +718,10 @@ int main() {
             }
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 480; minutes <= 480; minutes += 1) {
+            for (int minutes = 1020; minutes <= 1020; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
-                // qCritical() << "start" << start.toString(Qt::ISODate);
+                qCritical() << "start" << start.toString(Qt::ISODate);
 
                 QDateTime effectiveStart = start;
 
@@ -671,8 +737,9 @@ int main() {
                     effectiveStart.setTime(QTime(7, 0, 0)); // next day
                 }
 
-#if 0
-                for (int i = 700; i <= 1400; i += 700) {
+#if 1
+                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
+                for (int i = 200; i <= 200; i += 10) {
                     cost = i;
 
                     if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
@@ -684,20 +751,38 @@ int main() {
 //                        qCritical() << cs.toString();
                     }
 
-                    //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                    //            << "> end" << end.toString(Qt::ISODate);
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                << "> end" << end.toString(Qt::ISODate);
 
                 }
 #else
+                for (int i = 700; i <= 1400; i += 700) {
+                //for (int i = 2100; i <= 2100; i += 10) {
+                    cost = i;
+
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    }
+
+                    if (!cs) {
+                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
+                    } else {
+//                        qCritical() << cs.toString();
+                    }
+
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                << "> end" << end.toString(Qt::ISODate);
+                }
+#endif
+#if 0
 
                 start = QDateTime::currentDateTime();
-                //start.setTime(QTime(9, 57, 0));
+                start.setTime(QTime(9, 57, 0));
 
-                for (int netto_parking_time = 60; netto_parking_time <= 60; netto_parking_time += 60) {
+                for (int i = 66; i <= 66; i += 6) {
 
                     QDateTime end;
                     struct price_t price;
-                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
+                    cs = compute_price_for_parking_ticket(&cfg, start, i, end, &price);
 
                     qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
                                 << "price" << price.netto;
@@ -716,7 +801,7 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    int zone = 3;
+    int zone = 2;
 
     if (zone == 1) {
         input.open("/opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json");
@@ -738,33 +823,6 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-
-        if (zone == 1 || zone == 3) {
-/*
-            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
-
-            qCritical() << "        pop_min_time_pkw: " << pop_min_time;
-            qCritical() << "        pop_max_time_pkw: " << pop_max_time;
-            qCritical() << "       pop_min_price_pkw: " << pop_min_price;
-            qCritical() << "       pop_max_price_pkw: " << pop_max_price;
-
-            pop_min_time = get_minimal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
-            pop_max_time = get_maximal_parkingtime(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
-            pop_min_price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
-            pop_max_price = get_maximal_parkingprice(&cfg, PERMIT_TYPE::SHORT_TERM_PARKING_BUS);
-            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
-
-            qCritical() << "        pop_min_time_bus: " << pop_min_time;
-            qCritical() << "        pop_max_time_bus: " << pop_max_time;
-            qCritical() << "       pop_min_price_bus: " << pop_min_price;
-            qCritical() << "       pop_max_price_bus: " << pop_max_price;
-*/
-        }
-        if (zone == 2) {
         pop_min_time = get_minimal_parkingtime(&cfg);
         pop_max_time = get_maximal_parkingtime(&cfg);
         pop_min_price = get_minimal_parkingprice(&cfg);
@@ -775,48 +833,12 @@ int main() {
         qCritical() << "        pop_max_time: " << pop_max_time;
         qCritical() << "       pop_min_price: " << pop_min_price;
         qCritical() << "       pop_max_price: " << pop_max_price;
-        }
 
         //QDateTime start = QDateTime::currentDateTime();
         //start.setTime(QTime(12, 0, 0));
         //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, start);
         //qCritical() << "TimeSteps" << timeSteps;
         //return 0;
-        if (zone == 1) {
-            //int minParkingTime = get_minimal_parkingtime(&cfg);
-            QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
-            qCritical() << timeSteps;
-            int Down = 0;
-            int Up = 1;
-
-            QDateTime const start = QDateTime::currentDateTime();
-            int paymentOptionIndex = cfg.getPaymentOptionIndex(start);
-
-            if (paymentOptionIndex < 0) {
-                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
-                            << "< 0 for start" << start.toString(Qt::ISODate);
-                exit(-1);
-            }
-
-            QSet<uint32_t> const prices_pkw{600, 1200, 1800, 2400, 3000, 3600, 4200};
-            QSet<uint32_t> const prices_bus{3000, 6000, 9000, 12000, 15000, 18000, 21000};
-
-            QDateTime end;
-            CalcState calcState;
-            QDateTime s(QDateTime::currentDateTime());
-
-            s.setTime(QTime(12, 0, 0));
-
-            //calcState = compute_duration_for_parking_ticket(&cfg, s,
-            //                                    (double)1200, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
-            //qCritical() << end.toString(Qt::ISODate);
-            //qCritical() << calcState.toString();
-
-            calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
-            qCritical() << end.toString(Qt::ISODate);
-            qCritical() << calcState.toString();
-        }
 
         if (zone == 2) {
             //int minParkingTime = get_minimal_parkingtime(&cfg);
@@ -836,16 +858,6 @@ int main() {
 
             QSet<uint32_t> const prices{600, 1200, 1800, 2400, 3000, 3600, 4200};
 
-            QDateTime end;
-            CalcState calcState;
-            QDateTime s(QDateTime::currentDateTime());
-
-            s.setTime(QTime(18, 0, 0));
-            calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                (double)600, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
-            qCritical() << end.toString(Qt::ISODate);
-            qCritical() << calcState.toString();
-#if 0
 
             for (int i=0; i<timeSteps.size(); ++i) {
                 int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
@@ -870,66 +882,89 @@ int main() {
                             << "(price so far:" << price << ")";
 
             }
-#endif
         }
         if (zone == 3) {
-            //QDateTime xx(QDateTime::fromString("2024-07-31T00:00:00", Qt::ISODate));
-            //xx = xx.addSecs(-60); // -->  "2024-07-30T23:59:00"
-            //qCritical() << xx.toString(Qt::ISODate);
-
-            //QDateTime s(QDateTime::currentDateTime());
-            //s.setTime(QTime(12, 0, 0));
-            //QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg, 0, s);
-            //qCritical() << timeSteps;
-            int Down = 0;
-            int Up = 1;
-
-            QDateTime const start = QDateTime::currentDateTime();
-            int paymentOptionIndex = cfg.getPaymentOptionIndex(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
-
-            if (paymentOptionIndex != 0) {
-                qCritical() << "ERROR paymentOptionIndex" << paymentOptionIndex
-                            << "< 0 for start" << start.toString(Qt::ISODate);
-                exit(-1);
-            }
-
-            //QSet<uint32_t> const prices1{800, 1600, 2400, 3200, 4000, 4800, 5600};
-            //QSet<uint32_t> const prices2{500, 1600, 2400, 3200, 4000, 4800, 5600};
-
-            QDateTime end;
-            CalcState calcState;
-
-            QDateTime s(QDateTime::currentDateTime());
-            s.setTime(QTime(12, 0, 0));
-
-            int minimal_parking_price = get_minimal_parkingprice(&cfg,
-                                                                 PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
-                                                                 paymentOptionIndex, s);
+            int price;
+            QDateTime productStart;
+            QDateTime productEnd;
+            QDateTime start = QDateTime::currentDateTime();
 
 #if 0
-            qCritical() << "minimal parking price" << minimal_parking_price;
+            start.setTime(QTime(0, 0, 0));
+            price = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET, start);
+            qCritical() << QString("line=%1 price (%2) :")
+                           .arg(__LINE__)
+                           .arg(start.time().toString(Qt::ISODate)) << price;
 
-            for (int i = 0; i < 8; ++i) {
-                calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                    (double)minimal_parking_price + i*800,
-                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
-                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
-            }
+            price = get_minimal_parkingprice(&cfg, PERMIT_TYPE::DAY_TICKET, 0, start);
+            qCritical() << QString("line=%1 get_minimal_parkingprice:").arg(__LINE__) << price;
+
+            start.setTime(QTime(14, 0, 0));
+            productStart = productEnd = QDateTime();
+            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 = 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);
+            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;
+
+            start.setTime(QTime(16, 0, 0));
+            productStart = productEnd = QDateTime();
+            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;
+
+            start.setTime(QTime(17, 0, 0));
+            productStart = productEnd = QDateTime();
+            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;
 
 #else
-            s.setTime(QTime(15, 0, 0));
-
-            minimal_parking_price = get_minimal_parkingprice(&cfg,
-                                                             PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
-                                                             paymentOptionIndex, s);
-
-            qCritical() << "minimal parking price" << minimal_parking_price;
-
-            for (int i = 0; i < 8; ++i) {
-                calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                    (double)minimal_parking_price + i*800,
-                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
-                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
+            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
         }
@@ -1450,7 +1485,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        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);
@@ -1473,7 +1508,7 @@ int main() {
                         }
 
                         qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
+                                    << timeSteps.at(i) << "PRICE=" << price1;
 
 
                         //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -1557,7 +1592,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1641,7 +1676,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1726,7 +1761,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1784,7 +1819,7 @@ int main() {
                         double cost = 0;
                         CalcState cs;
 
-                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
                             cost = price.netto;
                             qCritical() << "step" << *step << ": cost" << cost;
                         } else {
@@ -1887,7 +1922,7 @@ int main() {
                 CalcState cs;
                 for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                     QDateTime end = start.addSecs(timeSteps.at(i)*60);
-                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
                     qCritical() << endl;
                 }
 
@@ -1912,7 +1947,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
+                        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);

main/main.pro

@@ -30,9 +30,7 @@ SOURCES += main.cpp
 # HEADERS +=
 
 OTHER_FILES += \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff01.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff02.json \
-    /opt/ptu5/opt/customer_502/etc/psa_tariff/tariff03.json
+    /home/linux/customer_505/etc/psa_tariff/tariff01.json