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

in tariff-files to provide the prices for an hour.

library/include/mobilisis/calculate_price.h

@@ -84,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) {
@@ -152,6 +197,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/include/mobilisis/tariff_permit_type.h

@@ -11,6 +11,7 @@ enum class PERMIT_TYPE : quint8 {
     DAY_TICKET_ADULT,
     DAY_TICKET_TEEN,
     DAY_TICKET_CHILD,
+    FOOD_STAMP,
     INVALID
 };
 
@@ -41,6 +42,9 @@ struct PermitType {
         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;
         }
@@ -52,7 +56,7 @@ struct PermitType {
 
     operator PERMIT_TYPE() const { return m_permitType; }
 
-    operator int() const {
+    operator int () const {
         switch(m_permitType) {
         case PERMIT_TYPE::SHORT_TERM_PARKING:
             return 0;
@@ -68,6 +72,8 @@ struct PermitType {
             return 5;
         case PERMIT_TYPE::DAY_TICKET_TEEN:
             return 6;
+        case PERMIT_TYPE::FOOD_STAMP:
+            return 7;
         default:
             break;
         }
@@ -75,7 +81,7 @@ struct PermitType {
 
     }
 
-    operator QString() const {
+    operator QString () {
         switch(m_permitType) {
         case PERMIT_TYPE::DAY_TICKET:
             return QString("DAY_TICKET");
@@ -91,6 +97,32 @@ struct PermitType {
             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;
         }

library/src/calculate_price.cpp

@@ -85,6 +85,8 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT
         // [[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) {
@@ -92,6 +94,21 @@ int CALCULATE_LIBRARY_API compute_product_price(Configuration const *cfg, PERMIT
             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;
@@ -117,7 +134,7 @@ int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TY
             if (pv) {
                 QVector<ATBPaymentRate> const &paymentRate = pv.value();
                 if (paymentRate.size() > 0) {
-                    int const price = paymentRate.at(0).pra_price; // price is given per hour
+                    int const price = paymentRate.last().pra_price; // price is given per hour
                     maxPrice = qRound((maxTime * price) / 60.0f);
                 }
             }

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,26 +236,61 @@ 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();
 
-            auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+            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) {
-                    ++range;
+                weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
+            }
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+            int weekDayWorkTimeIndex = 0;
+            bool moveToNextTimeRange = false;
+
+            // time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
+            auto timeRangeIt = cfg->TimeRange.cbegin();
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
+
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
+
+#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();
+                }
+
+                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 _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "from" << from.toString(Qt::ISODate)
+                            << "to" << to.toString(Qt::ISODate);
+#endif
 
                 Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
                 if (current.time() >= to) {
-                        continue; // try to use next available work-time
+                    ++weekDayWorkTimeIndex;
+
+#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) {
@@ -258,13 +300,20 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                         uint const minutesMoved = lastCurrent.secsTo(current) / 60;
                         durationMinutesBrutto += minutesMoved;
 
-                            if (range == 1) {
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
+                        if (weekDayWorkTimeIndex == 0) {
                             start_datetime = current;
                         }
                     }
                 }
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
                 ATBTimeRange timeRange = timeRangeIt->second;
 
                 timeRange.computeQTimes(current.time());
@@ -272,20 +321,64 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                 int duration = timeRange.time_range_to_in_minutes_from_start -
                                timeRange.time_range_from_in_minutes_from_start;
 
-                        if (minsUsed > 0) {
-                            duration -= minsUsed;
-                            minsUsed = 0;
+#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 (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 {
+
+#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) {
@@ -303,37 +396,106 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                             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 (durationMinutes <= 0) {
+#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();
                     }
 
-                            ++timeRangeIt;
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+                    }
 
-                        } else {
+                    // 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 (durationMinutes >= minsUsed) {
-                                minsToCarryOver = durationMinutes - minsUsed;
+                    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;
@@ -346,22 +508,68 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
                                 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();
                                 }
-                                        break;
-                                    }
-                                }
-                            }
+
+                                // price has been updated; use next time range
+                                moveToNextTimeRange = true;
                                 break;
                             }
                         }
                     }
 
-                end_datetime = start.addSecs(durationMinutesBrutto * 60);
+#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,26 +787,60 @@ 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();
 
-            auto timeRangeIt = cfg->TimeRange.cbegin();
-            for (; timeRangeIt != cfg->TimeRange.cend(); ++timeRangeIt) {
+            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) {
-                    ++range;
+                weekDayWorkTimeRanges.append(itr->second); // working with vector is easier
+            }
 
-                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                    QTime const &to = Utilities::WeekDaysWorkTimeUntil(itr);
+            int weekDayWorkTimeIndex = 0;
+            bool moveToNextTimeRange = false;
+
+            // time ranges for Neuhauser-Kirchdorf (743): 30, 5, 5, ... 5
+            auto timeRangeIt = cfg->TimeRange.cbegin();
+            while (timeRangeIt != cfg->TimeRange.cend()) { // ; ++timeRangeIt) {
+
+                if (weekDayWorkTimeIndex >= weekDayWorkTimeRanges.size()) {
+
+#if _DEBUG_==1
+                    qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                << "weekDayWorkTimeIndex" << weekDayWorkTimeIndex
+                                << "weekDayWorkTimeRanges.size()" << weekDayWorkTimeRanges.size();
+#endif
+                    end_datetime = current;
+                    return price;
+                }
+
+                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 _DEBUG_==1
+                qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                            << "current" << current.toString(Qt::ISODate)
+                            << "from" << from.toString(Qt::ISODate)
+                            << "to" << to.toString(Qt::ISODate);
+#endif
 
                 Q_ASSERT_X(from < to, __func__, "MISCONFIGURED WORK-TIMES");
 
                 if (current.time() >= to) {
-                        continue; // try to use next available work-time
+                    ++weekDayWorkTimeIndex;
+
+#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) {
@@ -600,13 +850,20 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                         uint const minutesMoved = lastCurrent.secsTo(current) / 60;
                         durationMinutesBrutto += minutesMoved;
 
-                            if (range == 1) {
+#if _DEBUG_==1
+                        qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                                    << "lastCurrent" << lastCurrent.toString(Qt::ISODate)
+                                    << "current" << current.toString(Qt::ISODate)
+                                    << "minutesMoved" << minutesMoved
+                                    << "durationMinutesBrutto" << durationMinutesBrutto;
+#endif
+
+                        if (weekDayWorkTimeIndex == 0) {
                             start_datetime = current;
                         }
                     }
                 }
 
-                    while (timeRangeIt != cfg->TimeRange.cend()) {
                 ATBTimeRange timeRange = timeRangeIt->second;
 
                 timeRange.computeQTimes(current.time());
@@ -614,20 +871,64 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                 int duration = timeRange.time_range_to_in_minutes_from_start -
                                timeRange.time_range_from_in_minutes_from_start;
 
-                        if (minsUsed > 0) {
-                            duration -= minsUsed;
-                            minsUsed = 0;
+#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 (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 {
+
+#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) {
@@ -638,53 +939,157 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
                             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;
                     }
 
-                            ++timeRangeIt;
+                    if (moveToNextTimeRange) {
+                        if (++timeRangeIt != cfg->TimeRange.cend()) {
+                            continue;
+                        }
+                    }
 
-                        } else {
+                    // 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 (durationMinutes >= minsUsed) {
-                                minsToCarryOver = durationMinutes - minsUsed;
+                    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;
                             }
                         }
                     }
-                            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) {

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);
+                        }
+                    }
                 }
             }
         }
@@ -483,15 +569,16 @@ int main() {
         int Up = 1;
         //compute_next_timestep(&cfg, )
 
+        QDateTime const start = QDateTime::currentDateTime();
         for (int i=0; i<timeSteps.size(); ++i) {
             int nextTimeStep = compute_next_timestep(&cfg, timeSteps.at(i), Up);
             qCritical() << "nextTimeStep" << nextTimeStep;
 
-//            uint32_t price = calculator.GetPriceForTimeStep(&cfg, timeSteps.at(i));
-//            uint32_t duration = calculator.GetDurationForPrice(&cfg, price);
-//            qCritical() << "nextTimeStep relative to start:"
-//                        << duration << start.addSecs(duration * 60)
-//                        << "(price so far:" << price << ")";
+            uint32_t price = Calculator::GetInstance().GetPriceForTimeStep(&cfg, timeSteps.at(i));
+            uint32_t duration = Calculator::GetInstance().GetDurationForPrice(&cfg, price);
+            qCritical() << "nextTimeStep relative to start:"
+                        << duration << start.addSecs(duration * 60).toString(Qt::ISODate)
+                        << "(price so far:" << price << ")";
         }
     }
 #endif
@@ -516,39 +603,28 @@ int main() {
         int w = compute_product_price(&cfg, PERMIT_TYPE::DAY_TICKET_TEEN);
         qCritical() << "price teen" << w;
 
-        return 0;
-
-
 
         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
@@ -564,50 +640,19 @@ 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
 
 #if NEUHAUSER_KORNEUBURG==1
-    std::ifstream input("/tmp/tariff_korneuburg.json");
+    std::ifstream input("/opt/ptu5/opt/customer_714/etc/psa_tariff/tariff01.json");
     int pop_max_time;
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
 
-    Calculator calculator;
     Configuration cfg;
 
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
@@ -629,26 +674,28 @@ int main() {
                     QDateTime start = s.addSecs(offset * 60);
                     //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                    double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
+                    double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
                     //Q_ASSERT(cost == duration*2.5);
                     //qCritical() << "";
-                    //qCritical() << "start" << start.toString(Qt::ISODate)
-                    //            << "end" << end.toString(Qt::ISODate)
-                    //            << "duration" << duration
-                    //            << "cost" << cost;
-
-                    std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
-                    //Q_ASSERT(cost == duration*2.5);
                     qCritical() << "start" << start.toString(Qt::ISODate)
-                                << "cost" << cost
-                                << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
+                                << "end" << end.toString(Qt::ISODate)
+                                << "duration" << duration
+                                << "cost" << cost;
+
+                    //std::string duration = Calculator::GetInstance().GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
+                    //Q_ASSERT(cost == duration*2.5);
+                    //qCritical() << "start" << start.toString(Qt::ISODate)
+                    //            << "cost" << cost
+                    //            << "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
                 }
             }
         }
     }
     return 0;
 
-#elif SZEGED==1
+#endif
+
+#if SZEGED==1
     std::ifstream input;
     int pop_min_time;
     int pop_max_time;
@@ -656,7 +703,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 +782,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 +860,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 +876,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 +1288,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)
-                                        << duration << 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;
-                            //}
+                            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
@@ -862,7 +1308,6 @@ 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 (price.netto != pop_daily_card_price) {
                                 qCritical() << "ERROR computing_price_for_daily_ticket"
@@ -876,40 +1321,21 @@ int main() {
                                         << "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 +1536,6 @@ int main() {
             }
         }
     }
+
 #endif
-    return 0;
 }