check for time-step-config == STATIC

compute_duration_for_parking_ticket():
Fix: handle carry-over for coin-insertion.
2024-08-21 17:46:35 +02:00 · 2024-08-21 15:40:55 +02:00 · 2024-08-21 15:39:44 +02:00 · 2024-08-21 15:39:05 +02:00 · 2024-08-21 15:38:06 +02:00 · 2024-08-21 15:35:03 +02:00
7 changed files with 383 additions and 201 deletions
--- a/library/include/mobilisis/payment_opt.h
+++ b/library/include/mobilisis/payment_opt.h
@@ -38,8 +38,11 @@ public:
        pop_daily_card_price = -1;
        pop_business_hours = -1;
        pop_time_step_config = -1;
-        pop_use_only_upto_datetime = "";
-        pop_use_only_for_duration = 0;
+        pop_use_only_upto_datetime = ""; // deprecated
+        pop_use_only_for_duration = 0;   // deprecated
+        pop_plus_steps = 1;  // +: jump <x=1> steps forward
+        pop_minus_steps = 1; // -: jump <x=1> steps backward
+        pop_allow_overpay = false;
    }

    int pop_id;
@@ -69,6 +72,9 @@ public:
    int pop_time_step_config;
    bool pop_accumulate_prices;
    bool pop_accumulate_durations;
+    int pop_plus_steps;
+    int pop_minus_steps;
+    bool pop_allow_overpay;

    struct ATBMaxDateTime {
        int direction;
--- a/library/include/mobilisis/utilities.h
+++ b/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
--- a/library/src/calculate_price.cpp
+++ b/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>
@@ -462,8 +464,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() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
+    qCritical() << __LINE__ << "compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
+    qCritical() << __LINE__ << "compute_next_timestep() up/down (1=up, 0=down): " << UpDown;

    // FIXME
    //std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
@@ -473,7 +475,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 +488,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 +508,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() << "   compute_next_timestep()            timeSteps:" << stepList;
-        qCritical() << "   compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;
+        qCritical() << __LINE__ << "compute_next_timestep()      first time step:" << stepList[0];
+        qCritical() << __LINE__ << "compute_next_timestep()            timeSteps:" << stepList;
+        qCritical() << __LINE__ << "compute_next_timestep() currentTimeInMinutes:" << currentTimeMinutes;

        // 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];
-                return stepList[currentStepIndex + 1];
+                int const rest = currentStepIndex % pop_plus_steps;
+
+                if (rest) {
+                    currentStepIndex -= rest;
+                }
+
+                qCritical() << __LINE__ << "compute_next_timestep() currentStepIndex (" << currentStepIndex << ")";
+
+                int const nextStepIndex = currentStepIndex + pop_plus_steps;
+
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
        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];
-                return stepList[currentStepIndex - 1];
+                int const nextStepIndex = currentStepIndex - pop_minus_steps;
+                qCritical() << __LINE__ << "compute_next_timestep()       next step index:" << nextStepIndex;
+                if (nextStepIndex >= 0 && nextStepIndex < stepList.size()) {
+                    qCritical() << __LINE__ << "compute_next_timestep() return next time step:" << stepList[nextStepIndex];
+                    return stepList[nextStepIndex];
+                }
            }
        }
    } else
@@ -660,7 +710,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        parking_tariff_t *tariff,
-        QDateTime &start_parking_time,
+        QDateTime &start_parking_time_,
        int netto_parking_time,
        QDateTime &end_parking_time,
        struct price_t *price,
@@ -669,6 +719,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 {
    CalcState calcState;

+    QDateTime start_parking_time(start_parking_time_);
+
    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);

    double minMin = tariff->getPaymentOptions(paymentOptionIndex).pop_min_time;
@@ -682,9 +734,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                << "               start + netto: " << start_parking_time.addSecs(netto_parking_time * 60) << endl
                << "                      minMin: " << minMin << endl
                << "                      maxMin: " << maxMin
+                << "                     prepaid: " << prepaid
                << "                  permitType: " << permitType.toString();

-
    if (netto_parking_time < 0) {
        calcState.setDesc(QString("end=%1, start=%2")
                          .arg(end_parking_time.toString(Qt::ISODate),
@@ -705,59 +757,71 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(

    double cost = -1;
    if (start_parking_time.isValid()) {
-
-        // qCritical() << __func__ << __LINE__;
-
        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps ||
            tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Degressive) {
-        // qCritical() << __func__ << __LINE__;
            // hier muesste man unterscheiden: uebertrag oder nicht?
            calcState = Calculator::GetInstance().isParkingAllowed(tariff, start_parking_time,
                                                                   netto_parking_time, paymentOptionIndex);
            if (calcState.getStatus() == CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME) {
-                 qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                             << calcState.toString();
-        // qCritical() << __func__ << __LINE__;
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << calcState.toString();
                return calcState;
            }
-        // qCritical() << __func__ << __LINE__;

-            QList<int> lll = Calculator::GetInstance().GetTimeSteps(tariff);
+            QList<int> tlist = Calculator::GetInstance().GetTimeSteps(tariff);
+            Q_UNUSED(tlist);

-            // netto_parking_time = compute_next_timestep(tariff, netto_parking_time, 1, permitType);
-
-            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
-
-        // qCritical() << __func__ << __LINE__;
+            // compute cost (price)
            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;
-            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;
+            int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+            qCritical() << __func__ << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;

-            qCritical() << "LINE" << __LINE__ << "carryStart" << carryOverStart.toString(Qt::ISODate);
-            qCritical() << "LINE" << __LINE__ << "carryDur" << carryOverDuration;
-            qCritical() << "LINE" << __LINE__ << "start" << start_parking_time.toString(Qt::ISODate);
-
-            if (start_parking_time.time() > carryOverStart) {
-                //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);
+            std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+            if (yperiod.has_value()) {
+                ATBPeriodYear const &period = yperiod.value();
+                pop_carry_over_option_id = period.pye_id;
+                qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
            }

-            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() << "LINE" << __LINE__ << "start" << start_parking_time.toString(Qt::ISODate);
-            qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                         << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
+            qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+            qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+            // handle prepaid option
+            QDateTime effectiveStartTime(start_parking_time);
+            int const prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+            std::optional<ATBPrepaid> prepaidOption = tariff->getPrepaidType(prepaid_option_id);
+            if (prepaidOption.has_value()) {
+                ATBPrepaid const &p = prepaidOption.value();
+                if (p.never) {
+                    qCritical() << __func__ << __LINE__ << "prepaid: no";
+                } else {
+                    if (start_parking_time.time() < p.static_end) {     // static_end: e.g. 08:00:00
+                        effectiveStartTime.setTime(p.static_end);
+                    } else
+                    if (start_parking_time.time() > p.static_start) {   // static_start: e.g. 22:00:00
+                        effectiveStartTime.setTime(p.static_start);
+                    }
+                }
+            }
+
+            // 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,8 +838,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
        }

        // DEBUG
-        qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
-        qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;
+        //qCritical() << __LINE__ << "            end_parking_time: " << end_parking_time;
+        //qCritical() << __LINE__ << "  -> calculated cost (netto): " << cost;

        price->brutto = price->vat = price->vat_percentage = 0;
        price->units = cost;
@@ -785,6 +849,12 @@ 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);
 }

@@ -845,18 +915,43 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
    bool prepaid = true;
    int paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
    int prepaid_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
+
    if (prepaid_option_id == 2) {
        prepaid = false;
    }
    bool const nextDay = false;

    // DEBUG
-    qCritical() << "compute_duration_for_parking_ticket(2): ";
-    qCritical() << " payment option index: " << paymentOptionIndex;
-    qCritical() << "              prepaid: " << prepaid;
-    qCritical() << "                price: " << price;
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "compute_duration_for_parking_ticket(2): ";
+        qCritical() << " payment option index: " << paymentOptionIndex;
+        qCritical() << "              prepaid: " << prepaid;
+        qCritical() << "                price: " << price;
+    }

    if (start_parking_time.isValid()) {
+
+        int const pop_time_step_config = tariff->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
+        if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+            // 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);
+                    }
+                }
+            }
+        }
+
        QString cs = start_parking_time.toString(Qt::ISODate);
        QString endTime = Calculator::GetInstance().GetDurationFromCost(
                    tariff,
@@ -924,15 +1019,70 @@ 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 (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::STATIC) {
+                // handle carry over for ticket-end-time
+                qCritical() << __func__ << ":" << __LINE__ << "ticketEndTime:" << ticketEndTime.toString(Qt::ISODate);
+
+                int weekDay = start_parking_time.date().dayOfWeek();
+                int pop_carry_over_option_id = tariff->getPaymentOptions(paymentOptionIndex).pop_carry_over_option_id;
+                qCritical() << __func__ << __LINE__ << "configured carry-over-id" << pop_carry_over_option_id;
+
+                std::optional<ATBPeriodYear> yperiod = Utilities::GetYearPeriodActive(tariff, start_parking_time);
+                if (yperiod.has_value()) {
+                    ATBPeriodYear const &period = yperiod.value();
+                    pop_carry_over_option_id = period.pye_id;
+                    qCritical() << __func__ << __LINE__ << "re-computed carry-over-id" << pop_carry_over_option_id;
+                }
+
+                QTime carryOverStart;
+                QTime carryOverEnd;
+                int carryOverDuration = -1;
+
+                // using TariffCarryOverType = std::multimap<int, ATBCarryOver>;
+                std::multimap<int, ATBCarryOver>::const_iterator it;
+                if ((it = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)) !=
+                    tariff->TariffCarryOverOptions.cend()) {
+                    carryOverStart = it->second.carryover[weekDay].static_start;
+                    carryOverEnd = it->second.carryover[weekDay].static_end;
+                    carryOverDuration = it->second.carryover[weekDay].duration;
+                }
+
+                if (carryOverStart.isValid() && carryOverEnd.isValid()) {
+                    qCritical() << __func__ << __LINE__ << "carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                    qCritical() << __func__ << __LINE__ << "carryOverEnd" << carryOverEnd.toString(Qt::ISODate);
+                    qCritical() << __func__ << __LINE__ << "carryOverDuration" << carryOverDuration;
+                }
+
+                if (carryOverStart.isValid() && carryOverEnd.isValid() && carryOverDuration != -1) {
+                    qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                    if (ticketEndTime.time() > carryOverStart) {
+                        qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                    } else {
+                        qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        if (ticketEndTime.time() < carryOverEnd) {
+                            qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                            ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                        }
+                    }
+                } else {
+                    qCritical() << __func__ << __LINE__ << "WARNING: wrong carry-over-settings";
+                }
+            }
+
+            if (ticketEndTime.time().hour() == 0 && ticketEndTime.time().minute() == 0) {
+                ticketEndTime = ticketEndTime.addDays(-1);
+                ticketEndTime.setTime(QTime(23, 59, 0));
+            }
+
+            // DEBUG
+            qCritical() << __func__ << __LINE__ << "      endTime:" << endTime;
+            qCritical() << __func__ << __LINE__ << "ticketEndTime:" << ticketEndTime;
        }
    } else {
        return calcState.set(CalcState::State::INVALID_START_DATE);
--- a/library/src/calculator_functions.cpp
+++ b/library/src/calculator_functions.cpp
@@ -135,14 +135,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);
-    qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
-    qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
-    qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
-    qCritical() << DBG_HEADER << "   cost (price):" << cost;
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << DBG_HEADER << "          start:" << inputDate.toString(Qt::ISODate);
+        qCritical() << DBG_HEADER << "   option index:" << paymentOptionIndex;
+        qCritical() << DBG_HEADER << "paymentMethodId:" << static_cast<int>(paymentMethodId);
+        qCritical() << DBG_HEADER << "        prepaid:" << prepaid;
+        qCritical() << DBG_HEADER << "   cost (price):" << cost;
+    }

    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) {

@@ -175,8 +181,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                    price = pra_price;
                }

-                //qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
-                //qCritical() << DBG_HEADER << "  duration id" << durationId;
+                // qCritical() << DBG_HEADER << "  PRICE" << price << "COST" << cost;
+                // qCritical() << DBG_HEADER << "  duration id" << durationId;

                auto search = cfg->Duration.find(durationId);
                if (search != cfg->Duration.end()) {
@@ -201,11 +207,16 @@ 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;
-                            qCritical() << DBG_HEADER << "configured minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+                            qCritical() << DBG_HEADER << "           minimal parking time (minutes):" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;

                            if (duration_previous < cfg->getPaymentOptions(paymentOptionIndex).pop_min_time) {
                                return CalcState::BELOW_MIN_PARKING_TIME.toStdString(); // minimal parking time is set by GetTimeSteps()
@@ -251,11 +262,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
+                int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;

                if (cost > pop_max_price) {
-                    cost = pop_max_price;
                    qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
-                    //return CalcState::OVERPAID.toStdString();
+                    if (pop_allow_overpay == false) {
+                        return CalcState::OVERPAID.toStdString();
+                    }
+                    cost = pop_max_price;
+                    // return CalcState::OVERPAID.toStdString();
                }

                if (cost < pop_min_price) {
@@ -287,6 +302,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;
@@ -418,6 +436,10 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                //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) {
@@ -465,6 +487,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                                    QTime pwd_time_from = QTime::fromString(QString::fromStdString(iter->second.pwd_time_from), Qt::ISODate);
                                                    if (next_working_time_from < pwd_time_from) {
                                                        next_working_time_from = pwd_time_from;
+                                                        qCritical() << DBG_HEADER << "next working time from" << next_working_time_from.toString(Qt::ISODate);
                                                        break;
                                                    }
                                                }
@@ -1004,7 +1027,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
    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 << "timeStepList" << timeStepInMinutes << tlist;
        qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);

        return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
@@ -2795,11 +2819,13 @@ 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;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex" << paymentOptionIndex;
    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;

@@ -2813,19 +2839,25 @@ 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;
-        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
+        if (pop_accumulate_durations) {
+            pun_duration += cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        } else {
+            pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        }
+
        if (pop_accumulate_prices) {
            price += itr->second.pra_price;
        } else {
            price = (uint32_t)(itr->second.pra_price);
        }

-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        if (DBG_LEVEL >= DBG_DEBUG) {
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+        }

        if (timeStep == pun_duration) {
            qCritical() << "(" << __func__ << ":" << __LINE__ << ") return price" << price;
--- a/library/src/configuration.cpp
+++ b/library/src/configuration.cpp
@@ -598,6 +598,18 @@ 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_allow_overpay") == 0) {
+                            if (k->value.IsBool()) {
+                                this->currentPaymentOptions.last().pop_allow_overpay = k->value.GetBool();
+                            }
                        } 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 +1011,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();
--- a/library/src/utilities.cpp
+++ b/library/src/utilities.cpp
@@ -207,7 +207,13 @@ bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt
                              dt.date().day());
                QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
                QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
-                return (d >= s && d <= e);
+                //qCritical() << __func__ << __LINE__ << "    d" << d.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "start" << s.toString(Qt::ISODate);
+                //qCritical() << __func__ << __LINE__ << "  end" << e.toString(Qt::ISODate);
+                if (s <= e) {
+                    return (d >= s && d <= e);
+                }
+                return (d >= s || d <= e);
            })) {
        qCritical() << "NO VALID YEAR PERIOD";
        return false;
@@ -215,6 +221,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)
 {
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -354,7 +354,7 @@ int main() {
        QList<int> timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
        qCritical() << "TimeSteps" << timeSteps;

-        return 0;
+        // return 0;

        CalcState cs;
        double cost;
@@ -363,7 +363,7 @@ int main() {

        // for (int day = Qt::Monday; day <= Qt::Sunday; ++day) {
        for (int day = Qt::Monday; day <= Qt::Monday; ++day) {
-            QDateTime s(QDate(2024, 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 +401,11 @@ int main() {
                                                        bool prepaid = true);
            */

-            for (int minutes = 0; minutes < 1440; ++minutes) {
-                QDateTime start = s.addSecs(minutes * 60);
-                QDateTime effectiveStart = start;
+            //for (int minutes = 0; minutes < 1440; ++minutes) {
+            for (int minutes = 540; minutes <= 540; ++minutes) {
+                // QDateTime start = s.addSecs(minutes * 60);
+                QDateTime start(QDateTime::currentDateTime());
+                QDateTime effectiveStart(QDateTime::currentDateTime());

                if (start.time() < QTime(8, 0, 0)) {
                    effectiveStart.setTime(QTime(8, 0, 0));
@@ -415,55 +417,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
-                        durationInMinutes = pop_min_time;
-                        if (i > 0) {
-                            durationInMinutes += (i/10) * 4;
-                        }
-                        offsetInMinutes = 0;
-
-                        if (effectiveStart.time() >= QTime(8, 0, 0) && effectiveStart.time() <= QTime(22, 0, 0)) {
-                            if (effectiveStart.time().secsTo(QTime(22, 0, 0)) < (durationInMinutes * 60)) {
-                                offsetInMinutes = 600; // 22:00 -> 8:00
-                            }
-                        }
-
-                        if (i == 0) {
-                            i += 20;
-                        }
-
-                        if ((durationInMinutes + offsetInMinutes) == (effectiveStart.secsTo(end) / 60)) {
-
-                            if (day == Qt::Monday && minutes >= 480 && minutes <= 1320) {
-                                qCritical() << "| start ............................" << start.toString(Qt::ISODate);
-                                qCritical() << "| cost ............................." << cost;
-                                qCritical() << "| durationInMinutes ................" << durationInMinutes
-                                            << "(" << (durationInMinutes - 60) << "+ 60 )";
-                                qCritical() << "| offsetInMinutes .................." << offsetInMinutes;
-                                qCritical() << "| end .............................." << end.toString(Qt::ISODate) << endl;
-                            }
-
-                            continue;
-                        }
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING)))) {      // return value
+                        qCritical() << "start" << start.toString(Qt::ISODate) << "< cost" << cost
+                                    << "> end" << end.toString(Qt::ISODate);
                    }

                    if (!cs) {
                        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 +517,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 +534,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() << __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
+                qCritical() << "start" << start.toString(Qt::ISODate);

+                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);
                }
            }
        }
@@ -737,7 +668,7 @@ int main() {
                    effectiveStart.setTime(QTime(7, 0, 0)); // next day
                }

-#if 1
+#if 0
                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
                for (int i = 200; i <= 200; i += 10) {
                    cost = i;
@@ -760,7 +691,7 @@ int main() {
                //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_PKW)))) {      // return value
                    }

                    if (!cs) {
@@ -898,7 +829,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 +922,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 +932,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 +947,7 @@ int main() {
                                                    end, PermitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW));
                qCritical() << "RUN" << i << end.toString(Qt::ISODate) << calcState.toString();
            }
+#endif
        }
    }
 #endif
@@ -1532,7 +1466,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 +1489,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 +1573,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 +1657,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 +1742,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 +1800,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 +1903,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 +1928,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);
Author	SHA1	Message	Date
Gerhard Hoffmann	a3983ed427	check for time-step-config == STATIC	2024-08-21 17:46:35 +02:00
Gerhard Hoffmann	f8805e9e78	compute_duration_for_parking_ticket(): Fix: handle carry-over for coin-insertion.	2024-08-21 15:40:55 +02:00
Gerhard Hoffmann	7a6360f392	compute_duration_for_parking_ticket(): Fix: handle prepaid-setting for coin-insertion.	2024-08-21 15:39:44 +02:00
Gerhard Hoffmann	08a249f393	return OVERPAID in case overpay is not allowed	2024-08-21 15:39:05 +02:00
Gerhard Hoffmann	7c173ae292	parse for pop_allow_overpay	2024-08-21 15:38:06 +02:00
Gerhard Hoffmann	80637260f3	Utilities::IsYearPeriodActive(): Fix: take into account if start-date <= end-date or not. Otherwise check is wrong, and no valid year period is returned.	2024-08-21 15:35:03 +02:00
Gerhard Hoffmann	9b524d63e5	Add 'pop_allow_overpay' setting: set vai tariff-file if operpay is allowed.	2024-08-21 15:33:02 +02:00
Siegfried Siegert	25b3143d88	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 14:37:42 +02:00
Gerhard Hoffmann	0856f10ca9	GetDurationFromCost(): Fix computation of end-time when pop_accumulate_durations is set in tariff-file.	2024-08-02 14:34:44 +02:00
Siegfried Siegert	88c703ecc2	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 13:21:54 +02:00
Gerhard Hoffmann	465b2274a1	compute_duration_for_parking_ticket(): Adapt end-time in case it is midnight: 00:00 -> 23:59	2024-08-02 13:15:11 +02:00
Siegfried Siegert	f946cd13e4	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:55:12 +02:00
Siegfried Siegert	8d1cbe7337	Merge branch 'kleipeda-experimental' of /home/siegert/atbfs01entwicklung/Elektronik/PTU/git_bare_repos/libmobilisis-calc into kleipeda-experimental	2024-08-02 11:29:10 +02:00
Gerhard Hoffmann	62c52fd580	test case for fuchs, fane alm.	2024-08-02 11:13:50 +02:00
Gerhard Hoffmann	1023f6ede1	GetPriceForTimeStep(): Use "pop_accumulate_durations" setting to sum up the durations. Otherwise time-step will not be found in time-step-list.	2024-08-02 11:12:07 +02:00
Gerhard Hoffmann	36b3e85d1b	GetCostFromDuration(): recompute timestep list to make sure that time step is found in it.	2024-08-02 11:11:20 +02:00
Gerhard Hoffmann	b394ed46cc	In case end-parking-time ends with 00:00, set it to 23:59.	2024-08-02 11:09:20 +02:00
Gerhard Hoffmann	3dda2d8355	Check if prepaid-option is set.	2024-08-02 11:08:52 +02:00
Gerhard Hoffmann	1152c3824e	Minor: add some debug output.	2024-08-02 11:08:32 +02:00
Gerhard Hoffmann	4271c0fb31	Fixed compute_next_timestep() for degressive tariff: compute_next_timestep() was actually never called for such a tariff.	2024-08-02 10:50:25 +02:00
Gerhard Hoffmann	24d9d4a0ff	test case for kleipeda and fuchs	2024-08-01 16:46:09 +02:00
Gerhard Hoffmann	4bce854d77	GetDurationFromCost(): Set durationInSecs in case 'pop_accumulate_prices' is not configured in tariff file.	2024-08-01 16:44:06 +02:00
Gerhard Hoffmann	138221759b	GetDurationFromCost(): Minor: removed some debug ouput	2024-08-01 16:43:19 +02:00
Gerhard Hoffmann	9cb7d4aea6	compute_price_for_parking_ticket(): Added handling for prepaid and carry-over.	2024-08-01 16:04:57 +02:00
Gerhard Hoffmann	cde490bab2	compute_next_time_step(): Added handling with pop_plus_steps/pop_minus_steps: '+' usually takes more than one time step. '-' is usually 1. Changed behaviour when current time is not found in the list of time steps: Search for the entry with the smallest distance to 'current time'. If the distance is smaller than 3 minutes, then use 'current time' as new entry in the list of time steps.	2024-08-01 16:00:10 +02:00
Gerhard Hoffmann	f0677374ec	Parsing of pop_plus_steps/pop_minus_steps	2024-08-01 15:46:49 +02:00
Gerhard Hoffmann	89b05ffadc	Added GetYearPeriodActive() to get active year period.	2024-08-01 15:45:50 +02:00
Gerhard Hoffmann	260973cd09	Added pop_plus_steps/pop_minus_steps to control step sizes	2024-08-01 15:44:06 +02:00