test case for fuchs/muelbach

Minor: added debug output.

library/include/mobilisis/calculator_functions.h

@@ -27,6 +27,13 @@ class Calculator {
                                             int netto_parking_time,
                                             int paymentOptionIndex);
 
+    int computeBruttoDurationInSecs(Configuration const *cfg,
+                                    QDateTime const &from,
+                                    int durationInSecs, bool maxBrutto = false);
+
+    QDateTime computeBruttoDateTime(Configuration const *cfg,
+                                    QDateTime const &from,
+                                    int durationInSecs, bool maxBrutto = false);
 protected:
     explicit Calculator() = default;
 
@@ -70,8 +77,7 @@ public:
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z)</param>
 	/// <param name="price"></param>
 	/// <returns>Returns duration in seconds (data type: double)</returns>
-    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price, PermitType permitType, bool nextDay = false, bool prepaid = false);
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -79,11 +85,10 @@ public:
 	/// <param name="tariff_cfg">Pointer to configuration</param>
 	/// <param name="vehicle_type">Type of vehicle</param>
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
-    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
+	/// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin, PermitType permitType, bool nextDay = false, bool prepaid = false);
-                               PermitType permitType, bool nextDay = false, bool prepaid = false);
 
     // Daily ticket
     QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);

library/include/mobilisis/payment_opt.h

@@ -38,8 +38,10 @@ public:
         pop_daily_card_price = -1;
         pop_business_hours = -1;
         pop_time_step_config = -1;
-        pop_use_only_upto_datetime = "";
+        pop_use_only_upto_datetime = ""; // deprecated
-        pop_use_only_for_duration = 0;
+        pop_use_only_for_duration = 0;   // deprecated
+        pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_minus_steps = 1; // -: jump <x=1> steps backward
     }
 
     int pop_id;
@@ -69,6 +71,8 @@ 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,6 +3,7 @@
 #include <ctime>
 #include <iostream>
 #include <cmath>
+#include <optional>
 
 #include "day_of_week.h"
 #include "configuration.h"
@@ -62,6 +63,7 @@ namespace Utilities {
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
     bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
+    std::optional<ATBPeriodYear> GetYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
 
 	/// <summary>
 	/// Check permissions

library/src/calculate_price.cpp

@@ -3,6 +3,8 @@
 #include "calculator_functions.h"
 #include "payment_option.h"
 #include "utilities.h"
+#include "tariff_global_defines.h"
+#include "period_year.h"
 
 #include <QFile>
 #include <QFileInfo>
@@ -34,10 +36,11 @@ 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)
@@ -324,7 +327,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
         if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
-            maxPrice = Utilities::getMaximalParkingPrice(cfg, paymentMethodId);
+            paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+            maxPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
         } else { // PaymentMethod::Linear -> e.g. szeged
             int const key = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
             int const maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time; // maxTime is given in minutes
@@ -462,8 +466,8 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
                                                 int UpDown, PermitType const &permitType)
 {
 
-    qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
-    qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
     // FIXME
     //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
@@ -473,7 +477,12 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     //}
 
     int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
-    qCritical() << "   compute_next_timestep()   payment option index: " << paymentOptionIndex;
+    int const &pop_plus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_plus_steps;
+    int const &pop_minus_steps = tariff->getPaymentOptions(paymentOptionIndex).pop_minus_steps;
+
+    qCritical() << __LINE__ << "compute_next_timestep()   payment option index: " << paymentOptionIndex;
+    qCritical() << __LINE__ << "compute_next_timestep()             plus steps: " << pop_plus_steps;
+    qCritical() << __LINE__ << "compute_next_timestep()            minus steps: " << pop_minus_steps;
 
     Configuration const *cfg = tariff;
 
@@ -481,19 +490,19 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
     switch (paymentMethodId) {
     case PaymentMethod::Progressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Progressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Progressive";
         break;
     case PaymentMethod::Degressive:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Degressive";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Degressive";
         break;
     case PaymentMethod::Linear:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Linear";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Linear";
         break;
     case PaymentMethod::Steps:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Steps";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Steps";
         break;
     case PaymentMethod::Undefined:
-        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Undefined";
+        qCritical() << __LINE__ << "compute_next_timestep() paymentMethodId: Undefined";
         break;
     }
 
@@ -501,63 +510,106 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
     // without given YearPeriod, SpecialDays and SpecialDaysWorktime
     if ((paymentMethodId == PaymentMethod::Steps) ||
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
-        (paymentMethodId == PaymentMethod::Progressive))
+        (paymentMethodId == PaymentMethod::Progressive) ||
+        // degressive tariff: e.g. Fuchs Technik (500)
+        (paymentMethodId == PaymentMethod::Degressive))
     {
-        // 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() << "   compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
-        qCritical() << "   compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
-        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+        qCritical() << __LINE__ << "compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
 
         // consider time shift: the step-list might have been computed at a
         // slightly different time point
+
+        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        if (currentStepIndex == -1) {
+            unsigned minimalDistance = ~0;
+            int j = -1;
+            for (int i = 0; i < stepList.size(); ++i) {
+                unsigned distance = std::abs(stepList[i] - currentTimeMinutes);
+                if (distance < minimalDistance) {
+                    minimalDistance = distance;
+                    j = i;
+                }
+            }
+            // max. tolerance set to 3 minutes
+            unsigned const tolerance = std::min(minimalDistance, (unsigned)(3));
+            if (j != -1) {
+                stepList[j] = currentTimeMinutes;
+            }
+        }
+
+#if 0
         int maxStep = -1;
         if (size >= 2) {
             maxStep = stepList[1] - stepList[0];
         }
-        int tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
+        // max. tolerance set to 5 minutes
+        int const tolerance = (maxStep == -1) ? 5 : std::min(maxStep, 5);
         for (int i=0; i < stepList.size(); ++i) {
             if (std::abs(stepList[i] - currentTimeMinutes) <= tolerance) {
                 qCritical().noquote()
-                    << QString("   compute_next_timestep() correction stepList[%1]=%2 -> %3:")
+                    << __LINE__ << QString("compute_next_timestep() correction stepList[%1]=%2 -> %3:")
                                     .arg(i).arg(stepList[0]).arg(currentTimeMinutes);
                 stepList[i] = currentTimeMinutes;
-                qCritical() << "   compute_next_timestep()        NEW timeSteps:" << stepList;
+                qCritical() << __LINE__ << "compute_next_timestep()        NEW timeSteps:" << stepList;
             }
         }
 
         int currentStepIndex = stepList.indexOf(currentTimeMinutes);
+#endif
+
+        currentStepIndex = stepList.indexOf(currentTimeMinutes);
+        qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
 
         if (currentStepIndex == -1) {
-            qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+            qCritical() << __LINE__ << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
             return  currentTimeMinutes;
         }
 
         if (UpDown == 1) { // UP
             if (stepList[currentStepIndex] == stepList.last()) {
-                qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                 return  currentTimeMinutes;
             }
             else {
-                qCritical() << "   compute_next_timestep() return next time step:" << stepList[currentStepIndex + 1];
+                int const rest = currentStepIndex % pop_plus_steps;
-                return stepList[currentStepIndex + 1];
+
+                if (rest) {
+                    currentStepIndex -= rest;
+                }
+
+                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
+
+                int const nextStepIndex = currentStepIndex + pop_plus_steps;
+
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
             }
         }
         if (UpDown == 0) { // DOWN
             if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
+                qCritical() << __LINE__ << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
                 return  currentTimeMinutes;
             }
             else {
-                qCritical() << "   compute_next_timestep() return next time step:" << stepList[currentStepIndex - 1];
+                int const nextStepIndex = currentStepIndex - pop_minus_steps;
-                return stepList[currentStepIndex - 1];
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
             }
         }
     } else
@@ -660,30 +712,39 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
-        QDateTime &start_parking_time,
+        QDateTime &start_parking_time_,
         int netto_parking_time,
         QDateTime &end_parking_time,
         struct price_t *price,
         PermitType permitType,
-        bool prepaid)
+        bool prepaid) {
-{
     CalcState calcState;
 
+    QDateTime start_parking_time(start_parking_time_);
+
     int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
 
+    QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff, paymentOptionIndex, start_parking_time);
+    //Q_UNUSED(tlist);
+    qCritical() << __func__ << __LINE__ << tlist;
+
     double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
     double maxMin = tariff->getPaymentOptions(paymentOptionIndex).pop_max_time;
 
-    // DEBUG
+    // netto_parking_time = minMin;
-    qCritical() << "compute_price_for_parking_ticket() " << endl
-                << "          paymentOptionIndex: " << paymentOptionIndex << endl
-                << "          start_parking_time: " << start_parking_time << endl
-                << "          netto_parking_time: " << netto_parking_time << endl
-                << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
-                << "                      minMin: " << minMin << endl
-                << "                      maxMin: " << maxMin
-                << "                  permitType: " << permitType.toString();
 
+    //if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "compute_price_for_parking_ticket() " << endl
+                    << "          paymentOptionIndex: " << paymentOptionIndex << endl
+                    << "          start_parking_time: " << start_parking_time << endl
+                    << "         start_parking_time_: " << start_parking_time_ << endl
+                    << "          netto_parking_time: " << netto_parking_time << endl
+                    << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
+                    << "                      minMin: " << minMin << endl
+                    << "                      maxMin: " << maxMin << endl
+                    << "                     prepaid: " << prepaid << endl
+                    << "                  permitType: " << permitType.toString();
+    //}
 
     if (netto_parking_time < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
@@ -691,73 +752,86 @@ 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__ << ")"
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                             << calcState.toString();
+                            << calcState.toString();
-        // qCritical() << __func__ << __LINE__;
                 return calcState;
             }
-        // qCritical() << __func__ << __LINE__;
 
-            QList<int> lll = Calculator::GetInstance().GetTimeSteps(tariff);
 
-            // netto_parking_time = compute_next_timestep(tariff, netto_parking_time, 1, permitType);
+            // compute cost (price)
-
-            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
-
-        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
 
             int weekDay = start_parking_time.date().dayOfWeek();
-            int const pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
-            QTime const carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
-            //QTime const carryOverEnd = cfg->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_end;
-            int const carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
 
-            qCritical() << "LINE" << __LINE__ << "carryStart" << carryOverStart.toString(Qt::ISODate);
+            std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
-            qCritical() << "LINE" << __LINE__ << "carryDur" << carryOverDuration;
+            if (yperiod.has_value()) {
-            qCritical() << "LINE" << __LINE__ << "start" << start_parking_time.toString(Qt::ISODate);
+                ATBPeriodYear const &period = yperiod.value();
-
+                pop_carry_over_option_id = period.pye_id;
-            if (start_parking_time.time() > carryOverStart) {
+                //qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
-                //int const backTime = carryOverStart.secsTo(start_parking_time.time()) / 60;
-            //qCritical() << "LINE" << __LINE__ << "backTime" << backTime;
-            //qCritical() << "LINE" << __LINE__ << "backTime + dur" << backTime + carryOverDuration;
-                start_parking_time.setTime(carryOverStart);
-                start_parking_time = start_parking_time.addSecs(carryOverDuration * 60);
             }
 
-            end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
+            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() << "LINE" << __LINE__ << "netto" << netto_parking_time;
+            //qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << "LINE" << __LINE__ << "start" << start_parking_time.toString(Qt::ISODate);
+            //qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+
-                         << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+            // handle prepaid option
+            QDateTime effectiveStartTime(start_parking_time);
+            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
+            if (prepaidOption.has_value()) {
+                ATBPrepaid const &p = prepaidOption.value();
+                if (p.never) {
+                    qCritical() << __func__ << __LINE__ << "prepaid: no";
+                } else {
+                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.static_end);
+                    } else
+                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.static_start);
+                        effectiveStartTime == effectiveStartTime.addSecs(carryOverDuration * 60);
+                    }
+                }
+            }
+
+            // handle carry over
+            int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
+            if (netto_parking_time >= minutesUntilCarryOver) {
+                int const rest = netto_parking_time - minutesUntilCarryOver;
+                QDateTime s(effectiveStartTime);
+                s = s.addSecs(minutesUntilCarryOver * 60);
+                s = s.addSecs(carryOverDuration * 60);
+                end_parking_time = s.addSecs(rest * 60);
+            } else {
+                end_parking_time = effectiveStartTime.addSecs(netto_parking_time*60);
+            }
 
         } else {
-        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
                         tariff->getPaymentOptions().pop_payment_method_id,
@@ -774,7 +848,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         }
 
         // DEBUG
-        qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
+        // qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
         qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;
 
         price->brutto = price->vat = price->vat_percentage = 0;
@@ -785,6 +859,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::INVALID_START_DATE);
     }
 
+    if (end_parking_time.time().hour() == 0 && end_parking_time.time().minute() == 0) {
+        end_parking_time = end_parking_time.addDays(-1);
+        end_parking_time.setTime(QTime(23, 59, 0));
+    }
+
+    qCritical() << __func__ << __LINE__ << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+
     return calcState.set(CalcState::State::SUCCESS);
 }
 
@@ -851,10 +932,12 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     bool const nextDay = false;
 
     // DEBUG
-    qCritical() << "compute_duration_for_parking_ticket(2): ";
+    if (DBG_LEVEL >= DBG_DEBUG) {
-    qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "compute_duration_for_parking_ticket(2): ";
-    qCritical() << "              prepaid: " << prepaid;
+        qCritical() << " payment option index: " << paymentOptionIndex;
-    qCritical() << "                price: " << price;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "                price: " << price;
+    }
 
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
@@ -924,15 +1007,20 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         } else {
             ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
-            // DEBUG
-            //qCritical() << "compute_duration_for_parking_ticket(): ";
-            //qCritical() << "                 endTime: " << endTime;
-            //qCritical() << "           ticketEndTime: " << ticketEndTime;
-
             if (!ticketEndTime.isValid()) {
                 calcState.setDesc(QString("ticketEndTime=%1").arg(endTime));
                 return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
             }
+
+            if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
+                ticketEndTime = ticketEndTime.addDays(-1);
+                ticketEndTime.setTime(QTime(23, 59, 0));
+            }
+
+            // DEBUG
+            qCritical() << "compute_duration_for_parking_ticket(): ";
+            qCritical() << "                 endTime: " << endTime;
+            qCritical() << "           ticketEndTime: " << ticketEndTime;
         }
     } else {
         return calcState.set(CalcState::State::INVALID_START_DATE);

library/src/calculator_functions.cpp

@@ -117,6 +117,117 @@ QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime
 
     return QDateTime();
 }
+
+int Calculator::computeBruttoDurationInSecs(Configuration const *cfg,
+                                            QDateTime const &start,
+                                            int nettoDurationInSecs,
+                                            bool maxBrutto) {
+    QDateTime from(start);
+    int bruttoDurationInSecs = 0;
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "netto duration in secs" << nettoDurationInSecs;
+    }
+
+    while (nettoDurationInSecs > 0) {
+        int day_in_week_id = from.date().dayOfWeek();
+        int count = cfg->WeekDaysWorktime.count(day_in_week_id);
+
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << DBG_HEADER << "count for " << day_in_week_id << ": " << count;
+        }
+
+        if (count > 0) {
+            for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
+                QTime const &pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
+                QTime const &pwd_time_to = QTime::fromString(QString::fromStdString(iter->second.pwd_time_to), Qt::ISODate);
+                QTime fromTime = from.time();
+
+                if (DBG_LEVEL >= DBG_DEBUG) {
+                    qCritical() << DBG_HEADER;
+                    qCritical() << DBG_HEADER << " wd-from" << pwd_time_from.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "   wd-to" << pwd_time_to.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "fromTime" << fromTime.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "    from" << from.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER;
+                }
+
+                if (fromTime <= pwd_time_from) {
+                    int secs = fromTime.secsTo(pwd_time_from);
+                    bruttoDurationInSecs += secs;
+                    fromTime = pwd_time_from;
+                    from.setTime(pwd_time_from);
+                }
+
+                if (DBG_LEVEL >= DBG_DEBUG) {
+                    qCritical() << DBG_HEADER << "fromTime" << fromTime.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "    from" << from.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "   netto" << nettoDurationInSecs;
+                    qCritical() << DBG_HEADER << "  brutto" << bruttoDurationInSecs;
+                    qCritical() << DBG_HEADER << " br-date" << start.addSecs(bruttoDurationInSecs);
+                }
+
+                while (fromTime < pwd_time_to && nettoDurationInSecs > 0) {
+                    bruttoDurationInSecs += 60;
+                    nettoDurationInSecs -= 60;
+                    fromTime = fromTime.addSecs(60);
+                    from = from.addSecs(60);
+                }
+
+                if (DBG_LEVEL >= DBG_DEBUG) {
+                    qCritical() << DBG_HEADER;
+                    qCritical() << DBG_HEADER << "   netto" << nettoDurationInSecs;
+                    qCritical() << DBG_HEADER << "  brutto" << bruttoDurationInSecs;
+                    qCritical() << DBG_HEADER << " br-date" << start.addSecs(bruttoDurationInSecs);
+                    qCritical() << DBG_HEADER << "fromTime" << fromTime.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER << "    from" << from.toString(Qt::ISODate);
+                    qCritical() << DBG_HEADER;
+                }
+
+                if (--count == 0 && fromTime == pwd_time_to) {
+                    // handle rest
+                    QDateTime midnight(from);
+                    midnight = midnight.addDays(1);
+                    midnight.setTime(QTime(0, 0, 0));
+                    int secs =  from.secsTo(midnight);
+                    bruttoDurationInSecs += secs;
+                    from = midnight;
+
+                    if (DBG_LEVEL >= DBG_DEBUG) {
+                        qCritical() << DBG_HEADER;
+                        qCritical() << DBG_HEADER << "   netto" << nettoDurationInSecs;
+                        qCritical() << DBG_HEADER << "  brutto" << bruttoDurationInSecs;
+                        qCritical() << DBG_HEADER << " br-date" << start.addSecs(bruttoDurationInSecs);
+                        qCritical() << DBG_HEADER << "    from" << from.toString(Qt::ISODate);
+                        qCritical() << DBG_HEADER;
+                    }
+                }
+            }
+
+        } else {
+            bruttoDurationInSecs += (24 * 3600);
+            from = from.addDays(1);
+        }
+    }
+
+    if (maxBrutto) {
+        qCritical() << DBG_HEADER << "TODO";
+    }
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << " br-date" << start.addSecs(bruttoDurationInSecs);
+    }
+
+    return bruttoDurationInSecs;
+}
+
+QDateTime Calculator::computeBruttoDateTime(Configuration const *cfg,
+                                            QDateTime const &from,
+                                            int durationInSecs,
+                                            bool maxBrutto) {
+    return from.addSecs(computeBruttoDurationInSecs(cfg, from, durationInSecs, maxBrutto));
+}
+
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             uint8_t payment_option,
@@ -135,14 +246,20 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
 
-    qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
+    if (DBG_LEVEL >= DBG_DEBUG) {
-    qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
+        qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
-    qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
+        qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
-    qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
+        qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
-    qCritical() << DBG_HEADER << "   cost (price):" << cost;
+        qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
+        qCritical() << DBG_HEADER << "   cost (price):" << cost;
+    }
 
     QList<int> tsteps = Calculator::GetInstance().GetTimeSteps(cfg, paymentOptionIndex, inputDate);
-    qCritical() << DBG_HEADER << "     time steps:" << tsteps;
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "     time steps:" << tsteps;
+    } else {
+        Q_UNUSED(tsteps);
+    }
 
     if (paymentMethodId == PaymentMethod::Degressive) {
 
@@ -201,7 +318,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                             //found = true;
                             //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
                             //qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration in minutes" << durationInMinutes;
-                            QDateTime d(inputDate.addSecs(duration_previous * 60));
+                            QDateTime d;
+                            if (pop_accumulate_durations) {
+                                d = inputDate.addSecs(durationInMinutes * 60);
+                            } else {
+                                d = inputDate.addSecs(duration_previous * 60);
+                            }
 
                             qCritical() << DBG_HEADER << "                    provided price (cost):" << cost;
                             qCritical() << DBG_HEADER << "        computed time for price (minutes):" << duration_previous;
@@ -287,6 +409,9 @@ 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;
@@ -330,8 +455,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 #if DEBUG_GET_DURATION_FROM_COST==1
                 qCritical() << DBG_HEADER << "(ADAPTED) INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
-                //qCritical() << __func__ << __LINE__;
-
                 // 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();
@@ -345,8 +468,6 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                     return "";
                 }
 
-                //qCritical() << __func__ << __LINE__;
-
                 QTime current_working_time_from;
                 QTime current_working_time_to;
 
@@ -376,12 +497,11 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 #endif
 
                 int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
-                // int const pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
+                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;
@@ -404,20 +524,39 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                             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 DEBUG_GET_DURATION_FROM_COST==1
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pra_price:" << pra_price;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")     price:" << price;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")      cost:" << cost;
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ") new_price:" << new_price;
+#endif
+
                             if (new_price <= cost) {
-                               duration_previous = durationUnit;
+                                if (pop_accumulate_durations) {
-                               //qCritical() << "(" << __func__ << ":" << __LINE__ << ") ZZZZZZ duration_previous" << duration_previous;
+                                    duration_previous += durationUnit;
+                                } else {
+                                    duration_previous = durationUnit;
+                                }
+                                durationInSecs = duration_previous * 60;
+
+#if DEBUG_GET_DURATION_FROM_COST==1
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")      durationUnit" << durationUnit;
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")    durationInSecs" << durationInSecs;
+#endif
+
                             } else {
-                                found = true;
+                                // qCritical() << "(" << __func__ << ":" << __LINE__ << ") duration_previous" << duration_previous;
-                               //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 ((double)price == cost) {
@@ -430,25 +569,50 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                             qCritical() << DBG_HEADER << "DURATION IN SECONDS" << durationInSecs;
                             qCritical() << DBG_HEADER << "CURRENT-WORKING-DATE-TIME-TO"
                                                       << current_working_date_time_to.toString(Qt::ISODate);
+                            qCritical() << DBG_HEADER << "    INPUT DATE" << inputDate.toString(Qt::ISODate);
                             qCritical() << DBG_HEADER << "NEW INPUT DATE" << inputDate.addSecs(durationInSecs).toString(Qt::ISODate);
 #endif
-
                             if (inputDate.addSecs(durationInSecs) > current_working_date_time_to) {
+                                int bruttoDurationInSecs = computeBruttoDurationInSecs(cfg, inputDate, durationInSecs);
+//                                qCritical() << DBG_HEADER << "DURATION IN SECONDS  (NETTO)" << durationInSecs;
+//                                qCritical() << DBG_HEADER << "DURATION IN SECONDS (BRUTTO)" << bruttoDurationInSecs;
+
+                                inputDate = inputDate.addSecs(bruttoDurationInSecs);
+#if 0
+                                // durationInSecs is a netto time
+                                // needed is the corresponding brutto-time
+                                int day_in_week_id = inputDate.date().dayOfWeek();
+                                int nettoDurationInSecs = 0;
+
+                                while (nettoDurationInSecs <= durationInSecs) {
+                                    if (cfg->WeekDaysWorktime.count(day_in_week_id) > 0) {
+                                        for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(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);
+                                            nettoDurationInSecs += pwd_time_from.secsTo(pwd_time_to);
+                                            if (nettoDurationInSecs > durationInSecs) {
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    day_in_week_id += 1;
+                                    if (day_in_week_id > (int)Qt::Sunday) {
+                                        day_in_week_id = Qt::Monday;
+                                    }
+                                }
+                                qCritical() << DBG_HEADER;
+
                                 QTime next_working_time_from;
                                 if (cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over != 0) {
-#if DEBUG_GET_DURATION_FROM_COST==1
                                     qCritical() << DBG_HEADER << "CARRY-OVER SET";
-#endif
                                     // check for next working-time-range on same day
                                     int day_in_week_id = inputDate.date().dayOfWeek();
                                     for (auto[iter, rEnd] = cfg->WeekDaysWorktime.equal_range(day_in_week_id); iter != rEnd; ++iter) {
                                         QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                                         if (pwd_time_from > current_working_time_to) {
                                             next_working_time_from = pwd_time_from;
-#if DEBUG_GET_DURATION_FROM_COST==1
                                             qCritical() << DBG_HEADER << "NEXT-WORKING-TIME-FROM"
                                                         << next_working_time_from.toString(Qt::ISODate);
-#endif
                                             break;
                                         }
                                     }
@@ -465,32 +629,33 @@ 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 << "           day in week" << day_in_week_id;
+                                                        qCritical() << DBG_HEADER << "next working time from" << next_working_time_from.toString(Qt::ISODate);
                                                         break;
                                                     }
                                                 }
 
-                                                //qCritical() << DBG_HEADER << "DAYS" << days;
+                                                qCritical() << DBG_HEADER << "DAYS" << days;
-                                                //qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
+                                                qCritical() << DBG_HEADER << "DURATION-SECS" << durationInSecs;
-                                                //qCritical() << DBG_HEADER << "DURATION-MINS" << durationInSecs / 60;
+                                                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);
+                                                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);
+                                                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);
+                                                // durationInSecs is a netto-parking-time
-#if DEBUG_GET_DURATION_FROM_COST==1
+                                                inputDate = inputDate.addSecs(durationInSecs + lower.secsTo(upper));
                                                 qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
-#endif
                                                 break;
                                             }
                                         } // for (int days = 1; days < 8; ++days) {
@@ -502,36 +667,31 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                         lower.setTime(current_working_time_to);
 
                                         inputDate = inputDate.addSecs(lower.secsTo(upper) + durationInSecs);
-#if DEBUG_GET_DURATION_FROM_COST==1
+                                        //qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
-                                        qCritical() << DBG_HEADER << "TICKET-END" << inputDate.toString(Qt::ISODate);
-#endif
                                     }
                                 }
-                            } else {
-                                inputDate = inputDate.addSecs(duration.pun_duration * 60);
-
-#if DEBUG_GET_DURATION_FROM_COST==1
-                                qCritical() << DBG_HEADER << "INPUT-DATE" << inputDate.toString(Qt::ISODate);
 #endif
-
+                            } else { // if (inputDate.addSecs(durationInSecs) > current_working_date_time_to) {
+                                if (pop_accumulate_durations) {
+                                    inputDate = inputDate.addSecs(durationInSecs);
+                                } else {
+                                    inputDate = inputDate.addSecs(duration.pun_duration * 60);
+                                }
+                                // qCritical() << DBG_HEADER << "INPUT-DATE" << inputDate.toString(Qt::ISODate);
                             }
 
                             QString const &s = inputDate.toString(Qt::ISODate);
-
+                            // qCritical() << DBG_HEADER << "TICKET-END" << s;
-#if DEBUG_GET_DURATION_FROM_COST==1
-                            qCritical() << DBG_HEADER << "TICKET-END" << s;
-#endif
-
                             return s.toStdString();
                         } // if ((double)price == cost) {
                         else {
-                            //qCritical() << DBG_HEADER;
+                            // qCritical() << DBG_HEADER;
                         }
                     } else {
-                        //qCritical() << __func__ << __LINE__;
+                        // qCritical() << DBG_HEADER;
                     }
                 }
-
+                // qCritical() << DBG_HEADER;
                 return "";
             }
         }
@@ -999,13 +1159,17 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          int paymentOptionIndex) const {
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
-    //qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
+    // qCritical() << __func__ << __LINE__ << "paymentOptionIndex" << paymentOptionIndex;
 
     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 << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
+        Q_UNUSED(tlist);
+        //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);
     }
@@ -1293,8 +1457,8 @@ CalcState Calculator::isParkingAllowed(Configuration const *cfg,
                                        int netto_parking_time,
                                        int paymentOptionIndex) {
 
-    qCritical() << DBG_HEADER << "CHECK IF PARKING IS ALLOWED AT"
+    //qCritical() << DBG_HEADER << "CHECK IF PARKING IS ALLOWED AT"
-                << start.toString(Qt::ISODate) << "...";
+    //            << start.toString(Qt::ISODate) << "...";
 
     CalcState cs;
 
@@ -2512,16 +2676,18 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
                     } else { // if (carryOverTimeRangeFrom == QTime(0, 0, 0)) {
-                        //if (DBG_LEVEL >= DBG_DEBUG) {
+                        if (DBG_LEVEL >= DBG_DEBUG) {
                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")        carry over time range from:" << carryOverTimeRangeFrom.toString(Qt::ISODate);
                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")          carry over time range to:" << carryOverTimeRangeTo.toString(Qt::ISODate);
-                        //}
+                        }
 
                         m_timeSteps[paymentOptionIndex].clear();
 
                         std::optional<QDateTime> prepaidStart = cfg->prepaidStart(start, pop_prepaid_option_id);
                         // TODO: zusaetzlicher faktor falls vorkauf-option zieht
                         if (prepaidStart) {
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                       start:" << start.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid start value:" << prepaidStart.value().toString(Qt::ISODate);
                             start = prepaidStart.value();
                             if (DBG_LEVEL >= DBG_DEBUG) {
                                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid adapted start:" << start.toString(Qt::ISODate);
@@ -2542,6 +2708,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
                         }
 
+                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")                       start:" << start.toString(Qt::ISODate);
+
                         // int const start_time = start.time().hour() * 60 + start.time().minute();
                         QDateTime nextTimeStep = start;
                         int runtimeInMinutes = 0;
@@ -2567,7 +2735,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                         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);
@@ -2584,14 +2752,15 @@ 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__ << ")  HIER NICHT";
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")     payment option id:" << pop_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")  pun_intnerpolation_id:" << duration.pun_interpolation_id;
 
                                         interpolation.dynamic_start = start.time();
                                         interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
@@ -2604,11 +2773,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         // qCritical() << "(" << __func__ << ":" << __LINE__ << ")    interpolation dynamic end time:" << end_time;
 
                                         int pop_min_time = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                                        bool pop_accumulate_durations = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_durations;
 
                                         runtimeInMinutes += duration.pun_duration;
                                         nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+                                        // qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
 
                                         if (nextTimeStep.time() > carryOverStart) {
                                             int const backTime = carryOverStart.secsTo(nextTimeStep.time()) / 60;
@@ -2633,19 +2803,22 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                                 //}
                                             } else {
                                                 m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                                                //qCritical() << "(" << __func__ << ":" << __LINE__ << ")   :" <<  m_timeSteps[paymentOptionIndex];
                                             }
                                         }
 
-                                        duration.pun_duration = runtimeInMinutes;
+                                        if (pop_accumulate_durations == false) {
-
+                                            duration.pun_duration = runtimeInMinutes;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
-
+                                            search->second = duration;
-                                        search->second = duration;
+                                        }
                                     } else
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" ;
 
                                         //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;
@@ -2658,6 +2831,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                                     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;
                                                 }
                                             }
@@ -2733,8 +2907,7 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         // duration.pun_duration = runtimeInMinutes - carryOverDuration;
                                         m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                         search->second = duration;
-                                    } else {
+                                    } else { // if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
                                         cfg->Duration.erase(search);
                                     }
                                 }
@@ -2768,7 +2941,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;
@@ -2795,13 +2968,19 @@ 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;
 
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
+    if (DBG_LEVEL >= DBG_DEBUG) {
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
+        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)
     {
@@ -2813,22 +2992,29 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
         //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
         //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
 
-        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        if (pop_accumulate_durations) {
-        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
+            pun_duration += cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        } else {
+            pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        }
+
         if (pop_accumulate_prices) {
             price += itr->second.pra_price;
         } else {
             price = (uint32_t)(itr->second.pra_price);
         }
 
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
+        if (DBG_LEVEL >= DBG_DEBUG) {
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ")";
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+            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;
+            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
             return price;
         }
     }
@@ -2840,7 +3026,9 @@ 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;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") accumulate prices" << pop_accumulate_prices;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pop_id" << pop_id;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ")             price" << price;
 
     int new_price = 0;
     uint32_t duration = 0;

library/src/configuration.cpp

@@ -598,6 +598,14 @@ 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) {
@@ -999,6 +1007,9 @@ int Configuration::getPaymentOptionIndex(QDateTime const &dt) const {
     for (int opt=0; opt < numOptions; ++opt) {
         uint64_t const pop_business_hours = getPaymentOptions(opt).pop_business_hours;
 
+        if (pop_business_hours == 0) { // 0 == 24/7
+            return opt;
+        }
 
         uint64_t p = 0;
         int const dayOfWeek = dt.date().dayOfWeek();
@@ -1249,7 +1260,7 @@ std::optional<QDateTime> Configuration::prepaidStart(QDateTime const &start, int
     std::optional<QDateTime> value;
     QDateTime s = start;
 
-    qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid option id:" << prepaid_option_id;
+    // qCritical() << "(" << __func__ << ":" << __LINE__ << ")         prepaid option id:" << prepaid_option_id;
 
     std::optional<ATBPrepaid> prepaid_option = getPrepaidType(prepaid_option_id);
     if (prepaid_option.has_value()) {

library/src/utilities.cpp

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

main/main.cpp

@@ -51,7 +51,8 @@ extern "C" char* strptime(const char* s,
 #define SEXTEN                                  (0)
 #define SCHNALS_LEITER_KIRCHL                   (0)
 #define SCHNALS_STAUMAUER                       (SCHNALS_LEITER_KIRCHL)
-#define VALSER_ALM                              (1)
+#define VALSER_ALM                              (0)
+#define FUCHS_MUEHLBACH                         (1)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -354,7 +355,7 @@ int main() {
         QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
         qCritical() << "TimeSteps" << timeSteps;
 
-        return 0;
+        // return 0;
 
         CalcState cs;
         double cost;
@@ -363,7 +364,7 @@ int main() {
 
         // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
         for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 5, 19 + day), QTime()); // 20: (whit) monday,..., 26: sunday
+            QDateTime s(QDate(2024, 7, 29 + day), QTime()); // 20: (whit) monday,..., 26: sunday
             QDateTime end;
 
             switch (day) {
@@ -401,9 +402,11 @@ int main() {
                                                         bool prepaid = true);
             */
 
-            for (int minutes = 0; minutes < 1440; ++minutes) {
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
-                QDateTime start = s.addSecs(minutes * 60);
+            for (int minutes = 540; minutes <= 540; ++minutes) {
-                QDateTime effectiveStart = start;
+                // QDateTime start = s.addSecs(minutes * 60);
+                QDateTime start(QDateTime::currentDateTime());
+                QDateTime effectiveStart(QDateTime::currentDateTime());
 
                 if (start.time() < QTime(8, 0, 0)) {
                     effectiveStart.setTime(QTime(8, 0, 0));
@@ -415,55 +418,18 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
-                for (int i = 0; i <= 2100; i += 10) {
+                for (int i = 30; i <= 30; i += 10) {
                 //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
-                        durationInMinutes = pop_min_time;
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
-                        if (i > 0) {
+                                    << "> end" << end.toString(Qt::ISODate);
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 600; // 22:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-                        qCritical() << cs.toString();
                     }
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
                 }
             }
         }
@@ -552,7 +518,7 @@ int main() {
             */
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 0; minutes < 1440; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
                 // qCritical() << "start" << start.toString(Qt::ISODate);
@@ -569,66 +535,32 @@ int main() {
                     effectiveStart.setTime(QTime(8, 0, 0)); // next day
                 }
 
+/*
                 for (int i = 10; i <= 400; i += 10) {
-                //for (int i = 2100; i <= 2100; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
-
-
                         qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
                                     << "> end" << end.toString(Qt::ISODate);
-
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(19, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(19, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 780; // 19:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-#if 0
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1140) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
-#endif
                     }
 
                     if (!cs) {
                         qCritical() << "ERROR CalcState" << cs.toString() << endl;
-                    } else {
-//                        qCritical() << cs.toString();
                     }
+                }
+*/
+                int netto_parking_time = 60;
+                struct price_t price;
 
-#if 0
+                qCritical() << "start" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "start ............................" << start.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "effectiveStart ..................." << effectiveStart.toString(Qt::ISODate);
-                    qCritical() << __LINE__ << "cost ............................." << cost;
-                    qCritical() << __LINE__ << "durationInMinutes ................" << durationInMinutes;
-                    qCritical() << __LINE__ << "offsetInMinutes .................." << offsetInMinutes;
-                    qCritical() << __LINE__ << "effectiveStart.secsTo(end) / 60 .." << effectiveStart.secsTo(end) / 60;
-                    qCritical() << __LINE__ << "end .............................." << end.toString(Qt::ISODate) << endl;
-                    exit(-1);
-#endif
 
+                QDateTime const s = start;
+
+                if ((cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
+                        qCritical() << "start" << s.toString(Qt::ISODate)
+                                    << "netto_parking_time" << netto_parking_time
+                                    << "< price" << price.netto
+                                    << "> end" << end.toString(Qt::ISODate);
                 }
             }
         }
@@ -644,8 +576,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("/home/linux/customer_505/etc/psa_tariff/tariff01.json");
-    input.open("/opt/ptu5/opt/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());
@@ -657,10 +589,13 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        pop_min_time = get_minimal_parkingtime(&cfg);
+        //PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
-        pop_max_time = get_maximal_parkingtime(&cfg);
+        PermitType permitType(PERMIT_TYPE::DAY_TICKET_PKW);
-        pop_min_price = get_minimal_parkingprice(&cfg);
+
-        pop_max_price = get_maximal_parkingprice(&cfg);
+        pop_min_time = get_minimal_parkingtime(&cfg, permitType);
+        pop_max_time = get_maximal_parkingtime(&cfg, permitType);
+        pop_min_price = get_minimal_parkingprice(&cfg, permitType);
+        pop_max_price = get_maximal_parkingprice(&cfg, permitType);
         pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
         qCritical() << "        pop_min_time: " << pop_min_time;
@@ -718,10 +653,10 @@ int main() {
             }
 
             //for (int minutes = 0; minutes < 1440; ++minutes) {
-            for (int minutes = 1020; minutes <= 1020; minutes += 1) {
+            for (int minutes = 480; minutes <= 480; minutes += 1) {
                 QDateTime start = s.addSecs(minutes * 60);
 
-                qCritical() << "start" << start.toString(Qt::ISODate);
+                // qCritical() << "start" << start.toString(Qt::ISODate);
 
                 QDateTime effectiveStart = start;
 
@@ -737,9 +672,137 @@ int main() {
                     effectiveStart.setTime(QTime(7, 0, 0)); // next day
                 }
 
-#if 1
+#if 0
-                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
+                for (int i = 700; i <= 1400; i += 700) {
-                for (int i = 200; i <= 200; i += 10) {
+                    cost = i;
+
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
+                    }
+
+                    if (!cs) {
+                        qCritical() << "ERROR CalcState" << cs.toString() << endl;
+                    } else {
+//                        qCritical() << cs.toString();
+                    }
+
+                    //qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                    //            << "> end" << end.toString(Qt::ISODate);
+
+                }
+#else
+
+                start = QDateTime::currentDateTime();
+                //start.setTime(QTime(9, 57, 0));
+
+                for (int netto_parking_time = 60; netto_parking_time <= 60; netto_parking_time += 60) {
+
+                    QDateTime end;
+                    struct price_t price;
+                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
+
+                    qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
+                                << "price" << price.netto;
+                }
+#endif
+            }
+        }
+    }
+#endif
+
+#if FUCHS_MUEHLBACH==1
+    std::ifstream input;
+    int pop_min_time;
+    int pop_max_time;
+    int pop_min_price;
+    int pop_max_price;
+    int pop_daily_card_price;
+
+    input.open("/home/linux/customer_504/etc/psa_tariff/tariff01.json");
+    //input.open("/opt/ptu5/opt/customer_505/etc/psa_tariff/tariff01.json");
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+        PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
+
+        //pop_min_time = get_minimal_parkingtime(&cfg, permitType);
+        //pop_max_time = get_maximal_parkingtime(&cfg, permitType);
+        //pop_min_price = get_minimal_parkingprice(&cfg, permitType);
+        //pop_max_price = get_maximal_parkingprice(&cfg, permitType);
+        //pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
+
+        //qCritical() << "        pop_min_time: " << pop_min_time;
+        //qCritical() << "        pop_max_time: " << pop_max_time;
+        //qCritical() << "       pop_min_price: " << pop_min_price;
+        //qCritical() << "       pop_max_price: " << pop_max_price;
+
+        CalcState cs;
+        double cost;
+        int durationInMinutes = 0;
+        int offsetInMinutes = 0;
+
+        // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
+        for (int day = Qt::Wednesday; day <= Qt::Wednesday; ++day) {
+            QDateTime s(QDate(2024, 8, 11 + day), QTime(0, 0, 0));
+            QDateTime end;
+
+            switch (day) {
+            case (int)Qt::Monday:
+                qCritical() << "Monday";
+                break;
+            case (int)Qt::Tuesday:
+                qCritical() << "Tuesday";
+                break;
+            case (int)Qt::Wednesday:
+                qCritical() << "Wednesday";
+                break;
+            case (int)Qt::Thursday:
+                qCritical() << "Thursday";
+                break;
+            case (int)Qt::Friday:
+                qCritical() << "Friday";
+                break;
+            case (int)Qt::Saturday:
+                qCritical() << "Saturday";
+                break;
+            case (int)Qt::Sunday:
+                qCritical() << "Sunday";
+                break;
+            }
+
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
+            for (int minutes = 491; minutes <= 491; minutes += 1) {
+                QDateTime start = s.addSecs(minutes * 60);
+
+                //qCritical() << "start" << start.toString(Qt::ISODate);
+
+                QDateTime effectiveStart = start;
+
+                // hier sollte man auch testen was passiert, falls man ausserhalb
+                // der verkaufsdaten steht
+                if (start.time() < QTime(7, 0, 0)) {
+                    effectiveStart.setTime(QTime(7, 0, 0));
+                } else
+                if (start.time() <= QTime(20, 0, 0)) {
+                    effectiveStart = start;
+                } else {
+                    effectiveStart = start.addDays(1);
+                    effectiveStart.setTime(QTime(7, 0, 0)); // next day
+                }
+
+#if 0
+                qCritical() << "";
+                qCritical() << "compute_duration_for_parking_ticket";
+                qCritical() << "===================================";
+
+                for (int i = 0; i <= 600; i += 10) {
                     cost = i;
 
                     if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
@@ -756,33 +819,14 @@ int main() {
 
                 }
 #else
-                for (int i = 700; i <= 1400; i += 700) {
+                qCritical() << "";
-                //for (int i = 2100; i <= 2100; i += 10) {
+                qCritical() << "compute_price_for_parking_ticket";
-                    cost = i;
+                qCritical() << "================================";
-
-                    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));
-
-                for (int i = 66; i <= 66; i += 6) {
 
+                for (int netto_parking_time = 180; netto_parking_time <= (180 + 720*3); netto_parking_time += 720) {
                     QDateTime end;
                     struct price_t price;
-                    cs = compute_price_for_parking_ticket(&cfg, start, i, end, &price);
+                    cs = compute_price_for_parking_ticket(&cfg, start, netto_parking_time, end, &price, permitType, true);
 
                     qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end.toString(Qt::ISODate)
                                 << "price" << price.netto;
@@ -898,7 +942,7 @@ int main() {
             //qCritical() << calcState.toString();
 
             calcState = compute_duration_for_parking_ticket(&cfg, s,
-                                                (double)9000, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
+                                                (double)50, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_BUS));
             qCritical() << end.toString(Qt::ISODate);
             qCritical() << calcState.toString();
         }
@@ -991,6 +1035,7 @@ int main() {
                                                                  PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW),
                                                                  paymentOptionIndex, s);
 
+#if 0
             qCritical() << "minimal parking price" << minimal_parking_price;
 
             for (int i = 0; i < 8; ++i) {
@@ -1000,6 +1045,7 @@ int main() {
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
 
+#else
             s.setTime(QTime(15, 0, 0));
 
             minimal_parking_price = get_minimal_parkingprice(&cfg,
@@ -1014,6 +1060,7 @@ int main() {
                                                     end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
                 qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
             }
+#endif
         }
     }
 #endif
@@ -1532,7 +1579,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);
@@ -1555,7 +1602,7 @@ int main() {
                         }
 
                         qCritical() << "compute_price_for_parking_ticket()/GetCostFromDuration() TIME: "
-                                    << timeSteps.at(i) << "PRICE=" << price1;
+                                    << timeSteps.at(i) << "PRICE=" << price1 << "end=" << end.toString(Qt::ISODate);
 
 
                         //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 4,
@@ -1639,7 +1686,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1723,7 +1770,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1808,7 +1855,7 @@ int main() {
                             double cost = 0;
                             CalcState cs;
 
-                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                            if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                                 cost = price.netto;
                                 qCritical() << "step" << *step << ": cost" << cost;
                             } else {
@@ -1866,7 +1913,7 @@ int main() {
                         double cost = 0;
                         CalcState cs;
 
-                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price))) {
+                        if ((cs = compute_price_for_parking_ticket(&cfg, start, *step, end, &price, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {
                             cost = price.netto;
                             qCritical() << "step" << *step << ": cost" << cost;
                         } else {
@@ -1969,7 +2016,7 @@ int main() {
                 CalcState cs;
                 for (int i = 13, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                     QDateTime end = start.addSecs(timeSteps.at(i)*60);
-                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                    cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                     qCritical() << endl;
                 }
 
@@ -1994,7 +2041,7 @@ int main() {
                     for (int i = 0, j=timeSteps.size() ; i < timeSteps.size(); --j, ++i) {
                         QDateTime end = start.addSecs(timeSteps.at(i)*60);
 
-                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs);
+                        cs = compute_price_for_parking_ticket(&cfg, start, timeSteps.at(i), end, &costs, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING));
                         if (cs.getStatus() != CalcState::State::SUCCESS) {
                             if (start.time().hour() >= 8 && start.time().hour() < 18) {
                                 qCritical() << "ERROR CALC-STATE-1=" << QString(cs);