Merge branch 'neuhauser-kirchdorf' of git.mimbach49.de:GerhardHoffmann/MOBILISIS-Calculator into neuhauser-kirchdorf

assumption is prepaid.

library/include/mobilisis/calculate_price.h

@@ -18,6 +18,8 @@
 #define CALCULATE_LIBRARY_API
 #endif
 
+#include "tariff_permit_type.h"
+
 class Configuration;
 
 typedef Configuration parking_tariff_t;
@@ -39,17 +41,6 @@ struct CALCULATE_LIBRARY_API price_t {
     }
 };
 
-enum class PERMIT_TYPE : quint8 {
-    SHORT_TERM_PARKING,
-    DAY_TICKET,
-    SZEGED_START,
-    SZEGED_STOP,
-    DAY_TICKET_ADULT,
-    DAY_TICKET_TEEN,
-    DAY_TICKET_CHILD,
-    INVALID
-};
-
 struct CALCULATE_LIBRARY_API CalcState {
     enum class State : uint8_t {
         SUCCESS,
@@ -93,6 +84,51 @@ struct CALCULATE_LIBRARY_API CalcState {
         return (m_status == State::SUCCESS);
     }
 
+    QString toString() {
+        QString s;
+        switch (m_status) {
+        case State::SUCCESS:
+            s = "SUCCESS";
+            break;
+        case State::ERROR_PARSING_ZONE_NR:
+            s = "ERROR_PARSING_ZONE_NR";
+            break;
+        case State::ERROR_LOADING_TARIFF:
+            s = "ERROR_LOADING_TARIFF";
+            break;
+        case State::ERROR_PARSING_TARIFF:
+            s = "ERROR_PARSING_TARIFF";
+            break;
+        case State::NEGATIVE_PARING_TIME:
+            s = "NEGATIVE_PARKING_TIME";
+           break;
+        case State::ABOVE_MAX_PARKING_TIME:
+            s = "ABOVE_MAX_PARKING_TIME";
+            break;
+        case State::WRONG_PARAM_VALUES:
+            s = "WRONG_PARAM_VALUES";
+            break;
+        case State::BELOW_MIN_PARKING_TIME:
+            s = "BELOW_MIN_PARKING_TIME";
+            break;
+        case State::BELOW_MIN_PARKING_PRICE:
+            s = "BELOW_MIN_PARKING_PRICE";
+            break;
+        case State::OVERPAID:
+            s = "OVERPAID";
+            break;
+        case State::INVALID_START_DATE:
+            s = "INVALID_START_DATE";
+            break;
+        case State::WRONG_ISO_TIME_FORMAT:
+            s = "WRONG_ISO_TIME_FORMAT";
+            break;
+        case State::OUTSIDE_ALLOWED_PARKING_TIME:
+            s = "OUTSIDE_ALLOWED_PARKING_TIME";
+        }
+        return s + ":" + m_desc;
+    }
+
     explicit operator QString () const noexcept {
         QString s;
         switch (m_status) {
@@ -162,6 +198,7 @@ int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYP
 int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
+int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,

library/include/mobilisis/configuration.h

@@ -24,6 +24,7 @@
 #include "tariff_daily_ticket.h"
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
+#include "tariff_product.h"
 
 #include <QVector>
 #include <optional>
@@ -53,6 +54,7 @@ public:
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
     multimap<int, ATBCustomer> Customer;
+    multimap<int, ATBTariffProduct> TariffProduct;
 
 	/// <summary>
 	/// Parse JSON string
@@ -69,6 +71,9 @@ public:
     std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
     std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForAllKeys() const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(int id) const;
+    std::optional<QVector<ATBTariffProduct>> getTariffProductForProductId(PermitType permitType) const;
     std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
     std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 

library/include/mobilisis/member_type.h

@@ -18,7 +18,8 @@ enum MemberType
     CustomerType = 0x0B,
     TimeBaseType = 0x0C,
     TimeRangeType = 0x0D,
-    TimeStepConfigType = 0x0E
+    TimeStepConfigType = 0x0E,
+    ProductType = 0x0F
 };
 
 #endif // MEMBER_TYPE_H_INCLUDED

library/include/mobilisis/tariff_permit_type.h

@@ -0,0 +1,133 @@
+#ifndef TARIFF_PERMIT_TYPE_H_INCLUDED
+#define TARIFF_PERMIT_TYPE_H_INCLUDED
+
+#include <QString>
+
+enum class PERMIT_TYPE : quint8 {
+    SHORT_TERM_PARKING,
+    DAY_TICKET,
+    SZEGED_START,
+    SZEGED_STOP,
+    DAY_TICKET_ADULT,
+    DAY_TICKET_TEEN,
+    DAY_TICKET_CHILD,
+    FOOD_STAMP,
+    INVALID
+};
+
+struct PermitType {
+    PERMIT_TYPE m_permitType;
+
+    PermitType() { m_permitType = PERMIT_TYPE::INVALID; }
+    PermitType(int permitType) {
+        switch(permitType) {
+        case 0:
+            m_permitType = PERMIT_TYPE::SHORT_TERM_PARKING;
+            break;
+        case 1:
+            m_permitType = PERMIT_TYPE::DAY_TICKET;
+            break;
+        case 2:
+            m_permitType = PERMIT_TYPE::SZEGED_START;
+            break;
+        case 3:
+            m_permitType = PERMIT_TYPE::SZEGED_STOP;
+            break;
+        case 4:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_ADULT;
+            break;
+        case 5:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_TEEN;
+            break;
+        case 6:
+            m_permitType = PERMIT_TYPE::DAY_TICKET_CHILD;
+            break;
+        case 7:
+            m_permitType = PERMIT_TYPE::FOOD_STAMP;
+            break;
+        default:
+            m_permitType = PERMIT_TYPE::INVALID;
+        }
+    }
+    PermitType(PERMIT_TYPE permitType) : m_permitType(permitType) {}
+
+    void set(PERMIT_TYPE p) { m_permitType = p; }
+    PERMIT_TYPE get() const { return m_permitType; }
+
+    operator PERMIT_TYPE() const { return m_permitType; }
+
+    operator int () const {
+        switch(m_permitType) {
+        case PERMIT_TYPE::SHORT_TERM_PARKING:
+            return 0;
+        case PERMIT_TYPE::DAY_TICKET:
+            return 1;
+        case PERMIT_TYPE::SZEGED_START:
+            return 2;
+        case PERMIT_TYPE::SZEGED_STOP:
+            return 3;
+        case PERMIT_TYPE::DAY_TICKET_ADULT:
+            return 4;
+        case PERMIT_TYPE::DAY_TICKET_CHILD:
+            return 5;
+        case PERMIT_TYPE::DAY_TICKET_TEEN:
+            return 6;
+        case PERMIT_TYPE::FOOD_STAMP:
+            return 7;
+        default:
+            break;
+        }
+        return 7;
+
+    }
+
+    operator QString () {
+        switch(m_permitType) {
+        case PERMIT_TYPE::DAY_TICKET:
+            return QString("DAY_TICKET");
+        case PERMIT_TYPE::DAY_TICKET_ADULT:
+            return QString("DAY_TICKET_ADULT");
+        case PERMIT_TYPE::DAY_TICKET_CHILD:
+            return QString("DAY_TICKET_CHILD");
+        case PERMIT_TYPE::DAY_TICKET_TEEN:
+            return QString("DAY_TICKET_TEEN");
+        case PERMIT_TYPE::SHORT_TERM_PARKING:
+            return QString("SHORT_TERM_PARKING");
+        case PERMIT_TYPE::SZEGED_START:
+            return QString("SZEGED_START");
+        case PERMIT_TYPE::SZEGED_STOP:
+            return QString("SZEGED_STOP");
+        case PERMIT_TYPE::FOOD_STAMP:
+            return QString("FOOD_STAMP");
+        default:
+            break;
+        }
+        return QString("INVALID");
+    }
+
+    operator QString () const {
+        switch(m_permitType) {
+        case PERMIT_TYPE::DAY_TICKET:
+            return QString("DAY_TICKET");
+        case PERMIT_TYPE::DAY_TICKET_ADULT:
+            return QString("DAY_TICKET_ADULT");
+        case PERMIT_TYPE::DAY_TICKET_CHILD:
+            return QString("DAY_TICKET_CHILD");
+        case PERMIT_TYPE::DAY_TICKET_TEEN:
+            return QString("DAY_TICKET_TEEN");
+        case PERMIT_TYPE::SHORT_TERM_PARKING:
+            return QString("SHORT_TERM_PARKING");
+        case PERMIT_TYPE::SZEGED_START:
+            return QString("SZEGED_START");
+        case PERMIT_TYPE::SZEGED_STOP:
+            return QString("SZEGED_STOP");
+        case PERMIT_TYPE::FOOD_STAMP:
+            return QString("FOOD_STAMP");
+        default:
+            break;
+        }
+        return QString("INVALID");
+    }
+};
+
+#endif // TARIFF_PERMIT_TYPE_H_INCLUDED

library/include/mobilisis/tariff_product.h

@@ -0,0 +1,64 @@
+#ifndef TARIFF_PRODUCT_H_INCLUDED
+#define TARIFF_PRODUCT_H_INCLUDED
+
+#include <QString>
+#include <QDateTime>
+#include <QDebug>
+#include <QDebugStateSaver>
+
+#include "tariff_permit_type.h"
+
+struct ATBTariffProduct {
+    PermitType m_tariff_product_id;
+    uint32_t m_tariff_product_price;
+    QString m_tariff_product_name;
+    QTime m_tariff_product_start;
+    QTime m_tariff_product_end;
+    int m_tariff_product_from_in_minutes_from_start;
+    int m_tariff_product_to_in_minutes_from_start;
+
+    explicit ATBTariffProduct() = default;
+
+    QTime const &getTimeStart() const { return m_tariff_product_start; }
+    QTime const &getTimeEnd() const { return m_tariff_product_end; }
+
+    bool computeQTimeStart(QTime const &t) {
+        if (m_tariff_product_from_in_minutes_from_start != -1) {
+            m_tariff_product_start = t.addSecs(m_tariff_product_from_in_minutes_from_start * 60);
+            return m_tariff_product_start.isValid();
+        }
+        return false;
+    }
+
+    bool computeQTimeEnd(QTime const &t) {
+        if (m_tariff_product_to_in_minutes_from_start != -1) {
+            m_tariff_product_end = t.addSecs(m_tariff_product_from_in_minutes_from_start * 60);
+            return m_tariff_product_end.isValid();
+        }
+        return false;
+    }
+
+    bool computeQTimes(QTime const &t) {
+        if (!t.isNull() && t.isValid()) {
+            return computeQTimeStart(t) && computeQTimeEnd(t);
+        }
+        return false;
+    }
+
+    friend QDebug operator<<(QDebug debug, ATBTariffProduct const &product) {
+        QDebugStateSaver saver(debug);
+
+        debug.nospace()
+            << "                        m_tariff_product_id: " << QString(product.m_tariff_product_id) << "\n"
+            << "                      m_tariff_product_name: " << product.m_tariff_product_name << "\n"
+            << "                     m_tariff_product_price: " << product.m_tariff_product_price << "\n"
+            << "                     m_tariff_product_start: " << product.m_tariff_product_start << "\n"
+            << "                       m_tariff_product_end: " << product.m_tariff_product_end << "\n"
+            << "m_tariff_product_from_in_minutes_from_start: " << product.m_tariff_product_from_in_minutes_from_start << "\n"
+            << "  m_tariff_product_to_in_minutes_from_start: " << product.m_tariff_product_to_in_minutes_from_start << "\n";
+
+        return debug;
+    }
+};
+
+#endif // TARIFF_PRODUCT_H_INCLUDED

library/library.pro

@@ -77,7 +77,9 @@ HEADERS += \
     include/mobilisis/tariff_daily_ticket.h \
     include/mobilisis/tariff_customer.h \
     include/mobilisis/tariff_timebase.h \
-    include/mobilisis/tariff_timestep_config.h
+    include/mobilisis/tariff_timestep_config.h \
+    include/mobilisis/tariff_product.h \
+    include/mobilisis/tariff_permit_type.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

library/src/calculate_price.cpp

@@ -76,6 +76,49 @@ int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TY
     return minPrice;
 }
 
+int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT_TYPE permitType) {
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_TEEN:
+        // [[fallthrough]];
+    case PERMIT_TYPE::FOOD_STAMP:
+        // [[fallthrough]];
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+        std::optional<QVector<ATBTariffProduct>> products = cfg->getTariffProductForProductId(permitType);
+        if (products) {
+            QVector<ATBTariffProduct> product = products.value();
+            if (product.size() > 0) {
+                ATBTariffProduct const &p = product[0];
+                return p.m_tariff_product_price;
+#if 0
+                // in case we do not have prepaid-option
+                QTime const &currentTime = QDateTime::currentDateTime().time();
+
+                if (p.m_tariff_product_start <= currentTime && currentTime <= p.m_tariff_product_end) {
+                    return p.m_tariff_product_price;
+                } else {
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "ERROR currentTime"
+                                << currentTime.toString(Qt::ISODate)
+                                << "INVALID ("
+                                << p.m_tariff_product_start.toString(Qt::ISODate)
+                                << p.m_tariff_product_end.toString(Qt::ISODate) << ")";
+                }
+#endif
+            }
+        }
+    } break;
+    default:
+      break;
+    }
+
+    return 0;
+}
+
 int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
     int maxPrice = -1;
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);

library/src/calculator_functions.cpp

@@ -181,6 +181,13 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
         int durationMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
         int durationMinutesBrutto = 0;
 
+#ifdef _DEBUG_
+#undef _DEBUG_
+#endif
+
+//#define _DEBUG_ 1
+#define _DEBUG_ 0
+
         QDateTime current = start;
 
         int days = 7;
@@ -229,139 +236,340 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
         uint price = 0;
 
         if (carryOverNotSet) {
-            int range = 0;
             int minsToCarryOver = 0; // from one work-time to the other on the same day
             int minsUsed = 0;
             QDateTime lastCurrent = QDateTime();
 
+            QVector<ATBWeekDaysWorktime> weekDayWorkTimeRanges;
+
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
+            }
+
+            int weekDayWorkTimeIndex = 0;
+            bool moveToNextTimeRange = false;
+
+            // time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
             auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
 
-                for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                    ++range;
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "weekDayWorkTimeRanges.size()" << weekDayWorkTimeRanges.size()
+                                << "price" << price;
+#endif
+                    end_datetime = current;
+                    return end_datetime.toString(Qt::ISODate).toStdString();
+                }
 
-                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
+                QTime const &to = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_to.c_str(), Qt::ISODate);
 
-                    if (current.time() >= to) {
-                        continue; // try to use next available work-time
-                    } else
-                    if (current.time() <= from) {
-                        if (prepaid) {
-                            lastCurrent = current;
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                            durationMinutesBrutto += minutesMoved;
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "from" << from.toString(Qt::ISODate)
+                            << "to" << to.toString(Qt::ISODate);
+#endif
 
-                            if (range == 1) {
-                                start_datetime = current;
-                            }
-                        }
-                    }
+                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
+                if (current.time() >= to) {
+                    ++weekDayWorkTimeIndex;
 
-                        timeRange.computeQTimes(current.time());
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "try to use next available work-time with"
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "price" << price;
+#endif
+                    // time range is not affected
+                    continue;
+                } else
+                if (current.time() <= from) {
+                    if (prepaid) {
+                        lastCurrent = current;
+                        current.setTime(from); // move current forward (range==1),
+                                               // as prepaid is set
+                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+                        durationMinutesBrutto += minutesMoved;
 
-                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                                       timeRange.time_range_from_in_minutes_from_start;
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
 
-                        if (minsUsed > 0) {
-                            duration -= minsUsed;
-                            minsUsed = 0;
-                        }
-
-                        if (current.addSecs(duration * 60).time() <= to) {
-                            if (minsToCarryOver > 0) {  // the price for this time range
-                                                        // has been is paid already
-                                durationMinutes -= duration;
-                                durationMinutesNetto += duration;
-                                durationMinutesBrutto += duration;
-                                current = current.addSecs(duration*60);
-                                minsToCarryOver = 0;
-                            } else {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                        price += (uint)rate.pra_price;
-
-                                        if (price >= maxParkingPrice) {
-                                            price = maxParkingPrice;
-                                        }
-
-                                        durationMinutes -= duration;
-                                        durationMinutesNetto += duration;
-                                        durationMinutesBrutto += duration;
-
-                                        current = current.addSecs(duration * 60);
-
-                                        if (price >= cost) {
-                                            end_datetime = current;
-                                            return end_datetime.toString(Qt::ISODate).toStdString();
-                                        }
-
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (durationMinutes <= 0) {
-                                end_datetime = current;
-                                return end_datetime.toString(Qt::ISODate).toStdString();
-                            }
-
-                            ++timeRangeIt;
-
-                        } else {
-
-                            lastCurrent = current;
-                            current.setTime(to);
-                            minsUsed = lastCurrent.secsTo(current) / 60;
-
-                            // mod duration: possibly discard some minutes in
-                            // the next time-range
-                            if (durationMinutes >= minsUsed) {
-                                minsToCarryOver = durationMinutes - minsUsed;
-                            }
-
-                            durationMinutes -= minsUsed;
-                            durationMinutesNetto += minsUsed;
-                            durationMinutesBrutto += minsUsed;
-
-                            if (minsUsed > 0) {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                        price += (uint)rate.pra_price;
-
-                                        if (price >= maxParkingPrice) {
-                                            price = maxParkingPrice;
-                                        }
-
-                                        if (price >= cost) {
-                                            end_datetime = current;
-                                            // return end_datetime.toString(Qt::ISODate).toStdString();
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
+                        if (weekDayWorkTimeIndex == 0) {
+                            start_datetime = current;
                         }
                     }
                 }
 
+                ATBTimeRange timeRange = timeRangeIt->second;
+
+                timeRange.computeQTimes(current.time());
+
+                int duration = timeRange.time_range_to_in_minutes_from_start -
+                               timeRange.time_range_from_in_minutes_from_start;
+
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "duration" << duration
+                            << "minsUsed" << minsUsed
+                            << "minsToCarryOver" << minsToCarryOver
+                            << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                            << "price" << price;
+#endif
+
+                if (minsToCarryOver > 0) {  // the price for this time range
+                                            // has been is paid already
+                    Q_ASSERT_X(weekDayWorkTimeIndex > 0, __func__, "WRONG-WORK-TIME");
+
+                    current = current.addSecs(minsToCarryOver*60);
+
+                    durationMinutes -= minsToCarryOver;
+                    durationMinutesNetto += minsToCarryOver;
+                    durationMinutesBrutto += minsToCarryOver;
+
+                    minsToCarryOver = 0;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "durationMinutes" << durationMinutes
+                                << "durationMinutesNetto" << durationMinutesNetto
+                                << "durationMinutesBrutto" << durationMinutesBrutto
+                                << "price" << price;
+#endif
+                    if (price >= cost) {
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+                        return end_datetime.toString(Qt::ISODate).toStdString();
+                    }
+                }
+
+                if (current.addSecs(duration * 60).time() <= to) {
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes;
+#endif
+
+                    moveToNextTimeRange = false;
+                    for(const auto &x: cfg->PaymentRate) {
+                        ATBPaymentRate const rate = x.second;
+                        if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                            price += (uint)rate.pra_price;
+
+                            if (price >= maxParkingPrice) {
+                                price = maxParkingPrice;
+                            }
+
+                            durationMinutes -= duration;
+                            durationMinutesNetto += duration;
+                            durationMinutesBrutto += duration;
+
+                            current = current.addSecs(duration * 60);
+
+                            if (price >= cost) {
+                                end_datetime = current;
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+                                return end_datetime.toString(Qt::ISODate).toStdString();
+                            }
+
+                            // price has been updated; use next time range
+                            moveToNextTimeRange = true;
+                            break;
+                        }
+                    }
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "price" << price
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes
+                                << "durationMinutesNetto" << durationMinutesNetto
+                                << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
+                    if (price >= cost) {
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+
+                        return end_datetime.toString(Qt::ISODate).toStdString();
+                    }
+
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+                    }
+
+                    // havin a new time range means that we always have a new
+                    // work-time-range
+                    // ++timeRangeIt;
+
+                } else { // current.addSecs(duration * 60).time() > to
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
+                                << "duration" << duration
+                                << ", to:" << to.toString(Qt::ISODate);
+#endif
+
+                    lastCurrent = current;
+                    current.setTime(to);
+                    minsUsed = lastCurrent.secsTo(current) / 60;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes;
+#endif
+
+                    // mod duration: possibly discard some minutes in
+                    // the next time-range
+                    if (duration >= minsUsed) {
+                        minsToCarryOver = duration - minsUsed;
+                    }
+
+                    durationMinutes -= minsUsed;
+                    durationMinutesNetto += minsUsed;
+                    durationMinutesBrutto += minsUsed;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes
+                                << "price" << price;
+#endif
+
+                    moveToNextTimeRange = false;
+
+                    if (minsUsed > 0) {
+                        for(const auto &x: cfg->PaymentRate) {
+                            ATBPaymentRate const rate = x.second;
+                            if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                price += (uint)rate.pra_price;
+
+                                if (price >= maxParkingPrice) {
+                                    price = maxParkingPrice;
+                                }
+
+                                if (price >= cost) {
+                                    end_datetime = current;
+
+#if _DEBUG_==1
+                                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                                << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                                << "price" << price;
+#endif
+
+                                    // return end_datetime.toString(Qt::ISODate).toStdString();
+                                }
+
+                                // price has been updated; use next time range
+                                moveToNextTimeRange = true;
+                                break;
+                            }
+                        }
+                    }
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "minsUsed" << minsUsed
+                                << "durationMinutes" << durationMinutes
+                                << "moveToNextTimeRange" << moveToNextTimeRange
+                                << "price" << price;
+#endif
+
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+
+                        // no valid time range left
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+
+                        return end_datetime.toString(Qt::ISODate).toStdString();
+                    }
+                }
+
                 end_datetime = start.addSecs(durationMinutesBrutto * 60);
+
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "start" << start.toString(Qt::ISODate)
+                            << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                            << "final price" << std::max(price, minParkingPrice);
+#endif
+
                 return end_datetime.toString(Qt::ISODate).toStdString();
-            }
+            } // while (timeRangeIt != cfg->TimeRange.cend()) {
         }
 
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "INVALID END TIME";
+#endif
         end_datetime = QDateTime();
         return end_datetime.toString(Qt::ISODate).toStdString();
     }
@@ -373,6 +581,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     // TODO: im fehlerfall
     return t.getValidUntil().toString(Qt::ISODate).toStdString();
 }
+#undef _DEBUG_
 
 ///////////////////////////////////////
 
@@ -522,6 +731,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         int weekdayIdLast = -1;
         int durationMinutesBrutto = 0;
 
+#ifdef _DEBUG_
+#undef _DEBUG_
+#endif
+
+//#define _DEBUG_ 1
+#define _DEBUG_ 0
+
         QDateTime current = start;
 
         int days = 7;
@@ -571,120 +787,309 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         uint price = 0;
 
         if (carryOverNotSet) {
-            int range = 0;
             int minsToCarryOver = 0; // from one work-time to the other on the same day
             int minsUsed = 0;
             QDateTime lastCurrent = QDateTime();
 
+            QVector<ATBWeekDaysWorktime> weekDayWorkTimeRanges;
+
+            using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+            std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+
+            for (WTIterator itr = p.first; itr != p.second; ++itr) {
+                weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
+            }
+
+            int weekDayWorkTimeIndex = 0;
+            bool moveToNextTimeRange = false;
+
+            // time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
             auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
-                using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-                std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
 
-                for (WTIterator itr = p.first; itr != p.second; ++itr) {
-                    ++range;
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "weekDayWorkTimeRanges.size()" << weekDayWorkTimeRanges.size();
+#endif
+                    end_datetime = current;
+                    return price;
+                }
 
-                    Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
+                QTime const &from = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_from.c_str(), Qt::ISODate);
+                QTime const &to = QTime::fromString(weekDayWorkTimeRanges[weekDayWorkTimeIndex].pwd_time_to.c_str(), Qt::ISODate);
 
-                    if (current.time() >= to) {
-                        continue; // try to use next available work-time
-                    } else
-                    if (current.time() <= from) {
-                        if (prepaid) {
-                            lastCurrent = current;
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                            durationMinutesBrutto += minutesMoved;
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "from" << from.toString(Qt::ISODate)
+                            << "to" << to.toString(Qt::ISODate);
+#endif
 
-                            if (range == 1) {
-                                start_datetime = current;
-                            }
-                        }
-                    }
+                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
+                if (current.time() >= to) {
+                    ++weekDayWorkTimeIndex;
 
-                        timeRange.computeQTimes(current.time());
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "try to use next available work-time with"
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "price" << price;
+#endif
+                    // time range is not affected
+                    continue;
+                } else
+                if (current.time() <= from) {
+                    if (prepaid) {
+                        lastCurrent = current;
+                        current.setTime(from); // move current forward (range==1),
+                                               // as prepaid is set
+                        uint const minutesMoved = lastCurrent.secsTo(current) / 60;
+                        durationMinutesBrutto += minutesMoved;
 
-                        int duration = timeRange.time_range_to_in_minutes_from_start -
-                                       timeRange.time_range_from_in_minutes_from_start;
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
 
-                        if (minsUsed > 0) {
-                            duration -= minsUsed;
-                            minsUsed = 0;
-                        }
-
-                        if (current.addSecs(duration * 60).time() <= to) {
-                            if (minsToCarryOver > 0) {  // the price for this time range
-                                                        // has been is paid already
-                                durationMinutes -= duration;
-                                durationMinutesNetto += duration;
-                                durationMinutesBrutto += duration;
-                                current = current.addSecs(duration*60);
-                                minsToCarryOver = 0;
-                            } else {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                        price += (uint)rate.pra_price;
-
-                                        durationMinutes -= duration;
-                                        durationMinutesNetto += duration;
-                                        durationMinutesBrutto += duration;
-
-                                        current = current.addSecs(duration * 60);
-                                        break;
-                                    }
-                                }
-                            }
-
-                            if (durationMinutes <= 0) {
-                                end_datetime = current;
-                                return price;
-                            }
-
-                            ++timeRangeIt;
-
-                        } else {
-
-                            lastCurrent = current;
-                            current.setTime(to);
-                            minsUsed = lastCurrent.secsTo(current) / 60;
-
-                            // mod duration: possibly discard some minutes in
-                            // the next time-range
-                            if (durationMinutes >= minsUsed) {
-                                minsToCarryOver = durationMinutes - minsUsed;
-                            }
-
-                            durationMinutes -= minsUsed;
-                            durationMinutesNetto += minsUsed;
-                            durationMinutesBrutto += minsUsed;
-
-                            if (minsUsed > 0) {
-                                for(const auto &x: cfg->PaymentRate) {
-                                    ATBPaymentRate const rate = x.second;
-                                    if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
-                                        price += (uint)rate.pra_price;
-                                        break;
-                                    }
-                                }
-                            }
-                            break;
+                        if (weekDayWorkTimeIndex == 0) {
+                            start_datetime = current;
                         }
                     }
                 }
 
+                ATBTimeRange timeRange = timeRangeIt->second;
+
+                timeRange.computeQTimes(current.time());
+
+                int duration = timeRange.time_range_to_in_minutes_from_start -
+                               timeRange.time_range_from_in_minutes_from_start;
+
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "duration" << duration
+                            << "minsUsed" << minsUsed
+                            << "minsToCarryOver" << minsToCarryOver
+                            << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                            << "price" << price;
+#endif
+
+                if (minsToCarryOver > 0) {  // the price for this time range
+                                            // has been is paid already
+                    Q_ASSERT_X(weekDayWorkTimeIndex > 0, __func__, "WRONG-WORK-TIME");
+
+                    current = current.addSecs(minsToCarryOver*60);
+
+                    durationMinutes -= minsToCarryOver;
+                    durationMinutesNetto += minsToCarryOver;
+                    durationMinutesBrutto += minsToCarryOver;
+
+                    minsToCarryOver = 0;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "durationMinutes" << durationMinutes
+                                << "durationMinutesNetto" << durationMinutesNetto
+                                << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+                    if (durationMinutes <= 0) {
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+
+                        return price;
+                    }
+                }
+
+                if (current.addSecs(duration * 60).time() <= to) {
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes;
+#endif
+
+                    moveToNextTimeRange = false;
+                    for(const auto &x: cfg->PaymentRate) {
+                        ATBPaymentRate const rate = x.second;
+                        if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                            price += (uint)rate.pra_price;
+
+                            durationMinutes -= duration;
+                            durationMinutesNetto += duration;
+                            durationMinutesBrutto += duration;
+
+                            current = current.addSecs(duration * 60);
+
+                            // price has been updated; use next time range
+                            moveToNextTimeRange = true;
+                            break;
+                        }
+                    }
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "price" << price
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes
+                                << "durationMinutesNetto" << durationMinutesNetto
+                                << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
+                    if (durationMinutes <= 0) {
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                << "price" << price;
+#endif
+
+                        return price;
+                    }
+
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+                    }
+
+                    // havin a new time range means that we always have a new
+                    // work-time-range
+                    // ++timeRangeIt;
+
+                } else { // current.addSecs(duration * 60).time() > to
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "current.addSecs(" << duration * 60 << ")" << current.addSecs(duration*60).time().toString(Qt::ISODate)
+                                << "duration" << duration
+                                << ", to:" << to.toString(Qt::ISODate);
+#endif
+
+                    lastCurrent = current;
+                    current.setTime(to);
+                    minsUsed = lastCurrent.secsTo(current) / 60;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes;
+#endif
+
+                    // mod duration: possibly discard some minutes in
+                    // the next time-range
+                    if (duration >= minsUsed) {
+                        minsToCarryOver = duration - minsUsed;
+                    }
+
+                    durationMinutes -= minsUsed;
+                    durationMinutesNetto += minsUsed;
+                    durationMinutesBrutto += minsUsed;
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "to" << to.toString(Qt::ISODate)
+                                << "minsUsed" << minsUsed
+                                << "minsToCarryOver" << minsToCarryOver
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "durationMinutes" << durationMinutes
+                                << "price" << price;
+#endif
+
+                    moveToNextTimeRange = false;
+
+                    if (minsUsed > 0) {
+                        for(const auto &x: cfg->PaymentRate) {
+                            ATBPaymentRate const rate = x.second;
+                            if (rate.pra_payment_unit_id == timeRange.time_range_payment_type_id) {
+                                price += (uint)rate.pra_price;
+
+                                // price has been updated; use next time range
+                                moveToNextTimeRange = true;
+                                break;
+                            }
+                        }
+                    }
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "current" << current.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "minsUsed" << minsUsed
+                                << "durationMinutes" << durationMinutes
+                                << "moveToNextTimeRange" << moveToNextTimeRange
+                                << "price" << price;
+#endif
+
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+
+                        // no valid time range left
+                        end_datetime = current;
+
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                                    << "price" << price;
+#endif
+
+                        return price;
+                    }
+                }
+
                 end_datetime = start.addSecs(durationMinutesBrutto * 60);
+
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "start" << start.toString(Qt::ISODate)
+                            << "end_datetime" << end_datetime.toString(Qt::ISODate)
+                            << "final price" << std::max(price, minParkingPrice);
+#endif
+
                 return std::max(price, minParkingPrice);
-            }
+            } // while (timeRangeIt != cfg->TimeRange.cend()) {
         }
 
+#if _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "INVALID END TIME";
+#endif
         end_datetime = QDateTime();
         return 0;
     }
@@ -1331,6 +1736,9 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
         if (dailyTickets) {
             QVector<ATBDailyTicket> const tickets = dailyTickets.value();
             switch (permitType) {
+                case PERMIT_TYPE::FOOD_STAMP: {
+                    // TODO
+                } break;
                 case PERMIT_TYPE::DAY_TICKET_ADULT: {
                     std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::ADULT);
                     if (c) {
@@ -1423,6 +1831,18 @@ Calculator::GetDailyTicketPrice(Configuration* cfg,
                 case PERMIT_TYPE::INVALID:
                     break;
             }
+        } else {
+            // for projects which have not defined a daily ticket in their
+            // tariff-files (e.g. szeged)
+            price.netto = cfg->getPaymentOptions().pop_daily_card_price;
+
+            qCritical() << "( GetDailyTicketPrice():" << __LINE__ << ")";
+            qCritical() << "                  start:" << startDatetime.toString(Qt::ISODate);
+            qCritical() << "          workTime from:" << QTime::fromString(QString(wt.pwd_time_from.c_str()), Qt::ISODate);
+            qCritical() << "            workTime to:" << QTime::fromString(QString(wt.pwd_time_to.c_str()), Qt::ISODate);
+            qCritical() << "daily_ticket_card_price:" << price.netto;
+
+            value = value.value_or(price);
         }
     }
 

library/src/configuration.cpp

@@ -2,6 +2,7 @@
 #include "tariff_timebase.h"
 #include "time_range_header.h"
 #include "tariff_timestep_config.h"
+#include "tariff_permit_type.h"
 
 #include <QString>
 #include <QDebug>
@@ -24,6 +25,7 @@ MemberType Configuration::IdentifyJsonMember(const char* member_name)
     if (strcmp(member_name, "Customer") == 0) return MemberType::CustomerType;
     if (strcmp(member_name, "TimeRange") == 0) return MemberType::TimeRangeType;
     if (strcmp(member_name, "TimeStepConfig") == 0) return MemberType::TimeStepConfigType;
+    if (strcmp(member_name, "Product") == 0) return MemberType::ProductType;
     else return MemberType::UnknownType;
 }
 
@@ -93,6 +95,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
         ATBCustomer Customer;
         ATBTimeRange TimeRange;
         ATBTimeStepConfig TimeStepConfig;
+        ATBTariffProduct TariffProduct;
 
         MemberType mb_type = MemberType::UnknownType;
         this->currentPaymentOptions.clear();
@@ -157,6 +160,50 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					{
 					case MemberType::UnknownType:
 						break;
+                    case MemberType::ProductType: {
+                        if (QString(inner_obj_name) == QString("tariff_product_id")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_id = PermitType(x);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_price")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_price = x;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_name")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_name = QString::fromStdString(s);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_start")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_start = QTime::fromString(QString::fromStdString(s), Qt::ISODate);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_end")) {
+                            if (k->value.IsString()) {
+                                std::string const &s = k->value.GetString();
+                                TariffProduct.m_tariff_product_end = QTime::fromString(QString::fromStdString(s), Qt::ISODate);
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_from_in_minutes_from_start")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_from_in_minutes_from_start = x;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("tariff_product_to_in_minutes_from_start")) {
+                            if (k->value.IsInt()) {
+                                int const x = k->value.GetInt();
+                                TariffProduct.m_tariff_product_to_in_minutes_from_start = x;
+                            }
+                        }
+                    } break;
                     case MemberType::TimeRangeType:
                         if (QString(inner_obj_name) == QString("time_range_id")) {
                             if (k->value.IsInt()) {
@@ -479,6 +526,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                     cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
                     // qCritical() << TimeStepConfig;
                     break;
+                case MemberType::ProductType:
+                    cfg->TariffProduct.insert(pair<int, ATBTariffProduct>(TariffProduct.m_tariff_product_id, TariffProduct));
+                    qCritical() << TariffProduct;
                 default:
 					break;
 				}
@@ -492,6 +542,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 	}
 }
 
+
 ATBPaymentOption const &Configuration::getPaymentOptions() const {
     Q_ASSERT(!this->currentPaymentOptions.isEmpty());
     return this->currentPaymentOptions.at(0);
@@ -510,6 +561,48 @@ QVector<ATBPaymentOption> &Configuration::getAllPaymentOptions() {
     return this->currentPaymentOptions;
 }
 
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForAllKeys() const {
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+    for (std::multimap<int, ATBTariffProduct>::const_iterator it = this->TariffProduct.cbegin();
+        it != this->TariffProduct.cend(); ++it) {
+        products.append(it->second);
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(PermitType permitType) const {
+    QVector<ATBTariffProduct> products;
+    std::optional<QVector<ATBTariffProduct>> value;
+
+    products.clear();
+
+    for (auto[it, rangeEnd] = this->TariffProduct.equal_range(permitType); it != rangeEnd; ++it) {
+        products.append(it->second);
+    }
+
+    if (products.size() > 0) {
+        value = value.value_or(products);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBTariffProduct>>
+Configuration::getTariffProductForProductId(int id) const {
+    return getTariffProductForProductId(PermitType(id));
+}
+
 std::optional<QVector<ATBDailyTicket>>
 Configuration::getDailyTicketsForAllKeys() const {
     QVector<ATBDailyTicket> tickets;

main/main.cpp

@@ -205,12 +205,12 @@ int main() {
 #endif
 
 #if NEUHAUSER_KIRCHDORF==1
-    if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
-        if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
-    // if (true) {
-    //    if(true) {
-            const char *f = "/etc/psa_tariff/tariff01.json";
-            // const char *f = "/opt/ptu5/opt/customer_743/etc/psa_tariff/tariff01.json";
+    //if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
+    //    if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
+    if (true) {
+        if(true) {
+            // const char *f = "/etc/psa_tariff/tariff01.json";
+            const char *f = "/opt/ptu5/opt/customer_743/etc/psa_tariff/tariff01.json";
             std::ifstream input(f);
 
             std::stringstream sstr;
@@ -269,79 +269,154 @@ int main() {
             QList<int>::const_iterator step;
             for (step = steps.cbegin(); step != steps.cend(); ++step) {
                 qCritical() << QString("*** NEXT STEP: %1 ***").arg(*step);
-                for (int offset = 7*60; offset < 18*60; ++offset) {
+                //for (int offset = 691; offset < 692; ++offset) {
+                for (int offset = 480; offset < 1080; ++offset) {
+                //for (int offset = 7*60; offset < (18*60)-90; ++offset) {
+                //for (int offset = (18*60)-90; offset < 18*60; ++offset) {
+                //for (int offset = 1046; offset < 1047; ++offset) {
                     QDateTime start = s.addSecs(offset * 60);
                     QDateTime const firstStart = start;
 
-                    if (compute_price_for_parking_ticket(&cfg, start, *step, end, &price)) {
-                        double cost = price.netto;
+                    //if (*step != 30) continue;
 
-                        //qCritical() << "****" << offset << *step << "****";
-                        //qCritical() << "    firstStart :" << firstStart.toString(Qt::ISODate);
-                        //qCritical() << "    start      :" << start.toString(Qt::ISODate);
-                        //qCritical() << "    end        :" << end.toString(Qt::ISODate);
+                    double cost = 0;
+
+                    if (compute_price_for_parking_ticket(&cfg, start, *step, end, &price)) {
+                        cost = price.netto;
+
+                        qCritical() << "****" << offset << *step << "****";
+                        qCritical() << "    firstStart :" << firstStart.toString(Qt::ISODate);
+                        qCritical() << "    start      :" << start.toString(Qt::ISODate);
+                        qCritical() << "    end        :" << end.toString(Qt::ISODate);
+                        qCritical() << "    cost       :" << cost;
 
                         if (offset < 8*60) {    // [7:00 - 8:00[
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 9*60) {    // [8:00 - 9:00[
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 10*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 11*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 12*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 13*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 14*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 15*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 16*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                new_cost += ((*step-30)/5)*10;
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
                             }
                         } else
                         if (offset < 17*60) {
-                            if (!test_neuhauser_kirchdorf(*step, cost)) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                double const f = ((*step-30)/5)*10;
+                                new_cost += f;
+                                new_cost = std::min(new_cost, f+30);
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
                                 qCritical() << "ERROR AT OFFSET" << offset;
-                                return -1;
+                                //return -1;
+                            }
+                        } else
+                        if (offset < 18*60) {
+                            double new_cost = cost;
+                            if (offset > (18*60)-(*step)) {
+                                double const f = ((*step-30)/5)*10;
+                                new_cost += f;
+                                new_cost = std::min(new_cost, f+30);
+                                qCritical() << __LINE__ << "new_cost" << new_cost << "(cost" << cost << ")";
+                            }
+                            if (!test_neuhauser_kirchdorf(*step, new_cost)) {
+                                qCritical() << "ERROR AT OFFSET" << offset;
+                            //    return -1;
                             }
                         } else {
-                            qCritical() << "WARN OFFSET TOO HIGH" << offset;
+                            qCritical() << "ERROR OFFSET TOO HIGH" << offset;
+                            return -1;
                         }
 
                     } else {
@@ -352,6 +427,17 @@ int main() {
                         return -1;
                     }
 
+                    QDateTime end2 = QDateTime();
+                    if (compute_duration_for_parking_ticket(&cfg, start, cost, end2)) {      // return value
+                        qCritical() << "start" << start.toString(Qt::ISODate)
+                                    << "offset" << offset
+                                    << "cost" << cost
+                                    << "end" << end2.toString(Qt::ISODate);
+                        if (end != end2) {
+                            qCritical() << end.toString(Qt::ISODate)
+                                        << end2.toString(Qt::ISODate);
+                        }
+                    }
                 }
             }
         }
@@ -509,35 +595,35 @@ int main() {
     cout << endl;
 
     if (isParsed) {
+
+        int v = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET_ADULT);
+        qCritical() << "price adult" << v;
+
+        int w = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET_TEEN);
+        qCritical() << "price teen" << w;
+
+
         QDateTime s(QDate(2023, 11, 30), QTime());
         QDateTime end;
         struct price_t price;
-#define ADULT 0
-#define TEEN 1
+#define ADULT 1
+//#define TEEN 1
+
+        for (int offset = 480; offset < 1200; ++offset) {
+            QDateTime start = s.addSecs(offset * 60);
+            CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
 #if ADULT==1
-        for (int offset = 480; offset < 1080; ++offset) {
-            QDateTime start = s.addSecs(offset * 60);
-
-            // qCritical() << QString(Calculator::GetInstance().isParkingAllowed(&cfg, start));
-
-            CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
-                                                          PERMIT_TYPE::DAY_TICKET_ADULT, &price);
+                                                          PERMIT_TYPE::DAY_TICKET_ADULT,
+#elif TEEN==1
+                                                          PERMIT_TYPE::DAY_TICKET_TEEN,
+#endif
+                                                          &price);
             qCritical() << "start=" << start.toString(Qt::ISODate)
                         << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
         }
-#endif
-
-#if TEEN==1
-        for (int offset = 480; offset < 1080; ++offset) {
-            QDateTime start = s.addSecs(offset * 60);
-            CalcState cs = compute_price_for_daily_ticket(&cfg, start, end,
-                                                          PERMIT_TYPE::DAY_TICKET_TEEN, &price);
-            qCritical() << "start=" << start.toString(Qt::ISODate)
-                        << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
-        }
-#endif
     }
-
+#undef ADULT
+#undef TEEN
 #endif
 
 #if NEUHAUSER_LINSINGER_MASCHINENBAU==1
@@ -553,38 +639,8 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        bool nextDay = false;
-        bool prePaid = false;
-
-        // zone 1 (lila)
-        QDateTime s(QDate(2023, 11, 30), QTime());
-        QDateTime end;
-        int marken[] = { 3*60, 5*60, 10*60};
-        for (int duration = 0; duration < 3; ++duration) {
-            for (int offset = 360; offset <= 360; ++offset) {
-            // for (int offset = 360; offset < 1080; ++offset) {
-                QDateTime start = s.addSecs(offset * 60);
-                //qCritical() << "start" << start.toString(Qt::ISODate);
-
-                // note: prepaid == false (!)
-                // double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
-
-                struct price_t price;
-                if (compute_price_for_parking_ticket(&cfg, start, marken[duration], end, &price, prePaid)) {
-                    double cost = price.netto;
-
-                    qCritical() << "start" << start.toString(Qt::ISODate)
-                                << "end" << end.toString(Qt::ISODate)
-                                << "duration" << marken[duration]
-                                << "cost" << cost;
-                }
-
-                //std::string d = Calculator::GetInstance().GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
-                //qCritical() << "start" << start.toString(Qt::ISODate)
-                //            << "cost" << cost
-                //            << "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
-            }
-        }
+        int const price = compute_product_price(&cfg, PERMIT_TYPE::FOOD_STAMP);
+        qCritical() << "price food stamp" << price;
     }
 #endif
 
@@ -637,16 +693,19 @@ int main() {
     }
     return 0;
 
-#elif SZEGED==1
+#endif
+
+#if SZEGED==1
     std::ifstream input;
     int pop_min_time;
     int pop_max_time;
     int pop_min_price;
     int pop_max_price;
+    int pop_daily_card_price;
 
-    for (int t=1; t < 2; ++t) {
+    for (int zone=6; zone < 7; ++zone) {
     //for (int t=6; t < 7; t+=20) {
-        switch (t) {
+        switch (zone) {
         case 1: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
             //pop_max_time = 6*60;
@@ -690,71 +749,593 @@ int main() {
             pop_max_time = get_maximal_parkingtime(&cfg);
             pop_min_price = get_minimal_parkingprice(&cfg);
             pop_max_price = get_maximal_parkingprice(&cfg);
+            pop_daily_card_price = cfg.getPaymentOptions().pop_daily_card_price;
 
             qCritical() << "        pop_min_time: " << pop_min_time;
             qCritical() << "        pop_max_time: " << pop_max_time;
             qCritical() << "       pop_min_price: " << pop_min_price;
             qCritical() << "       pop_max_price: " << pop_max_price;
-            qCritical() << "pop_daily_card_price: " << cfg.getPaymentOptions().pop_daily_card_price;
+            qCritical() << "pop_daily_card_price: " << pop_daily_card_price;
+
+            if (pop_min_time > pop_max_time) {
+                qCritical() << "ERROR pop_min_time > pop_max_time"
+                            << pop_min_time << pop_max_time;
+                return -1;
+            }
+
+            if (pop_min_price > pop_max_price) {
+                qCritical() << "ERROR pop_min_price > pop_max_price"
+                            << pop_min_price << pop_max_price;
+                return -1;
+            }
+
+            if (pop_daily_card_price < pop_max_price) {
+                qCritical() << "ERROR pop_daily_card_price < pop_max_price"
+                            << pop_daily_card_price << pop_max_price;
+                return -1;
+            }
+
+            QMap<int, int> m;
 
             {
                 // zone 1 (lila)
                 QDateTime s(QDate(2023, 11, 30), QTime());
                 QDateTime end;
                 int cnt = 1;
-#if 0
-                for (int duration = 15; duration <= pop_max_time; duration += 5) {
+                if (zone == 1) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 42
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 55);
+                    m.insert(25, 69);
+                    m.insert(30, 83);
+                    m.insert(35, 97);
+                    m.insert(40, 110);
+                    m.insert(45, 124);
+                    m.insert(50, 138);
+                    m.insert(55, 152);
+                    m.insert(60, 165);
+
+                    m.insert(65, 179);
+                    m.insert(70, 193);
+                    m.insert(75, 207);
+                    m.insert(80, 220);
+                    m.insert(85, 234);
+                    m.insert(90, 248);
+                    m.insert(95, 262);
+                    m.insert(100, 275);
+                    m.insert(105, 289);
+                    m.insert(110, 303);
+                    m.insert(115, 317);
+                    m.insert(120, 330);
+
+                    m.insert(125, 344);
+                    m.insert(130, 358);
+                    m.insert(135, 372);
+                    m.insert(140, 385);
+                    m.insert(145, 399);
+                    m.insert(150, 413);
+                    m.insert(155, 427);
+                    m.insert(160, 440);
+                    m.insert(165, 454);
+                    m.insert(170, 468);
+                    m.insert(175, 482);
+                    m.insert(180, 495);
+
+                    m.insert(185, 509);
+                    m.insert(190, 523);
+                    m.insert(195, 537);
+                    m.insert(200, 550);
+                    m.insert(205, 564);
+                    m.insert(210, 578);
+                    m.insert(215, 592);
+                    m.insert(220, 605);
+                    m.insert(225, 619);
+                    m.insert(230, 633);
+                    m.insert(235, 647);
+                    m.insert(240, 660);
+
+                    m.insert(245, 674);
+                    m.insert(250, 688);
+                    m.insert(255, 702);
+                    m.insert(260, 715);
+                    m.insert(265, 729);
+                    m.insert(270, 743);
+                    m.insert(275, 757);
+                    m.insert(280, 770);
+                    m.insert(285, 784);
+                    m.insert(290, 798);
+                    m.insert(295, 812);
+                    m.insert(300, 825);
+
+                    m.insert(305, 839);
+                    m.insert(310, 853);
+                    m.insert(315, 867);
+                    m.insert(320, 880);
+                    m.insert(325, 894);
+                    m.insert(330, 908);
+                    m.insert(335, 922);
+                    m.insert(340, 935);
+                    m.insert(345, 949);
+                    m.insert(350, 963);
+                    m.insert(355, 977);
+                    m.insert(360, pop_max_price); // 990
+
+                    m.insert(365, pop_max_price);
+                    m.insert(370, pop_max_price);
+                    m.insert(375, pop_max_price);
+                    m.insert(380, pop_max_price);
+                    m.insert(385, pop_max_price);
+                    m.insert(390, pop_max_price);
+                    m.insert(395, pop_max_price);
+                    m.insert(400, pop_max_price);
+                    m.insert(405, pop_max_price);
+                    m.insert(410, pop_max_price);
+                    m.insert(415, pop_max_price);
+                    m.insert(420, pop_max_price);
+                } else
+                if (zone == 2) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 65
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 87);
+                    m.insert(25, 109);
+                    m.insert(30, 130);
+                    m.insert(35, 152);
+                    m.insert(40, 174);
+                    m.insert(45, 195);
+                    m.insert(50, 217);
+                    m.insert(55, 239);
+                    m.insert(60, 260);
+
+                    m.insert(65, 282);
+                    m.insert(70, 304);
+                    m.insert(75, 325);
+                    m.insert(80, 347);
+                    m.insert(85, 369);
+                    m.insert(90, 390);
+                    m.insert(95, 412);
+                    m.insert(100, 434);
+                    m.insert(105, 455);
+                    m.insert(110, 477);
+                    m.insert(115, 499);
+                    m.insert(120, 520);
+
+                    m.insert(125, 524);
+                    m.insert(130, 564);
+                    m.insert(135, 585);
+                    m.insert(140, 607);
+                    m.insert(145, 629);
+                    m.insert(150, 650);
+                    m.insert(155, 672);
+                    m.insert(160, 694);
+                    m.insert(165, 715);
+                    m.insert(170, 737);
+                    m.insert(175, 759);
+                    m.insert(180, 780);
+
+                    m.insert(185, 802);
+                    m.insert(190, 824);
+                    m.insert(195, 845);
+                    m.insert(200, 867);
+                    m.insert(205, 889);
+                    m.insert(210, 910);
+                    m.insert(215, 932);
+                    m.insert(220, 954);
+                    m.insert(225, 975);
+                    m.insert(230, 997);
+                    m.insert(235, 1019);
+                    m.insert(240, 1040);
+
+                    m.insert(245, 1062);
+                    m.insert(250, 1084);
+                    m.insert(255, 1105);
+                    m.insert(260, 1127);
+                    m.insert(265, 1149);
+                    m.insert(270, 1170);
+                    m.insert(275, 1192);
+                    m.insert(280, 1214);
+                    m.insert(285, 1235);
+                    m.insert(290, 1257);
+                    m.insert(295, 1279);
+                    m.insert(300, 1300);
+
+                    m.insert(305, 1322);
+                    m.insert(310, 1344);
+                    m.insert(315, 1365);
+                    m.insert(320, 1387);
+                    m.insert(325, 1409);
+                    m.insert(330, 1430);
+                    m.insert(335, 1452);
+                    m.insert(340, 1474);
+                    m.insert(345, 1495);
+                    m.insert(350, 1517);
+                    m.insert(355, 1539);
+                    m.insert(360, pop_max_price); // 1560
+
+                    m.insert(365, pop_max_price);
+                    m.insert(370, pop_max_price);
+                    m.insert(375, pop_max_price);
+                    m.insert(380, pop_max_price);
+                    m.insert(385, pop_max_price);
+                    m.insert(390, pop_max_price);
+                    m.insert(395, pop_max_price);
+                    m.insert(400, pop_max_price);
+                    m.insert(405, pop_max_price);
+                    m.insert(410, pop_max_price);
+                    m.insert(415, pop_max_price);
+                    m.insert(420, pop_max_price);
+                } else
+                if (zone == 3) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 90
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 120);
+                    m.insert(25, 150);
+                    m.insert(30, 180);
+                    m.insert(35, 210);
+                    m.insert(40, 240);
+                    m.insert(45, 270);
+                    m.insert(50, 300);
+                    m.insert(55, 330);
+                    m.insert(60, 360);
+                    m.insert(65, 390);
+                    m.insert(70, 420);
+                    m.insert(75, 450);
+                    m.insert(80, 480);
+                    m.insert(85, 510);
+                    m.insert(90, 540);
+                    m.insert(95, 570);
+                    m.insert(100, 600);
+                    m.insert(105, 630);
+                    m.insert(110, 660);
+                    m.insert(115, 690);
+                    m.insert(120, 720);
+
+                    m.insert(125, 750);
+                    m.insert(130, 780);
+                    m.insert(135, 810);
+                    m.insert(140, 840);
+                    m.insert(145, 870);
+                    m.insert(150, 900);
+                    m.insert(155, 930);
+                    m.insert(160, 960);
+                    m.insert(165, 990);
+                    m.insert(170, 1020);
+                    m.insert(175, 1050);
+                    m.insert(180, 1080);
+
+                    m.insert(185, 1110);
+                    m.insert(190, 1140);
+                    m.insert(195, 1170);
+                    m.insert(200, 1200);
+                    m.insert(205, 1230);
+                    m.insert(210, 1260);
+                    m.insert(215, 1290);
+                    m.insert(220, 1320);
+                    m.insert(225, 1350);
+                    m.insert(230, 1380);
+                    m.insert(235, 1410);
+                    m.insert(240, 1440);
+
+                    m.insert(245, 1470);
+                    m.insert(250, 1500);
+                    m.insert(255, 1530);
+                    m.insert(260, 1560);
+                    m.insert(265, 1590);
+                    m.insert(270, 1620);
+                    m.insert(275, 1650);
+                    m.insert(280, 1680);
+                    m.insert(285, 1710);
+                    m.insert(290, 1740);
+                    m.insert(295, 1770);
+                    m.insert(300, 1800);
+
+                    m.insert(305, 1830);
+                    m.insert(310, 1860);
+                    m.insert(315, 1890);
+                    m.insert(320, 1920);
+                    m.insert(325, 1950);
+                    m.insert(330, 1980);
+                    m.insert(335, 2010);
+                    m.insert(340, 2040);
+                    m.insert(345, 2070);
+                    m.insert(350, 2100);
+                    m.insert(355, 2130);
+                    m.insert(360, pop_max_price); // 2160
+
+                    m.insert(365, pop_max_price);
+                    m.insert(370, pop_max_price);
+                    m.insert(375, pop_max_price);
+                    m.insert(380, pop_max_price);
+                    m.insert(385, pop_max_price);
+                    m.insert(390, pop_max_price);
+                    m.insert(395, pop_max_price);
+                    m.insert(400, pop_max_price);
+                    m.insert(405, pop_max_price);
+                    m.insert(410, pop_max_price);
+                    m.insert(415, pop_max_price);
+                    m.insert(420, pop_max_price);
+                } else
+                if (zone == 4) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 163
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 217);
+                    m.insert(25, 271);
+                    m.insert(30, 325);
+                    m.insert(35, 380);
+                    m.insert(40, 434);
+                    m.insert(45, 488);
+                    m.insert(50, 542);
+                    m.insert(55, 596);
+                    m.insert(60, 650);
+
+                    m.insert(65, 705);
+                    m.insert(70, 759);
+                    m.insert(75, 813);
+                    m.insert(80, 867);
+                    m.insert(85, 921);
+                    m.insert(90, 975);
+                    m.insert(95, 1030);
+                    m.insert(100, 1084);
+                    m.insert(105, 1138);
+                    m.insert(110, 1192);
+                    m.insert(115, 1246);
+                    m.insert(120, 1300);
+
+                    m.insert(125, 1355);
+                    m.insert(130, 1409);
+                    m.insert(135, 1463);
+                    m.insert(140, 1517);
+                    m.insert(145, 1571);
+                    m.insert(150, 1625);
+                    m.insert(155, 1680);
+                    m.insert(160, 1734);
+                    m.insert(165, 1788);
+                    m.insert(170, 1842);
+                    m.insert(175, 1896);
+                    m.insert(180, 1950);
+
+                    m.insert(185, 2005);
+                    m.insert(190, 2059);
+                    m.insert(195, 2113);
+                    m.insert(200, 2167);
+                    m.insert(205, 2221);
+                    m.insert(210, 2275);
+                    m.insert(215, 2330);
+                    m.insert(220, 2384);
+                    m.insert(225, 2438);
+                    m.insert(230, 2492);
+                    m.insert(235, 2546);
+                    m.insert(240, pop_max_price); // 2600
+
+                    m.insert(245, pop_max_price);
+                    m.insert(250, pop_max_price);
+                    m.insert(255, pop_max_price);
+                    m.insert(260, pop_max_price);
+                    m.insert(270, pop_max_price);
+                    m.insert(280, pop_max_price);
+                    m.insert(290, pop_max_price);
+                    m.insert(300, pop_max_price);
+                } else
+                if (zone == 5) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 90
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 120);
+                    m.insert(25, 150);
+                    m.insert(30, 180);
+                    m.insert(35, 210);
+                    m.insert(40, 240);
+                    m.insert(45, 270);
+                    m.insert(50, 300);
+                    m.insert(55, 330);
+                    m.insert(60, 360);
+                    m.insert(65, 390);
+                    m.insert(70, 420);
+                    m.insert(75, 450);
+                    m.insert(80, 480);
+                    m.insert(85, 510);
+                    m.insert(90, 540);
+                    m.insert(95, 570);
+                    m.insert(100, 600);
+                    m.insert(105, 630);
+                    m.insert(110, 660);
+                    m.insert(115, 690);
+                    m.insert(120, 720);
+
+                    m.insert(125, 750);
+                    m.insert(130, 780);
+                    m.insert(135, 810);
+                    m.insert(140, 840);
+                    m.insert(145, 870);
+                    m.insert(150, 900);
+                    m.insert(155, 930);
+                    m.insert(160, 960);
+                    m.insert(165, 990);
+                    m.insert(170, 1020);
+                    m.insert(175, 1050);
+                    m.insert(180, 1080);
+
+                    m.insert(185, 1110);
+                    m.insert(190, 1140);
+                    m.insert(195, 1170);
+                    m.insert(200, 1200);
+                    m.insert(205, 1230);
+                    m.insert(210, 1260);
+                    m.insert(215, 1290);
+                    m.insert(220, 1320);
+                    m.insert(225, 1350);
+                    m.insert(230, 1380);
+                    m.insert(235, 1410);
+                    m.insert(240, 1440);
+
+                    m.insert(245, 1470);
+                    m.insert(250, 1500);
+                    m.insert(255, 1530);
+                    m.insert(260, 1560);
+                    m.insert(265, 1590);
+                    m.insert(270, 1620);
+                    m.insert(275, 1650);
+                    m.insert(280, 1680);
+                    m.insert(285, 1710);
+                    m.insert(290, 1740);
+                    m.insert(295, 1770);
+                    m.insert(300, 1800);
+
+                    m.insert(305, 1830);
+                    m.insert(310, 1860);
+                    m.insert(315, 1890);
+                    m.insert(320, 1920);
+                    m.insert(325, 1950);
+                    m.insert(330, 1980);
+                    m.insert(335, 2010);
+                    m.insert(340, 2040);
+                    m.insert(345, 2070);
+                    m.insert(350, 2100);
+                    m.insert(355, 2130);
+                    m.insert(360, pop_max_price); // 2160
+
+                    m.insert(365, pop_max_price);
+                    m.insert(370, pop_max_price);
+                    m.insert(375, pop_max_price);
+                    m.insert(380, pop_max_price);
+                    m.insert(385, pop_max_price);
+                    m.insert(390, pop_max_price);
+                    m.insert(395, pop_max_price);
+                    m.insert(400, pop_max_price);
+                    m.insert(405, pop_max_price);
+                    m.insert(410, pop_max_price);
+                    m.insert(415, pop_max_price);
+                    m.insert(420, pop_max_price);
+                } else
+                if (zone == 6) {
+                    m.insert(5, pop_min_price);
+                    m.insert(10, pop_min_price); // 163
+
+                    m.insert(pop_min_time, pop_min_price);
+                    m.insert(20, 217);
+                    m.insert(25, 271);
+                    m.insert(30, 325);
+                    m.insert(35, 380);
+                    m.insert(40, 434);
+                    m.insert(45, 488);
+                    m.insert(50, 542);
+                    m.insert(55, 596);
+                    m.insert(60, 650);
+
+                    m.insert(65, 705);
+                    m.insert(70, 759);
+                    m.insert(75, 813);
+                    m.insert(80, 867);
+                    m.insert(85, 921);
+                    m.insert(90, 975);
+                    m.insert(95, 1030);
+                    m.insert(100, 1084);
+                    m.insert(105, 1138);
+                    m.insert(110, 1192);
+                    m.insert(115, 1246);
+                    m.insert(120, 1300);
+
+                    m.insert(125, 1355);
+                    m.insert(130, 1409);
+                    m.insert(135, 1463);
+                    m.insert(140, 1517);
+                    m.insert(145, 1571);
+                    m.insert(150, 1625);
+                    m.insert(155, 1680);
+                    m.insert(160, 1734);
+                    m.insert(165, 1788);
+                    m.insert(170, 1842);
+                    m.insert(175, 1896);
+                    m.insert(180, 1950);
+
+                    m.insert(185, 2005);
+                    m.insert(190, 2059);
+                    m.insert(195, 2113);
+                    m.insert(200, 2167);
+                    m.insert(205, 2221);
+                    m.insert(210, 2275);
+                    m.insert(215, 2330);
+                    m.insert(220, 2384);
+                    m.insert(225, 2438);
+                    m.insert(230, 2492);
+                    m.insert(235, 2546);
+                    m.insert(240, pop_max_price); // 2600
+
+                    m.insert(245, pop_max_price);
+                    m.insert(250, pop_max_price);
+                    m.insert(255, pop_max_price);
+                    m.insert(260, pop_max_price);
+                    m.insert(270, pop_max_price);
+                    m.insert(280, pop_max_price);
+                    m.insert(290, pop_max_price);
+                    m.insert(300, pop_max_price);
+                }
+
+                struct price_t price;
+                for (int duration = pop_min_time; duration <= pop_max_time; duration += 5) {
                     for (int offset = 480; offset < 1080; ++offset) {
                         QDateTime start = s.addSecs(offset * 60);
-                        // qCritical() << "start" << start.toString(Qt::ISODate);
+                        end = QDateTime();
+                        price.netto = 0;
+                        if (compute_price_for_parking_ticket(&cfg, start, duration, end, &price)) {
+                            double cost = price.netto;
 
-                        double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration);
-                        // Q_ASSERT(cost == duration*2.5);
-                        //qCritical() << "";
-                        qCritical() << cnt << "start" << start.toString(Qt::ISODate)
-                                    << "end" << end.toString(Qt::ISODate)
-                                    << "duration" << duration
-                                    << "cost" << cost;
+                            //qCritical() << start.toString(Qt::ISODate) << end.toString(Qt::ISODate)
+                            //            << duration << cost;
+
+                            if (cost != m[duration]) {
+                                qCritical() << "ERROR computing_price_for_parking_ticket"
+                                            << "duration" << duration
+                                            << "HAVE cost" << cost
+                                            << "SHOULD HAVE cost" << m[duration];
+                                return -1;
+                            }
+                        } else {
+                            qCritical() << "ERROR computing_price_for_parking_ticket AT"
+                                        << cnt << "duration" << duration
+                                        << "start" << start.toString(Qt::ISODate);
+                            return -1;
+                        }
+                        start = s.addSecs(offset * 60);
+                        end = QDateTime();
+                        price.netto = 0;
+
+                        if (compute_price_for_daily_ticket(&cfg, start, end, PERMIT_TYPE::DAY_TICKET, &price)) {
+                            if (price.netto != pop_daily_card_price) {
+                                qCritical() << "ERROR computing_price_for_daily_ticket"
+                                            << "duration" << duration
+                                            << "HAVE cost" << price.netto
+                                            << "SHOULD HAVE cost" << pop_daily_card_price;
+                                return -1;
+                            }
+                        } else {
+                            qCritical() << "ERROR computing_price_for_daily_ticket AT"
+                                        << "start" << start.toString(Qt::ISODate);
+                            return -1;
+                        }
+
+//                        start = s.addSecs(offset * 60);
+//                        end = QDateTime();
+                        //if (compute_duration_for_daily_ticket(&cfg, start, end)) {
+//
+//                        } else {
+//                            qCritical() << "ERROR computing_duration_for_daily_ticket AT"
+//                                        << "start" << start.toString(Qt::ISODate);
+//                            return -1;
+//                        }
 
-                        std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg,
-                                                                                             3,
-                                                                                             start.toString(Qt::ISODate).toStdString().c_str(),
-                                                                                             cost, false, true);
-                        //Q_ASSERT(cost == duration*2.5);
-                        qCritical() << cnt << "start" << start.toString(Qt::ISODate)
-                                    << "cost" << cost
-                                    << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
                         ++cnt;
                     }
                 }
-#else
-                QDateTime start = s.addSecs(480 * 60); // 8:00:00
-                double cost = 2000;
-                std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg,
-                                                                                     3,
-                                                                                     start.toString(Qt::ISODate).toStdString().c_str(),
-                                                                                     cost, false, true);
-                qCritical() << cnt << "start" << start.toString(Qt::ISODate)
-                            << "cost" << cost
-                            << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
-#endif
             }
-#if 0
-            {
-                QDateTime start(QDate(2023, 12, 1), QTime(18, 0));
-                QDateTime end;
-                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, 60);
-               // Q_ASSERT(cost == 150);
-                qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
-            }
-            {
-                QDateTime start(QDate(2023, 10, 31), QTime(18, 0));
-                QDateTime end;
-                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, 60);
-                //Q_ASSERT(cost == 150);
-                qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
-            }
-#endif
         }
     }
 
@@ -955,6 +1536,6 @@ int main() {
             }
         }
     }
+
 #endif
-    return 0;
 }