Cimmit to compile and test.

library/include/mobilisis/atb_time.h

@@ -0,0 +1,58 @@
+#ifndef ATB_TIME_H_INCLUDED
+#define ATB_TIME_H_INCLUDED
+
+#include <QDateTime>
+
+class ATBTime {
+    QDateTime const m_end;
+    mutable QDateTime m_time;
+
+public:
+    explicit ATBTime();
+    explicit ATBTime(int h, int m, int s = 0, int ms = 0);
+
+    int hour() const { return m_time.time().hour(); }
+    int minute() const { return m_time.time().minute(); }
+    int second() const { return m_time.time().second(); }
+    int msec() const { return m_time.time().msec(); }
+
+    int secsTo(QTime t) const { return m_time.time().secsTo(t); }
+    int msecsTo(QTime t) const { return m_time.time().msecsTo(t); }
+
+    bool setHMS(int h, int m, int s, int ms = 0);
+
+    bool isNull() const { return m_time.time().isNull(); }
+    bool isValid() const { return m_time.time().isValid(); }
+
+
+    QTime addMSecs(int ms) const;
+    QTime addMSecs(int ms);
+
+    QTime addSecs(int s) const;
+    QTime addSecs(int s);
+
+    int msecsSinceStartOfDay() const;
+    QString toString(Qt::DateFormat format = Qt::TextDate) const;
+
+
+    static bool isValid(int h, int m, int s, int ms = 0);
+
+    static QTime currentTime() { return QDateTime::currentDateTime().time(); }
+
+    static constexpr QTime fromMSecsSinceStartOfDay(int msecs);
+
+    static QTime fromString(QString const &string, Qt::DateFormat format = Qt::TextDate);
+    static QTime fromString(QString const &string, const QString &format);
+
+    friend bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept;
+    friend QDataStream &operator<<(QDataStream &out, ATBTime time);
+    friend QDataStream &operator>>(QDataStream &in, ATBTime &time);
+};
+
+
+#endif // ATB_TIME_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -56,6 +56,7 @@ struct CALCULATE_LIBRARY_API CalcState {
     static QString const ABOVE_MAX_PARKING_PRICE;
     static QString const OVERPAID;
     static QString const OUTSIDE_ALLOWED_PARKING_TIME;
+    static QString const SUCCESS_MAXPRICE;
 
     enum class State : uint8_t {
         SUCCESS,
@@ -71,7 +72,8 @@ struct CALCULATE_LIBRARY_API CalcState {
         BELOW_MIN_PARKING_PRICE,
         ABOVE_MAX_PARKING_PRICE,
         OVERPAID,
-        OUTSIDE_ALLOWED_PARKING_TIME
+        OUTSIDE_ALLOWED_PARKING_TIME,
+        SUCCESS_MAXPRICE
     };
 
     State m_status;
@@ -106,6 +108,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -158,6 +163,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         case State::SUCCESS:
             s = CalcState::SUCCESS;
             break;
+        case State::SUCCESS_MAXPRICE:
+            s = CalcState::SUCCESS_MAXPRICE;
+            break;
         case State::ERROR_PARSING_ZONE_NR:
             s = CalcState::ERROR_PARSING_ZONE_NR;
             break;
@@ -207,6 +215,9 @@ struct CALCULATE_LIBRARY_API CalcState {
         if (desc == SUCCESS) {
             m_status = State::SUCCESS;
         } else
+        if (desc == SUCCESS_MAXPRICE) {
+            m_status = State::SUCCESS_MAXPRICE;
+        }
         if (desc == ERROR_PARSING_ZONE_NR) {
             m_status = State::ERROR_PARSING_ZONE_NR;
         } else

library/include/mobilisis/calculator_functions.h

@@ -73,7 +73,7 @@ public:
 	/// <returns>Returns duration in seconds (data type: double)</returns>
     std::pair<std::string, QDateTime>
         GetDurationFromCost(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double price,
-                                    PermitType permitType, bool nextDay = false, bool prepaid = false);
+                            PermitType permitType, bool nextDay = false, bool prepaid = false);
 
 	/// <summary>
 	///  Gets cost from duration in seconds

library/library.pro

@@ -35,7 +35,8 @@ SOURCES += \
     src/tariff_log.cpp \
     src/calculate_price.cpp \
     src/ticket.cpp \
-    src/tariff_global_defines.cpp
+    src/tariff_global_defines.cpp \
+    src/atb_time.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -89,7 +90,8 @@ HEADERS += \
     include/mobilisis/tariff_interpolation.h \
     include/mobilisis/tariff_prepaid.h \
     include/mobilisis/tariff_carryover.h \
-    include/mobilisis/tariff_global_defines.h
+    include/mobilisis/tariff_global_defines.h \
+    include/mobilisis/atb_time.h
 
 OTHER_FILES += src/main.cpp \
     ../tariffs/tariff_korneuburg.json \

library/src/atb_time.cpp

@@ -0,0 +1,103 @@
+#include "atb_time.h"
+
+
+ATBTime::ATBTime()
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00"))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+}
+
+ATBTime::ATBTime(int h, int m, int s, int ms)
+    : m_end(QDateTime::fromString("1970-01-02T00:00:00"))
+    , m_time(QDateTime::fromString("1970-01-01T00:00:00")) {
+
+    QTime t(h, m, s, ms);
+    m_time.setTime(t);
+}
+
+QTime ATBTime::addMSecs(int ms) const {
+    return m_time.time().addMSecs(ms);
+}
+
+QTime ATBTime::addMSecs(int ms)  {
+    QTime t = m_time.time();
+    t = t.addMSecs(ms);
+    m_time.setTime(t);
+    return t;
+}
+
+QTime ATBTime::addSecs(int s) const {
+    return m_time.time().addSecs(s);
+}
+
+QTime ATBTime::addSecs(int s)  {
+    QTime t = m_time.time();
+    t = t.addSecs(s);
+    m_time.setTime(t);
+    return t;
+}
+
+constexpr QTime ATBTime::fromMSecsSinceStartOfDay(int msecs) {
+    return QTime::fromMSecsSinceStartOfDay(msecs);
+}
+
+QTime ATBTime::fromString(QString const &string, Qt::DateFormat format) {
+    return QTime::fromString(string, format);
+}
+
+QTime ATBTime::fromString(QString const &string, QString const &format) {
+    return QTime::fromString(string, format);
+}
+
+bool ATBTime::isValid(int h, int m, int s, int ms) {
+    return QTime(h, m, s, ms).isValid();
+}
+
+int ATBTime::msecsSinceStartOfDay() const {
+    return m_time.time().msecsSinceStartOfDay();
+}
+
+bool ATBTime::setHMS(int h, int m, int s, int ms) {
+    if (isValid(h, m, s, ms)) {
+        QTime t(h, m, s, ms);
+        m_time.setTime(t);
+        return true;
+    }
+    return false;
+}
+
+QString ATBTime::toString(Qt::DateFormat format) const {
+    return m_time.time().toString(format);
+}
+
+bool operator!=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() != rhs.m_time.time();
+}
+
+bool operator<=(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() <= rhs.m_time.time();
+
+}
+
+bool operator<(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() < rhs.m_time.time();
+}
+
+bool operator>(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() > rhs.m_time.time();
+}
+
+bool operator==(const ATBTime &lhs, const ATBTime &rhs) noexcept {
+    return lhs.m_time.time() == rhs.m_time.time();
+}
+
+QDataStream &operator<<(QDataStream &out, ATBTime time) {
+    out << time.m_time.time();
+    return out;
+}
+
+QDataStream &operator>>(QDataStream &in, ATBTime &time) {
+    QTime t;
+    in >> t;
+    time.m_time.setTime(t);
+    return in;
+}

library/src/calculate_price.cpp

@@ -26,6 +26,7 @@ QString const CalcState::BELOW_MIN_PARKING_PRICE = "BELOW_MIN_PARKING_PRICE";
 QString const CalcState::ABOVE_MAX_PARKING_PRICE = "ABOVE_MAX_PARKING_PRICE";
 QString const CalcState::OVERPAID = "OVERPAID";
 QString const CalcState::OUTSIDE_ALLOWED_PARKING_TIME = "OUTSIDE_ALLOWED_PARKING_TIME";
+QString const CalcState::SUCCESS_MAXPRICE = "SUCCESS_MAXPRICE";
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
@@ -818,6 +819,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                 qCritical() << __func__ << ":" << __LINE__ << "   re-computed prepaid-id" << pop_prepaid_option_id;
             }
 
+            QTime carryOverStart = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].static_start;
+            int carryOverDuration = tariff->TariffCarryOverOptions.find(pop_carry_over_option_id)->second.carryover[weekDay].duration;
+
+            qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+            qCritical() << __func__ << ":" << __LINE__ << "carryOverDuration" << carryOverDuration;
+
+
             QDateTime effectiveStartTime(start_parking_time);
 
             // handle special days
@@ -885,7 +893,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
                 // handle carry over
                 int minutesUntilCarryOver = effectiveStartTime.time().secsTo(carryOverStart) / 60;
-                if (netto_parking_time > minutesUntilCarryOver) {
+                if ((minutesUntilCarryOver > 0) && (netto_parking_time > minutesUntilCarryOver)) {
                     int const rest = netto_parking_time - minutesUntilCarryOver;
                     QDateTime s(effectiveStartTime);
                     s = s.addSecs(minutesUntilCarryOver * 60);
@@ -1207,6 +1215,15 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                     if (ticketEndTime.time() > carryOverStart) {
                         // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
                         ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                    } else
+                    if (ticketEndTime.time() == carryOverStart) {
+                        qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        qCritical() << __func__ << ":" << __LINE__ << "   carryOverStart" << carryOverStart.toString(Qt::ISODate);
+                        ATBPaymentOption const &po = tariff->getPaymentOptions(paymentOptionIndex);
+                        if (po.pop_apply_carry_over_to_ticket_endtime) {
+                            ticketEndTime = ticketEndTime.addSecs(carryOverDuration * 60);
+                            qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
+                        }
                     } else {
                         // qCritical() << __func__ << __LINE__ << "ticketEndTime.time():" << ticketEndTime.time().toString(Qt::ISODate);
                         if (ticketEndTime.time() < carryOverEnd) {

library/src/calculator_functions.cpp

@@ -136,6 +136,7 @@ Calculator::GetDurationFromCost(Configuration* cfg,
     static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
 
     bool overPaid = false;
+    bool successMaxPrice = false; // max-price and cost match
 
     int paymentOptionIndex = getPaymentOptionIndex(*cfg, inputDate);
     if (paymentOptionIndex == -1) {
@@ -273,6 +274,11 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                 int const pop_min_price = cfg->getPaymentOptions(paymentOptionIndex).pop_min_price;
                 int const pop_allow_overpay = cfg->getPaymentOptions(paymentOptionIndex).pop_allow_overpay;
 
+                if (cost == pop_max_price) {
+                    qCritical() << DBG_HEADER << "SUCCESS MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
+                    successMaxPrice = true;
+                }
+
                 if (cost > pop_max_price) {
                     qCritical() << DBG_HEADER << "MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
                     if (pop_allow_overpay == false) {
@@ -280,6 +286,7 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                     }
                     cost = pop_max_price;
                     overPaid = true;
+                    qCritical() << DBG_HEADER << "OVERPAID, MAX-PARKING-PRICE" << pop_max_price << ", COST" << cost;
                     // return CalcState::OVERPAID.toStdString();
                 }
 
@@ -447,6 +454,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                                 if (overPaid) {
                                     return std::make_pair(CalcState::OVERPAID.toStdString(), d);
                                 }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), d);
+                                }
                                 return std::make_pair(d.toString(Qt::ISODate).toStdString(), d);
                             }
                         } else {
@@ -561,6 +571,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                             if (overPaid) {
                                 return std::make_pair(CalcState::OVERPAID.toStdString(), inputDate);
                             }
+                            if (successMaxPrice) {
+                                return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), inputDate);
+                            }
                             return std::make_pair(s.toStdString(), inputDate);
                         } // if ((double)price == cost) {
                         else {
@@ -648,6 +661,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                     if (overPaid) {
                         return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                     }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                    }
                     return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                 } else {
                     QDateTime const dt = start;
@@ -698,6 +714,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                     if (overPaid) {
                         return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                     }
+                    if (successMaxPrice) {
+                        return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                    }
                     return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                 }
 
@@ -796,6 +815,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                         if (overPaid) {
                             return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                         }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
                         return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
                 }
@@ -840,6 +862,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                                 if (overPaid) {
                                     return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                                 }
+                                if (successMaxPrice) {
+                                    return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                                }
                                 return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                             }
 
@@ -874,6 +899,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                         if (overPaid) {
                             return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                         }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
                         return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
 
@@ -993,6 +1021,9 @@ Calculator::GetDurationFromCost(Configuration* cfg,
                         if (overPaid) {
                             return std::make_pair(CalcState::OVERPAID.toStdString(), end_datetime);
                         }
+                        if (successMaxPrice) {
+                            return std::make_pair(CalcState::SUCCESS_MAXPRICE.toStdString(), end_datetime);
+                        }
                         return std::make_pair(end_datetime.toString(Qt::ISODate).toStdString(), end_datetime);
                     }
                 }

main/main.pro

@@ -34,7 +34,11 @@ OTHER_FILES += \
     /opt/ptu5/opt/customer_335/etc/psa_tariff/tariff02.json \
     /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff01.json \
     /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff02.json \
-    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff03.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff04.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff05.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff06.json \
+    /opt/ptu5/opt/customer_249/etc/psa_tariff/tariff07.json