Add re-check

(e.g. neuhauser/kirchdorf (743))

library/include/mobilisis/calculate_price.h

@@ -152,6 +152,7 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
 int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType = PERMIT_TYPE::SHORT_TERM_PARKING);
 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

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) {
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
-                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) {
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
-                    ++range;
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+#if _DEBUG_==1
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                    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) {
+#if _DEBUG_==1
-                        continue; // try to use next available work-time
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    } else
+                            << "current" << current.toString(Qt::ISODate)
-                    if (current.time() <= from) {
+                            << "from" << from.toString(Qt::ISODate)
-                        if (prepaid) {
+                            << "to" << to.toString(Qt::ISODate);
-                            lastCurrent = current;
+#endif
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                            durationMinutesBrutto += minutesMoved;
 
-                            if (range == 1) {
+                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
-                                start_datetime = current;
-                            }
-                        }
-                    }
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                if (current.time() >= to) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
+                    ++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 -
+#if _DEBUG_==1
-                                       timeRange.time_range_from_in_minutes_from_start;
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
 
-                        if (minsUsed > 0) {
+                        if (weekDayWorkTimeIndex == 0) {
-                            duration -= minsUsed;
+                            start_datetime = current;
-                            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;
                         }
                     }
                 }
 
+                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) {
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
-                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) {
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
-                    ++range;
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+#if _DEBUG_==1
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+                    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) {
+#if _DEBUG_==1
-                        continue; // try to use next available work-time
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
-                    } else
+                            << "current" << current.toString(Qt::ISODate)
-                    if (current.time() <= from) {
+                            << "from" << from.toString(Qt::ISODate)
-                        if (prepaid) {
+                            << "to" << to.toString(Qt::ISODate);
-                            lastCurrent = current;
+#endif
-                            current.setTime(from); // move current forward (range==1),
-                                                   // as prepaid is set
-                            uint const minutesMoved = lastCurrent.secsTo(current) / 60;
-                            durationMinutesBrutto += minutesMoved;
 
-                            if (range == 1) {
+                Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
-                                start_datetime = current;
-                            }
-                        }
-                    }
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
+                if (current.time() >= to) {
-                        ATBTimeRange timeRange = timeRangeIt->second;
+                    ++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 -
+#if _DEBUG_==1
-                                       timeRange.time_range_from_in_minutes_from_start;
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
 
-                        if (minsUsed > 0) {
+                        if (weekDayWorkTimeIndex == 0) {
-                            duration -= minsUsed;
+                            start_datetime = current;
-                            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;
                         }
                     }
                 }
 
+                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;
     }

main/main.cpp

@@ -34,13 +34,13 @@ extern "C" char* strptime(const char* s,
 #include "calculator_functions.h"
 #include "calculate_price.h"
 
-#define SZEGED                                  (0)
+#define SZEGED                                  (1)
 #define SCHOENAU_KOENIGSEE                      (0)
 #define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
-#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (1)
+#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
 #define NEUHAUSER_BILEXA_GALTUER                (0)
-#define NEUHAUSER_KIRCHDORF                     (0)
+#define NEUHAUSER_KIRCHDORF                     (1)
 
 #if NEUHAUSER_KIRCHDORF==1
 static bool test_neuhauser_kirchdorf(int step, double cost) {
@@ -205,12 +205,12 @@ int main() {
 #endif
 
 #if NEUHAUSER_KIRCHDORF==1
-    if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
+    //if (QDir("/opt/app/tools/atbupdate/customer_743").exists()) {
-        if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
+    //    if(QFileInfo::exists("/etc/psa_tariff/tariff01.json")) {
-    // if (true) {
+    if (true) {
-    //    if(true) {
+        if(true) {
-            const char *f = "/etc/psa_tariff/tariff01.json";
+            // const char *f = "/etc/psa_tariff/tariff01.json";
-            // const char *f = "/opt/ptu5/opt/customer_743/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)) {
+                    //if (*step != 30) continue;
-                        double cost = price.netto;
 
-                        //qCritical() << "****" << offset << *step << "****";
+                    double cost = 0;
-                        //qCritical() << "    firstStart :" << firstStart.toString(Qt::ISODate);
+
-                        //qCritical() << "    start      :" << start.toString(Qt::ISODate);
+                    if (compute_price_for_parking_ticket(&cfg, start, *step, end, &price)) {
-                        //qCritical() << "    end        :" << end.toString(Qt::ISODate);
+                        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,18 @@ int main() {
                         return -1;
                     }
 
+                    QDateTime end2 = QDateTime();
+                    if (compute_duration_for_parking_ticket(&cfg, start, cost, end2)) {      // return value
+                        qCritical() << "XXXX start" << start.toString(Qt::ISODate)
+                                    << "offset" << offset
+                                    << "cost" << cost
+                                    << "end" << end2.toString(Qt::ISODate);
+                        if (end != end2) {
+                            qCritical() << "YYYY"
+                                        << end.toString(Qt::ISODate)
+                                        << end2.toString(Qt::ISODate);
+                        }
+                    }
                 }
             }
         }
@@ -648,7 +735,9 @@ int main() {
     }
     return 0;
 
-#elif SZEGED==1
+#endif
+
+#if SZEGED==1
     std::ifstream input;
     int pop_min_time;
     int pop_max_time;
@@ -656,7 +745,7 @@ int main() {
     int pop_max_price;
     int pop_daily_card_price;
 
-    for (int zone=2; zone < 3; ++zone) {
+    for (int zone=6; zone < 7; ++zone) {
     //for (int t=6; t < 7; t+=20) {
         switch (zone) {
         case 1: {
@@ -735,10 +824,9 @@ int main() {
                 QDateTime s(QDate(2023, 11, 30), QTime());
                 QDateTime end;
                 int cnt = 1;
-#if 1
                 if (zone == 1) {
                     m.insert(5, pop_min_price);
-                    m.insert(10, pop_min_price);
+                    m.insert(10, pop_min_price); // 42
 
                     m.insert(pop_min_time, pop_min_price);
                     m.insert(20, 55);
@@ -814,7 +902,7 @@ int main() {
                     m.insert(345, 949);
                     m.insert(350, 963);
                     m.insert(355, 977);
-                    m.insert(360, pop_max_price);
+                    m.insert(360, pop_max_price); // 990
 
                     m.insert(365, pop_max_price);
                     m.insert(370, pop_max_price);
@@ -830,7 +918,407 @@ int main() {
                     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;
@@ -842,16 +1330,16 @@ int main() {
                         if (compute_price_for_parking_ticket(&cfg, start, duration, end, &price)) {
                             double cost = price.netto;
 
-                            qCritical() << start.toString(Qt::ISODate) << end.toString(Qt::ISODate)
+                            //qCritical() << start.toString(Qt::ISODate) << end.toString(Qt::ISODate)
-                                        << duration << cost;
+                            //            << duration << cost;
 
-                            //if (cost != m[duration]) {
+                            if (cost != m[duration]) {
-                            //    qCritical() << "ERROR computing_price_for_parking_ticket"
+                                qCritical() << "ERROR computing_price_for_parking_ticket"
-                            //                << "duration" << duration
+                                            << "duration" << duration
-                            //                << "HAVE cost" << cost
+                                            << "HAVE cost" << cost
-                            //                << "SHOULD HAVE cost" << m[duration];
+                                            << "SHOULD HAVE cost" << m[duration];
-                            //    return -1;
+                                return -1;
-                            //}
+                            }
                         } else {
                             qCritical() << "ERROR computing_price_for_parking_ticket AT"
                                         << cnt << "duration" << duration
@@ -862,54 +1350,34 @@ int main() {
                         end = QDateTime();
                         price.netto = 0;
 
-                        if (zone == 1) { // || zone == 2)
+                        if (compute_price_for_daily_ticket(&cfg, start, end, PERMIT_TYPE::DAY_TICKET, &price)) {
-                            if (compute_price_for_daily_ticket(&cfg, start, end, PERMIT_TYPE::DAY_TICKET, &price)) {
+                            if (price.netto != pop_daily_card_price) {
-                                if (price.netto != pop_daily_card_price) {
+                                qCritical() << "ERROR computing_price_for_daily_ticket"
-                                    qCritical() << "ERROR computing_price_for_daily_ticket"
+                                            << "duration" << duration
-                                                << "duration" << duration
+                                            << "HAVE cost" << price.netto
-                                                << "HAVE cost" << price.netto
+                                            << "SHOULD HAVE cost" << pop_daily_card_price;
-                                                << "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;
                             }
+                        } 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;
+//                        }
+
                         ++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
         }
     }
 
@@ -1110,6 +1578,6 @@ int main() {
             }
         }
     }
+
 #endif
-    return 0;
 }