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

library/include/mobilisis/calculate_price.h

@@ -266,7 +266,8 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
+                                                int UpDown, PermitType const &permitType);
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 
@@ -297,7 +298,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             time_t end_parking_time,
-                                            struct price_t *price);
+                                            struct price_t *price,
+                                            PermitType permitType);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
@@ -305,24 +307,28 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             int netto_parking_time,
                                             QDateTime &end_parking_time,    // return value
                                             struct price_t *price,          // return value
+                                            PermitType permitType,
                                             bool prepaid = true);
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             double cost,
-                                            QString &duration);
+                                            QString &duration,
+                                            PermitType permitType);
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
                                             double cost,
-                                            QDateTime &ticketEndTime);      // return value
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);      // return value
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
-                                            QDateTime &ticketEndTime);
+                                            QDateTime &ticketEndTime,
+                                            PermitType permitType);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
                                             parking_tariff_t *tariff,

library/include/mobilisis/calculator_functions.h

@@ -70,7 +70,8 @@ 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, bool nextDay = false, bool prepaid = false);
+    std::string GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
+                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
 	///  Gets cost from duration in seconds
@@ -81,7 +82,8 @@ public:
     /// <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, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, QDateTime &start_datetime, QDateTime & end_datetime, int durationMin,
+                               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/configuration.h

@@ -28,6 +28,7 @@
 #include "tariff_interpolation.h"
 #include "tariff_prepaid.h"
 #include "tariff_carryover.h"
+#include "tariff_permit_type.h"
 
 #include <QVector>
 #include <optional>
@@ -91,7 +92,12 @@ public:
     bool isDayIncludedAsSpecialDay(uint64_t businessHours, QDateTime const &dt) const;
     bool isDayIncludedAsSpecialDay(uint64_t businessHours, int specialDayId) const;
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
+    std::optional<QVector<ATBPaymentOption>> getPaymentOptionsForAllKeys() const;
+    std::optional<ATBPaymentOption> getPaymentOptionForId(int key) const;
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(PERMIT_TYPE permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(int permitType) const;
+    std::optional<ATBPaymentOption> getPaymentOptionForKey(QString const &permitType) const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
     std::optional<ATBInterpolation> getInterpolationType(int type) const;
@@ -103,8 +109,11 @@ public:
     std::optional<QVector<ATBTariffProduct>> getTariffProductForProductTypeName(QString const &permitTypeName) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
+    std::optional<QVector<ATBWeekDaysWorktime>> getAllWeekDayWorkTimes();
 
     std::optional<QDateTime> prepaidStart(QDateTime const &start, int prepaid_option_id);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType);
+    int getPaymentOptionIndex(PERMIT_TYPE permitType) const;
 
 private:
 	/// <summary>

library/include/mobilisis/payment_opt.h

@@ -15,6 +15,8 @@ public:
     void reset() {
         pop_id = 0;
         pop_label = "";
+        pop_product_id = -1;
+        pop_product_name = "";
         pop_payment_method_id = 0;
         pop_day_end_time = "";
         pop_day_night_end_time = "";
@@ -36,11 +38,17 @@ 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;
     }
 
     int pop_id;
     std::string pop_label;
+    int pop_product_id;
+    QString pop_product_name;
     int pop_payment_method_id;
+    QString pop_use_only_upto_datetime;
+    int pop_use_only_for_duration;
     std::string pop_day_end_time;
     std::string pop_day_night_end_time;
     double pop_price_night;

library/include/mobilisis/tariff_permit_type.h

@@ -122,6 +122,59 @@ struct PermitType {
         return 7;
     }
 
+    static PERMIT_TYPE toPermitType(QString const permitTypeStr) {
+        if (permitTypeStr == "DAY_TICKET") {
+            return PERMIT_TYPE::DAY_TICKET;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CHILD") {
+            return PERMIT_TYPE::DAY_TICKET_CHILD;
+        } else
+        if (permitTypeStr == "DAY_TICKET_ADULT") {
+            return PERMIT_TYPE::DAY_TICKET_ADULT;
+        } else
+        if (permitTypeStr == "DAY_TICKET_TEEN") {
+            return PERMIT_TYPE::DAY_TICKET_TEEN;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING;
+        } else
+        if (permitTypeStr == "SZEGED_START") {
+            return PERMIT_TYPE::SZEGED_START;
+        } else
+        if (permitTypeStr == "SZEGED_STOP") {
+            return PERMIT_TYPE::SZEGED_STOP;
+        } else
+        if (permitTypeStr == "FOOD_STAMP") {
+            return PERMIT_TYPE::FOOD_STAMP;
+        } else
+        if (permitTypeStr == "TWENTY_FOUR_HOURS_TICKET") {
+            return PERMIT_TYPE::TWENTY_FOUR_HOURS_TICKET;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_PKW") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_PKW;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_BUS") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_BUS;
+        } else
+        if (permitTypeStr == "SHORT_TERM_PARKING_CAMPER") {
+            return PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER;
+        } else
+        if (permitTypeStr == "DAY_TICKET_PKW") {
+            return PERMIT_TYPE::DAY_TICKET_PKW;
+        } else
+        if (permitTypeStr == "DAY_TICKET_BUS") {
+            return PERMIT_TYPE::DAY_TICKET_BUS;
+        } else
+        if (permitTypeStr == "DAY_TICKET_CAMPER") {
+            return PERMIT_TYPE::DAY_TICKET_CAMPER;
+        }
+
+        return PERMIT_TYPE::INVALID;
+    }
+
     QString toString() {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:

library/include/mobilisis/weekdays_worktime.h

@@ -5,6 +5,8 @@ class ATBWeekDaysWorktime
 {
 public:
     int pwd_id;
+    int pwd_pop_id;
+    int pwd_next_id;
     int pwd_period_week_day_id;
 	int pwd_period_day_in_week_id;
 	std::string pwd_time_from;

library/src/calculate_price.cpp

@@ -34,9 +34,16 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
                                                   int paymentOptionIndex) {
     int minTime = 0;
 
+    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)
+        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
         minTime = cfg->getPaymentOptions(paymentOptionIndex).pop_min_time;
+        qCritical() << __func__ << __LINE__ << minTime;
     } break;
     case PERMIT_TYPE::DAY_TICKET_ADULT: {
     } break;
@@ -48,16 +55,19 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration const *cfg,
         // for each new sell-procedure, recomute the timesteps. implicitly, set
         // the minimal parking time.
         Calculator::GetInstance().ResetTimeSteps(paymentOptionIndex);
-        Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
+        qCritical() << __LINE__ << Calculator::GetInstance().GetTimeSteps((Configuration *)cfg, paymentOptionIndex);
         minTime = qRound(cfg->getPaymentOptions(paymentOptionIndex).pop_min_time);
     }
 
+    qCritical() << "minTime" << minTime;
     return minTime;
 }
 
 int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
                                                   PERMIT_TYPE permitType,
                                                   int paymentOptionIndex) {
+
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
     int maxTime = 0;
 
     switch(permitType) {
@@ -71,10 +81,10 @@ int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration const *cfg,
     case PERMIT_TYPE::DAY_TICKET_CHILD: {
     } break;
     default: ;
+        maxTime = cfg->getPaymentOptions(paymentOptionIndex).pop_max_time;
     }
 
     return maxTime;
-
 }
 
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
@@ -82,6 +92,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
                                                    int paymentOptionIndex,
                                                    QDateTime const &start) {
     int minPrice = -1;
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
 
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
@@ -96,7 +107,8 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg,
     case PERMIT_TYPE::DAY_TICKET: {
         minPrice = compute_product_price(cfg, permitType, start);
     } break;
-    default: ;
+    default:
+        minPrice = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
     }
 
     return minPrice;
@@ -214,7 +226,14 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
 
     } break;
     case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
-        qCritical() << "TODO: SHORT_TERM_PARKING_PKW";
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "SHORT_TERM_PARKING_PKW: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
     } break;
     case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
         qCritical() << "TODO: SHORT_TERM_PARKING_BUS";
@@ -223,15 +242,34 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg,
         qCritical() << "TODO: SHORT_TERM_PARKING_CAMPER";
     } break;
     case PERMIT_TYPE::DAY_TICKET_PKW: {
-        int const pop_daily_card_price = cfg->getPaymentOptions().pop_daily_card_price;
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
             qCritical() << "DAY_TICKET_PKW: daily ticket price" << pop_daily_card_price;
             return pop_daily_card_price;
+        }
     } break;
     case PERMIT_TYPE::DAY_TICKET_BUS: {
-        qCritical() << "TODO: DAY_TICKET_BUS";
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "DAY_TICKET_BUS: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
     } break;
     case PERMIT_TYPE::DAY_TICKET_CAMPER: {
-        qCritical() << "TODO: DAY_TICKET_CAMPER";
+        PermitType p(permitType);
+        std::optional<ATBPaymentOption> const paymentOption = cfg->getPaymentOptionForKey(p.get());
+        if (paymentOption.has_value()) {
+            ATBPaymentOption option = paymentOption.value();
+            int const pop_daily_card_price = option.pop_daily_card_price;
+            qCritical() << "DAY_TICKET_CAMPER: daily ticket price" << pop_daily_card_price;
+            return pop_daily_card_price;
+        }
     } break;
     default:
       break;
@@ -246,6 +284,8 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
     int maxPrice = -1;
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
+    paymentOptionIndex = cfg->getPaymentOptionIndex(permitType);
+
     switch(permitType) {
     case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
         if (paymentMethodId == PaymentMethod::Progressive || paymentMethodId == PaymentMethod::Steps) {
@@ -269,6 +309,18 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg,
         break;
     case PERMIT_TYPE::DAY_TICKET_CHILD:
         break;
+    case PERMIT_TYPE::DAY_TICKET_BUS:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_CAMPER:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_PKW:
+        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_BUS:
+        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_PKW:
+        break;
+    case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER:
+        break;
     default: ;
     }
 
@@ -338,11 +390,13 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
         if (! (*tariff)->ParseJson(*tariff, json.toStdString().c_str())) {
             delete *tariff;
             *tariff = nullptr;
+            qCritical() << "      ... error parsing tariff";
             return calcState.set(CalcState::State::ERROR_PARSING_TARIFF);
         }
     } else {
         delete *tariff;
         *tariff = nullptr;
+            qCritical() << "      ... error loading tariff";
         return calcState.set(CalcState::State::ERROR_LOADING_TARIFF);
     }
 
@@ -359,30 +413,41 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
 
 //
 // UpDown 1 -> up; 0 -> down
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
+int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes,
+                                                int UpDown, PermitType const &permitType)
 {
+
     qCritical() << "   compute_next_timestep()     currentTimeMinutes: " << currentTimeMinutes;
     qCritical() << "   compute_next_timestep() up/down (1=up, 0=down): " << UpDown;
 
+    std::optional<ATBPaymentOption> paymentOption = tariff->getPaymentOptionForKey(permitType.get());
+    if (!paymentOption.has_value()) {
+        return currentTimeMinutes;
+    }
+
+    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType);
+    qCritical() << "   compute_next_timestep()   payment option index: " << paymentOptionIndex;
+
+
     Configuration const *cfg = tariff;
 
     // compute payment method id (e.g. Linear=3, Steps=4)
     PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
     switch (paymentMethodId) {
     case PaymentMethod::Progressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Progressive";
+        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Progressive";
         break;
     case PaymentMethod::Degressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Degressive";
+        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Degressive";
         break;
     case PaymentMethod::Linear:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Linear";
+        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Linear";
         break;
     case PaymentMethod::Steps:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Steps";
+        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Steps";
         break;
     case PaymentMethod::Undefined:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Undefined";
+        qCritical() << __LINE__ << "   compute_next_timestep()     paymentMethodId: Undefined";
         break;
     }
 
@@ -392,7 +457,9 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
         // progressive tariff: e.g. Neuhauser, Kirchdorf (743)
         (paymentMethodId == PaymentMethod::Progressive))
     {
-        QList<int> &stepList = Calculator::GetInstance().GetTimeSteps(tariff);
+        // 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*";
@@ -484,10 +551,14 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
         time_t start_parking_time,  // in minutes
         time_t end_parking_time,    // netto time in minutes
-        struct price_t *price) {
+        struct price_t *price,
+        PermitType permitType) {    // permitType maps to product
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
+
+    int const paymentOptionIndex = tariff->getPaymentOptionIndex(permitType.get());
+
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -520,13 +591,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     if (start.isValid()) {
         double cost = Calculator::GetInstance().GetCostFromDuration(
                     tariff,
-                    tariff->getPaymentOptions().pop_payment_method_id,
+                    tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id,
                     start,
                     end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id)->second.pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
         price->units = cost;
@@ -544,6 +615,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         int netto_parking_time,
         QDateTime &end_parking_time,
         struct price_t *price,
+        PermitType permitType,
         bool prepaid)
 {
     CalcState calcState;
@@ -583,15 +655,30 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     double cost = -1;
     if (start_parking_time.isValid()) {
-        if (tariff->getPaymentOptions(paymentOptionIndex).pop_payment_method_id == PaymentMethod::Steps) {
+
+        // 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__ << ")"
+                             << 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);
+
+            qCritical() << "LINE" << __LINE__ << "netto" << netto_parking_time << lll;
+
+        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(tariff, start_parking_time, netto_parking_time, paymentOptionIndex);
             end_parking_time = start_parking_time.addSecs(netto_parking_time*60);
 
@@ -599,6 +686,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
             //             << "end_parking_time" << end_parking_time.toString(Qt::ISODate);
 
         } else {
+        // qCritical() << __func__ << __LINE__;
             cost = Calculator::GetInstance().GetCostFromDuration(
                         tariff,
                         tariff->getPaymentOptions().pop_payment_method_id,
@@ -607,9 +695,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                         netto_parking_time,         // minutes, netto
                         false, prepaid);
         }
+        // qCritical() << __func__ << __LINE__;
         double minCost = tariff->getPaymentOptions(paymentOptionIndex).pop_min_price;
         if (cost < minCost) {
-            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
+            calcState.setDesc(QString("line=%1 minCost=%2, cost=%3").arg(__LINE__).arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
         }
 
@@ -632,7 +721,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         time_t start_parking_time,
         double price,
-        QString &duration) {
+        QString &duration,
+        PermitType permitType) {
     CalcState calcState;
     QDate const d(1970, 1, 1);
     QTime const t(0, 0, 0);
@@ -666,7 +756,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         QDateTime const &start_parking_time,
         double price,
-        QDateTime &ticketEndTime)
+        QDateTime &ticketEndTime,
+        PermitType permitType)
 {
     CalcState calcState;
     if (start_parking_time.isValid()) {
@@ -754,7 +845,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
     return calcState.set(CalcState::State::SUCCESS);
 }
 
-CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff,
+                                                                  QDateTime const &start_parking_time,
+                                                                  QDateTime &ticketEndTime,
+                                                                  PermitType PermitType)
 {
     CalcState calcState;
     if (start_parking_time.isValid()) {

library/src/calculator_functions.cpp

@@ -9,6 +9,7 @@
 
 #include <sstream>
 #include <algorithm>
+#include <optional>
 #include <QDateTime>
 #include <QScopedArrayPointer>
 #include <QDebug>
@@ -121,6 +122,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             uint8_t payment_option,
                                             char const *startDatetimePassed, // given in local time
                                             double cost,
+                                            PermitType permitType,
                                             bool nextDay,
                                             bool prepaid)
 {
@@ -153,7 +155,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 }
 
                 // TODO: man braucht den richtigen Index
-                int paymentOptionIndex = 0;
+                int paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
                 int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
                 int const pop_max_price = cfg->getPaymentOptions(paymentOptionIndex).pop_max_price;
                 int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
@@ -271,7 +273,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
 
                 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 durationInSecs = 0;
                 for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
@@ -841,8 +843,11 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
                                          int paymentOptionIndex) const {
     // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
     // special days, nonstop.
+    qCritical() << __func__ << __LINE__;
+
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    if (paymentMethodId == PaymentMethod::Steps) {
+    if (paymentMethodId == PaymentMethod::Steps ||
+        paymentMethodId == PaymentMethod::Degressive) {
         QDateTime const end = start.addSecs(timeStepInMinutes*60);
         return GetCostFromDuration(cfg, start, end, paymentOptionIndex);
     }
@@ -854,8 +859,15 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
                                          QDateTime const &end,
                                          int paymentOptionIndex) const {
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    if (paymentMethodId == PaymentMethod::Steps) {
+
+    qCritical() << __func__ << __LINE__;
+
+    if (paymentMethodId == PaymentMethod::Steps ||
+        paymentMethodId == PaymentMethod::Degressive) {
         int const timeStepInMinutes = start.secsTo(end) / 60;
+
+        qCritical() << DBG_HEADER << "timeStepInMinutes" << timeStepInMinutes << start.toString(Qt::ISODate);
+
         return GetPriceForTimeStep(cfg, timeStepInMinutes, paymentOptionIndex);
     }
     return 0;
@@ -1239,23 +1251,25 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                                        QDateTime &start_datetime,
                                        QDateTime &end_datetime,
                                        int durationMinutes,
+                                       PermitType permitType,
                                        bool nextDay,
                                        bool prepaid) {
     Q_UNUSED(payment_option);
     Q_UNUSED(nextDay);
 
+    int const paymentOptionIndex = cfg->getPaymentOptionIndex(permitType.get());
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
     if (paymentMethodId == PaymentMethod::Steps) {
         if (tariffIs24_7(cfg)) {
             end_datetime = start_datetime.addSecs(durationMinutes*60);
-            return GetCostFromDuration(cfg, start_datetime, end_datetime);
+            return GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
         } else {
             if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
                 if (!prepaid) {
                     CalcState cs = isParkingAllowed(cfg, start_datetime);
                     if (cs) {
                         end_datetime = start_datetime.addSecs(durationMinutes*60);
-                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
+                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime, paymentOptionIndex);
                         end_datetime = start_datetime;
                         end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
                         return cost;
@@ -2130,9 +2144,6 @@ QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
 QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                      QDateTime const &s) const {
 
-    // TEST
-    // paymentOptionIndex = 1;
-
     if (DBG_LEVEL >= DBG_DEBUG) {
         qCritical() << "(" << __func__ << ":" << __LINE__ << ")              paymentOptionIndex:" << paymentOptionIndex;
     }
@@ -2147,14 +2158,20 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
         m_timeSteps[paymentOptionIndex].clear();
 
     } else {
-        // int diff = paymentOp m_timeSteps.size()
+        while (m_timeSteps.size() <= paymentOptionIndex) {
             m_timeSteps.push_back(QList<int>());
         }
+    }
 
     QDateTime start = s;
     start.setTime(QTime(s.time().hour(), s.time().minute(), 0));
 
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
+
+    if (DBG_LEVEL >= DBG_DEBUG) {
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                          pop_id:" << pop_id;
+    }
+
     int const pop_carry_over = cfg->getPaymentOptions(paymentOptionIndex).pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions(paymentOptionIndex).pop_time_step_config;
     int const pop_prepaid_option_id = cfg->getPaymentOptions(paymentOptionIndex).pop_prepaid_option_id;
@@ -2179,6 +2196,135 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                 int const step = Utilities::getTimeRangeStep(cfg, id, paymentMethodId);
                 m_timeSteps[paymentOptionIndex].append(step);
             }
+        } else
+        if (paymentMethodId == PaymentMethod::Degressive) { // e.g. fuchs, valser alm (fane) (502)
+            // with growing time, the price goes down
+            // for instance: until 13.59: price 8, from 14:00: price 5, then for the next day: 8
+            // for the following days: 8 euros
+
+            qCritical() << "(" << __func__ << ":" << __LINE__ << ")       degressive";
+            m_timeSteps[paymentOptionIndex].clear();
+
+            // lookup pop_next_id in worktimes;
+            std::optional<QVector<ATBWeekDaysWorktime>> const &w = cfg->getAllWeekDayWorkTimes();
+            if (w.has_value()) {
+                QVector<ATBWeekDaysWorktime> const &vec = w.value();
+
+                if (pop_carry_over) {
+                    for (int i = 0; i < vec.size(); ++i) {
+                        QTime const &from = QTime::fromString(QString::fromStdString(vec[i].pwd_time_from), Qt::ISODate);
+                        QString const &toStr = QString::fromStdString(vec[i].pwd_time_to);
+                        QTime const &to = QTime::fromString(toStr, Qt::ISODate);
+
+                        int weekDayId = vec[i].pwd_period_day_in_week_id;
+                        if (start.date().dayOfWeek() == weekDayId) {
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << weekDayId;
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") to" << to.toString(Qt::ISODate);
+                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+
+                            if (start.time() >= from) {
+                                qCritical() << "(" << __func__ << ":" << __LINE__ << ") from" << from.toString(Qt::ISODate);
+                                if (start.time() < to) {
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") start" << start.toString(Qt::ISODate);
+
+                                    int runtimeInMinutes = (start.time().secsTo(to) / 60);
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") runTimeInMinutes" << runtimeInMinutes;
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ") index" << paymentOptionIndex;
+
+                                    m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+
+                                    cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
+
+                                    int pop_id = vec[i].pwd_pop_id;
+                                    int pwd_id = vec[i].pwd_id;
+                                    int pop_next_id = vec[i].pwd_next_id;
+
+                                    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                        int const durationId = itr->second.pra_payment_unit_id;
+
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
+                                        // int const price = itr->second.pra_price;
+
+                                        auto search = cfg->Duration.find(durationId);
+                                        if (search != cfg->Duration.end()) {
+                                            ATBDuration duration = search->second;
+                                            duration.pun_duration = runtimeInMinutes;
+                                            search->second = duration;
+                                        }
+                                    }
+
+                                    if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
+                                        // on the same day
+                                        start.setTime(to);
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                    } else {
+                                        // on the next day
+                                        start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
+                                        start = start.addDays(1);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                    }
+
+
+                                    while ((s.secsTo(start) / 60) < 5000) {
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+
+                                        pop_id = vec[i].pwd_pop_id;
+                                        pwd_id = vec[i].pwd_id;
+                                        pop_next_id = vec[i].pwd_next_id;
+
+                                        runtimeInMinutes += (start.time().secsTo(to) / 60);
+
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pwd_id " << pwd_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id " << pop_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_next_id " << pop_next_id;
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") nextTimeStep" << nextTimeStep;
+
+                                        // ATBPaymentOption o = cfg->getPaymentOptionForId();
+
+                                        m_timeSteps[paymentOptionIndex] << runtimeInMinutes;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX pop" << pop_id;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX index" << paymentOptionIndex;
+
+#if 0
+                                        for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
+                                            int const durationId = itr->second.pra_payment_unit_id;
+
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << durationId;
+                                            // int const price = itr->second.pra_price;
+
+                                            auto search = cfg->Duration.find(durationId);
+                                            if (search != cfg->Duration.end()) {
+                                                ATBDuration duration = search->second;
+                                                duration.pun_duration = runtimeInMinutes;
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  XXXXXX durationId" << runtimeInMinutes;
+                                                search->second = duration;
+                                            }
+                                        }
+#endif
+
+                                        if (weekDayId == vec[pop_next_id].pwd_period_day_in_week_id) {
+                                            // on the same day
+                                            start.setTime(to);
+                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                        } else {
+                                            // on the next day
+                                            start.setTime(QTime::fromString(QString::fromStdString(vec[pop_next_id].pwd_time_from), Qt::ISODate));
+                                            start = start.addDays(1);
+
+                                            //qCritical() << "(" << __func__ << ":" << __LINE__ << ") next start" << start.toString(Qt::ISODate);
+                                        }
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") until" << s.secsTo(start) / 60;
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
         } else {
             uint16_t timeStepCompensation = 0;
 
@@ -2289,6 +2435,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                         QDateTime nextTimeStep = start;
                         int runtimeInMinutes = 0;
 
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+
                         int const pop_truncate_last_interpolation_step = cfg->getPaymentOptions(paymentOptionIndex).pop_truncate_last_interpolation_step;
 
                         // TODO: auslagern
@@ -2303,8 +2451,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                             }
                         }
 
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+
                         for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr) {
                             int const durationId = itr->second.pra_payment_unit_id;
+
+                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")  durationId" << durationId;
                             // int const price = itr->second.pra_price;
 
                             auto search = cfg->Duration.find(durationId);
@@ -2321,11 +2473,14 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                     break;
                                 }
 
+                                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";
 
                                         interpolation.dynamic_start = start.time();
                                         interpolation.dynamic_start.setHMS(start.time().hour(), start.time().minute(), 0);
@@ -2342,6 +2497,8 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         runtimeInMinutes += duration.pun_duration;
                                         nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
+                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+
                                         if (nextTimeStep.time() > carryOverStart) {
                                             int const backTime = carryOverStart.secsTo(nextTimeStep.time()) / 60;
                                             runtimeInMinutes -= backTime;
@@ -2376,15 +2533,43 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         search->second = duration;
                                     } else
                                     if (duration.pun_interpolation_id == (int)ATBInterpolation::NO_INTERPOLATION) {
-#if 0
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (1):" << runtimeInMinutes;
+
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
+
+                                        if (paymentOptionIndex == 1) { // testing TODO: muss in die payment options hinein
+                                            if (runtimeInMinutes == 0) {
+                                                if (start.time() < carryOverStart) {
+                                                    runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
+                                                    duration.pun_duration = runtimeInMinutes;
+                                                    m_timeSteps[paymentOptionIndex] << duration.pun_duration;
+                                                    search->second = duration;
+                                                    continue;
+                                                }
+                                            }
+                                        }
+
+                                        if (runtimeInMinutes == 0) {
+                                            if (start.time() < carryOverStart) {
+                                                runtimeInMinutes = start.time().secsTo(carryOverStart) / 60;
+                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+                                                qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
+                                                duration.pun_duration = runtimeInMinutes;
+                                                m_timeSteps[paymentOptionIndex] << duration.pun_duration;
+                                                search->second = duration;
+                                                cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = runtimeInMinutes;
+                                            }
+                                            continue;
+                                        }
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes:" << runtimeInMinutes;
+
+
                                         QDateTime s = start.addSecs(runtimeInMinutes * 60);
                                         int const minutes = s.time().secsTo(carryOverStart) / 60;
 
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            minutes:" << minutes;
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            start:" << start.toString(Qt::ISODate);
-                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")            s:" << s.toString(Qt::ISODate);
+#if 0
                                         if (minutes > 0) {
                                             runtimeInMinutes += minutes;
                                             previous.pun_duration += minutes;
@@ -2397,17 +2582,12 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                         }
 #endif
 
-                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (0):" << runtimeInMinutes;
+                                        nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
                                         runtimeInMinutes += duration.pun_duration;
                                         nextTimeStep = start.addSecs(runtimeInMinutes * 60);
 
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")                  carry over start:" << carryOverStart.toString(Qt::ISODate);
-
                                         // TOOO: truncate-flag == false
                                         if (nextTimeStep.time() > carryOverStart) {
                                             int const backTime = carryOverStart.secsTo(nextTimeStep.time());
@@ -2422,20 +2602,18 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
                                             nextTimeStep.setTime(carryOverStart);
                                         }
 
-                                        if (DBG_LEVEL >= DBG_DEBUG) {
+                                        //if (DBG_LEVEL >= DBG_DEBUG) {
+                                            qCritical() << "(" << __func__ << ":" << __LINE__ << ")                            pun_id:" << duration.pun_id;
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")                      pun duration:" << duration.pun_duration;
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")                    next time step:" << nextTimeStep.toString(Qt::ISODate);
                                             qCritical() << "(" << __func__ << ":" << __LINE__ << ")            runtime in minutes (2):" << runtimeInMinutes;
-                                        }
+                                        //}
 
                                         duration.pun_duration = runtimeInMinutes;
-
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")            pun_id:" << duration.pun_id;
-                                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ")      pun_duration:" << duration.pun_duration;
-
                                         m_timeSteps[paymentOptionIndex] << duration.pun_duration;
                                         search->second = duration;
                                     } else {
+                                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")  HIER NICHT";
                                         cfg->Duration.erase(search);
                                     }
                                 }
@@ -2492,12 +2670,16 @@ QList<int> &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex,
 
 uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int paymentOptionIndex) const {
 
+    // test
+    // paymentOptionIndex = 1;
+
     int const pop_id = cfg->getPaymentOptions(paymentOptionIndex).pop_id;
     int const pop_accumulate_prices = cfg->getPaymentOptions(paymentOptionIndex).pop_accumulate_prices;
 
     uint32_t price = 0;
 
-    //qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") timeStep" << timeStep;
+    qCritical() << "(" << __func__ << ":" << __LINE__ << ") pop_id" << pop_id;
 
     for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
     {
@@ -2506,18 +2688,30 @@ uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep, int p
 
         Q_ASSERT(pun_id == payment_unit_id);
 
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << pun_id;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_unit_id" << payment_unit_id;
+
+
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(1)->second.pun_duration;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(2)->second.pun_duration;
+        qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg->Duration.find(3)->second.pun_duration;
+
         int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        //int const pun_duration = cfg->Duration.find(2)->second.pun_duration;
         if (pop_accumulate_prices) {
             price += itr->second.pra_price;
         } else {
             price = (uint32_t)(itr->second.pra_price);
         }
 
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") price" << price;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_id" << cfg->Duration.find(payment_unit_id)->second.pun_id;
-        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") pun_duration" << pun_duration;
+        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;
             return price;
         }
     }
@@ -2657,14 +2851,53 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                 }
                 // [[fallthrough]];
                 case PERMIT_TYPE::DAY_TICKET: {
+                } break;
+                case PERMIT_TYPE::DAY_TICKET_PKW: {
+                    PermitType const permitType(PERMIT_TYPE::DAY_TICKET_PKW);
+                    std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
+                    if (paymentOption) {
+                        ATBPaymentOption option = paymentOption.value();
+                        int pop_id = option.pop_id;
+                        int pop_daily_card_price = option.pop_daily_card_price;
+                        qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+                        qCritical() << "            PERMIT-TYPE:" << permitType.toString();
+                        qCritical() << "              option id:" << pop_id;
+                        qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
+
+                        price.netto = pop_daily_card_price;
+                        value = value.value_or(price);
                     }
-                // [[fallthrough]];
-                case PERMIT_TYPE::SZEGED_START:
-                    // [[fallthrough]];
-                case PERMIT_TYPE::SZEGED_STOP:
-                    // [[fallthrough]];
-                case PERMIT_TYPE::INVALID:
-                    break;
+                } break;
+                case PERMIT_TYPE::DAY_TICKET_BUS: {
+                } break;
+                case PERMIT_TYPE::DAY_TICKET_CAMPER: {
+                } break;
+                case PERMIT_TYPE::SHORT_TERM_PARKING_PKW: {
+                    PermitType const permitType(PERMIT_TYPE::SHORT_TERM_PARKING_PKW);
+                    std::optional<ATBPaymentOption> paymentOption = cfg->getPaymentOptionForKey(permitType.get());
+                    if (paymentOption) {
+                        ATBPaymentOption option = paymentOption.value();
+                        int pop_id = option.pop_id;
+                        int pop_daily_card_price = option.pop_daily_card_price;
+                        qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+                        qCritical() << "            PERMIT-TYPE:" << permitType.toString();
+                        qCritical() << "              option id:" << pop_id;
+                        qCritical() << "daily_ticket_card_price:" << pop_daily_card_price;
+
+                        price.netto = pop_daily_card_price;
+                        value = value.value_or(price);
+                    }
+                } break;
+                case PERMIT_TYPE::SHORT_TERM_PARKING_BUS: {
+                } break;
+                case PERMIT_TYPE::SHORT_TERM_PARKING_CAMPER: {
+                } break;
+                case PERMIT_TYPE::SZEGED_START: {
+                } break;
+                case PERMIT_TYPE::SZEGED_STOP: {
+                } break;
+                case PERMIT_TYPE::INVALID: {
+                } break;
             }
         } else {
             // for projects which have not defined a daily ticket in their

library/src/configuration.cpp

@@ -582,6 +582,22 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                             this->currentPaymentOptions.last().pop_id = k->value.GetInt();
                         } else if (strcmp(inner_obj_name, "pop_label") == 0) {
                             this->currentPaymentOptions.last().pop_label = k->value.GetString();
+                        } else if (strcmp(inner_obj_name, "pop_product_id") == 0) {
+                            this->currentPaymentOptions.last().pop_product_id = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_product_name") == 0) {
+                            if (k->value.IsString()) {
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                this->currentPaymentOptions.last().pop_product_name = s;
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_use_only_upto_datetime") == 0) {
+                            if (k->value.IsString()) {
+                                QString const &s = QString::fromStdString(k->value.GetString());
+                                this->currentPaymentOptions.last().pop_use_only_upto_datetime = s;
+                            }
+                        } else if (strcmp(inner_obj_name, "pop_use_only_for_duration") == 0) {
+                            if (k->value.IsInt()) {
+                                this->currentPaymentOptions.last().pop_use_only_for_duration = 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) {
@@ -712,6 +728,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                         break;*/
                      case MemberType::WeekDaysWorkTimeType:
                         if (strcmp(inner_obj_name, "pwd_id") == 0) WeekDaysWorktime.pwd_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pwd_pop_id") == 0) WeekDaysWorktime.pwd_pop_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pwd_next_id") == 0) WeekDaysWorktime.pwd_next_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pwd_period_week_day_id") == 0) WeekDaysWorktime.pwd_period_week_day_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pwd_period_day_in_week_id") == 0) WeekDaysWorktime.pwd_period_day_in_week_id = k->value.GetInt();
                         else if (strcmp(inner_obj_name, "pwd_time_from") == 0) WeekDaysWorktime.pwd_time_from = k->value.GetString();
@@ -864,7 +882,7 @@ std::optional<QDateTime> Configuration::getInterpolationEnd(QDateTime const &sta
                 ATBInterpolation interpolation = ipolCheck.value();
                 switch (duration.pun_interpolation_id) {
                     case static_cast<int>(ATBInterpolation::NO_INTERPOLATION):
-                        //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ") NO_INTERPOLATION";
                     break;
                     case static_cast<int>(ATBInterpolation::STATIC_WALLCLOCK_TIME_VALUES):
                         //qCritical() << "(" << __func__ << ":" << __LINE__ << ") TODO";
@@ -1124,6 +1142,37 @@ Configuration::getTariffProductForProductTypeName(QString const &permitTypeName)
     return value;
 }
 
+int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) {
+
+    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
+    if (paymentOptions) {
+        QVector<ATBPaymentOption> const vec = paymentOptions.value();
+        PermitType const p(permitType);
+        for (int i = 0; i < vec.size(); ++i) {
+            if (vec[i].pop_product_name == p.toString()) {
+               return i;
+            }
+        }
+    }
+
+    return 0;
+}
+
+int Configuration::getPaymentOptionIndex(PERMIT_TYPE permitType) const {
+    std::optional<QVector<ATBPaymentOption>> paymentOptions = getPaymentOptionsForAllKeys();
+    if (paymentOptions) {
+        QVector<ATBPaymentOption> const vec = paymentOptions.value();
+        PermitType const p(permitType);
+        for (int i = 0; i < vec.size(); ++i) {
+            if (vec[i].pop_product_name == p.toString()) {
+               return i;
+            }
+        }
+    }
+
+    return 0;
+}
+
 std::optional<QVector<ATBTariffProduct>>
 Configuration::getTariffProductForProductId(PermitType permitType) const {
     QString permitTypeName(permitType);
@@ -1233,6 +1282,61 @@ Configuration::getDailyTicketsForKey(int key) const {
     return value;
 }
 
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForId(int key) const {
+    ATBPaymentOption option;
+    std::optional<ATBPaymentOption> value;
+
+    for (auto[it, rangeEnd] = this->PaymentOption.equal_range(key); it != rangeEnd; ++it) {
+        value = value.value_or(it->second);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBPaymentOption>>
+Configuration::getPaymentOptionsForAllKeys() const {
+    QVector<ATBPaymentOption> paymentOptions;
+    std::optional<QVector<ATBPaymentOption>> value;
+    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
+        it != this->PaymentOption.cend(); ++it) {
+        paymentOptions.append(it->second);
+    }
+
+    if (paymentOptions.size() > 0) {
+        value = value.value_or(paymentOptions);
+    }
+
+    return value;
+}
+
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(PERMIT_TYPE permitType) const {
+    return getPaymentOptionForKey(static_cast<int>(permitType));
+}
+
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(int permitType) const {
+    std::optional<ATBPaymentOption> value;
+
+    for (std::multimap<int, ATBPaymentOption>::const_iterator it = this->PaymentOption.cbegin();
+        it != this->PaymentOption.cend(); ++it) {
+        ATBPaymentOption const &paymentOption = it->second;
+        if (paymentOption.pop_product_id == permitType) {
+            value = value.value_or(paymentOption);
+            break;
+        }
+    }
+
+    return value;
+}
+
+std::optional<ATBPaymentOption>
+Configuration::getPaymentOptionForKey(QString const &permitTypeStr) const {
+    PERMIT_TYPE permitType = PermitType::toPermitType(permitTypeStr);
+    return getPaymentOptionForKey(static_cast<int>(permitType));
+}
+
 std::optional<QVector<ATBPaymentRate>>
 Configuration::getPaymentRateForAllKeys() const {
     QVector<ATBPaymentRate> paymentRates;
@@ -1282,6 +1386,25 @@ Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
     return std::nullopt;
 }
 
+std::optional<QVector<ATBWeekDaysWorktime>>
+Configuration::getAllWeekDayWorkTimes() {
+    QVector<ATBWeekDaysWorktime> worktimes;
+    std::optional<QVector<ATBWeekDaysWorktime>> value;
+
+    worktimes.clear();
+
+    for (std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.cbegin();
+        it != this->WeekDaysWorktime.cend(); ++it) {
+        worktimes.append(it->second);
+    }
+
+    if (worktimes.size() > 0) {
+        value = value.value_or(worktimes);
+    }
+
+    return value;
+}
+
 std::optional<ATBWeekDaysWorktime>
 Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
     ATBWeekDaysWorktime worktime;

main/main.cpp

@@ -738,10 +738,11 @@ int main() {
                 }
 
 #if 1
+                PermitType permitType(PERMIT_TYPE::SHORT_TERM_PARKING);
                 for (int i = 200; i <= 200; i += 10) {
                     cost = i;
 
-                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end))) {      // return value
+                    if ((cs = compute_duration_for_parking_ticket(&cfg, start, cost, end, permitType))) {      // return value
                     }
 
                     if (!cs) {