Use isParkingAllowed() to steamline source code.

library/include/mobilisis/calculate_price.h

@@ -3,6 +3,7 @@
 
 #include <time.h>
 #include <inttypes.h>
+#include "tariff_time_range.h"
 
 #include <QString>
 #include <QDateTime>
@@ -31,6 +32,11 @@ struct CALCULATE_LIBRARY_API price_t {
     double brutto;
     double vat_percentage;
     double vat;
+
+    explicit price_t() {
+        units = 0;
+        netto = brutto = vat_percentage = vat = 0.0;
+    }
 };
 
 enum class PERMIT_TYPE : quint8 {
@@ -63,8 +69,25 @@ struct CALCULATE_LIBRARY_API CalcState {
 
     State m_status;
     QString m_desc;
+    TariffTimeRange m_allowedTimeRange;
 
-    explicit CalcState() : m_status(State::SUCCESS), m_desc("") {}
+    explicit CalcState()
+        : m_status(State::SUCCESS)
+        , m_desc("") {
+    }
+
+    explicit CalcState(State state, QString desc = "")
+        : m_status(state)
+        , m_desc(desc) {
+    }
+
+    explicit CalcState(State state, QString desc = "",
+                       QTime const &from = QTime(),
+                       QTime const &until = QTime())
+        : m_status(state)
+        , m_desc(desc)
+        , m_allowedTimeRange(from, until) {
+    }
 
     explicit operator bool() const noexcept {
         return (m_status == State::SUCCESS);
@@ -108,6 +131,7 @@ struct CALCULATE_LIBRARY_API CalcState {
             break;
         case State::WRONG_ISO_TIME_FORMAT:
             s = "WRONG_ISO_TIME_FORMAT";
+            break;
         case State::OUTSIDE_ALLOWED_PARKING_TIME:
             s = "OUTSIDE_ALLOWED_PARKING_TIME";
         }
@@ -116,6 +140,14 @@ struct CALCULATE_LIBRARY_API CalcState {
 
     CalcState &set(State s) { m_status = s; return *this; }
     CalcState &setDesc(QString s) { m_desc = s; return *this; }
+
+    void setAllowedTimeRange(QTime const &from, QTime const &until) {
+        m_allowedTimeRange.setTimeRange(from, until);
+    }
+
+    TariffTimeRange getAllowedTimeRange() {
+        return m_allowedTimeRange;
+    }
 };
 
 CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,

library/include/mobilisis/calculator_functions.h

@@ -35,6 +35,8 @@ public:
     void ResetPriceSteps() { m_priceSteps.clear(); }
     QList<int> priceSteps() const { return m_priceSteps; }
 
+    CalcState isParkingAllowed(Configuration const *cfg, QDateTime const &start);
+
 	/// <summary>
 	/// Gets duration in seconds from cost
 	/// </summary>

library/src/calculate_price.cpp

@@ -311,7 +311,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
     if (duration == 0) {
-        memset(price, 0x00, sizeof(*price));
         return calcState.set(CalcState::State::SUCCESS);
     }
 
@@ -375,7 +374,6 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
     if (netto_parking_time == 0) {
-        memset(price, 0x00, sizeof(*price));
         return calcState.set(CalcState::State::SUCCESS);
     }
 

library/src/calculator_functions.cpp

@@ -134,30 +134,17 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
             inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
             return inputDate.toString(Qt::ISODate).toStdString();
         } else {
-            QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate);
-            if (Utilities::IsYearPeriodActive(cfg, start)) {
+            if (Utilities::IsYearPeriodActive(cfg, inputDate)) {
                 if (!prepaid) {
-                    BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
-                    if (businessHours == BusinessHours::OnlyWeekDays) {
-                        int const weekdayId = start.date().dayOfWeek();
-
-                        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) {
-                            QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                            QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
-                            QTime const& startTime = start.time();
-
-                            if (from <= startTime && startTime <= until) {
-                                return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).toString(Qt::ISODate).toStdString();
-                            }
-                        }
+                    CalcState cs = isParkingAllowed(cfg, inputDate);
+                    if (cs) {
+                        inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
+                        return inputDate.toString(Qt::ISODate).toStdString();
                     }
                 }
 
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
-                return 0;
+                qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
+                return "";
             }
         }
     }
@@ -200,6 +187,67 @@ uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
 }
 
 
+CalcState Calculator::isParkingAllowed(Configuration const *cfg, QDateTime const &start) {
+    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
+
+    if (paymentMethodId == PaymentMethod::Steps) {
+        int const weekdayId = start.date().dayOfWeek();
+        BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
+        if (businessHours == BusinessHours::OnlyWeekDays) {
+            if (weekdayId != (int)Qt::Saturday && weekdayId != (int)Qt::Sunday) { // e.g. Neuhauser, Linsinger Maschinenbau (741)
+                if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
+                    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) {
+                        QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                        QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
+                        QTime const &startTime = start.time();
+                        if (from > startTime) {
+                            return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
+                                QString("%1 < %2").arg(from.toString(Qt::ISODate))
+                                                  .arg(startTime.toString(Qt::ISODate)), from, until);
+                        } else
+                        if (startTime >= until) {
+                            return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
+                                QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
+                                                   .arg(until.toString(Qt::ISODate)), from, until);
+                        }
+                        return CalcState(CalcState::State::SUCCESS,
+                                         "PARKING ALLOWED", from, until);
+                    }
+                }
+            }
+        } else
+        if (businessHours == BusinessHours::AllDaysWithRestrictedHours) { // e.g. for Neuhauser, NAZ (744)
+            if (cfg->WeekDaysWorktime.count(weekdayId) > 0) {
+                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) {
+                    QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
+                    QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
+                    QTime const &startTime = start.time();
+                    if (from > startTime) {
+                        return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
+                            QString("%1 < %2").arg(from.toString(Qt::ISODate))
+                                              .arg(startTime.toString(Qt::ISODate)), from, until);
+                    } else
+                    if (startTime >= until) {
+                        return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME,
+                            QString("%1 >= %2").arg(startTime.toString(Qt::ISODate))
+                                               .arg(until.toString(Qt::ISODate)), from, until);
+                    }
+                    return CalcState(CalcState::State::SUCCESS,
+                                     "PARKING ALLOWED", from, until);
+                }
+            }
+        }
+    }
+
+    return CalcState(CalcState::State::OUTSIDE_ALLOWED_PARKING_TIME, "UNKNOWN ERROR",
+                     QTime(), QTime());
+}
 
 
 ///////////////////////////////////////
@@ -223,23 +271,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         } else {
             if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
                 if (!prepaid) {
-                    BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
-                    if (businessHours == BusinessHours::OnlyWeekDays) {
-                        int const weekdayId = start_datetime.date().dayOfWeek();
-
-                        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) {
-                            QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
-                            QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
-                            QTime const &startTime = start_datetime.time();
-
-                            if (from <= startTime && startTime <= until) {
+                    CalcState cs = isParkingAllowed(cfg, start_datetime);
+                    if (cs) {
                         end_datetime = start_datetime.addSecs(durationMinutes*60);
-                                return GetCostFromDuration(cfg, start_datetime, end_datetime);
-                            }
-                        }
+                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
+                        end_datetime = start_datetime;
+                        end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
+                        return cost;
                     }
                 }
 

library/src/utilities.cpp

@@ -354,13 +354,14 @@ bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymen
 }
 
 PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
-    if (cfg->PaymentOption.size() != 1) {
+    if (cfg->PaymentOption.size() == 0) {
         return PaymentMethod::Undefined;
     }
 
     std::multimap<int, ATBPaymentOption>::const_iterator it =
         cfg->PaymentOption.cbegin();
 
+    if (it != cfg->PaymentOption.cend()) {
         switch (it->first) {
         case PaymentMethod::Linear:
             return PaymentMethod::Linear;
@@ -371,6 +372,7 @@ PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
         case PaymentMethod::Progressive:
             return PaymentMethod::Progressive;
         }
+    }
 
     return PaymentMethod::Undefined;
 }
@@ -403,18 +405,22 @@ uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod
 
 BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
     int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
+
+    qCritical() << __func__ << ":" << __LINE__ << businessHours;
+
     switch (businessHours) {
-    case NoRestriction_24_7: return NoRestriction_24_7;
-    case OnlyWorkingDays: return OnlyWorkingDays;
-    case OnlyWeekDays: return OnlyWeekDays;
-    case OnlyWeekEnd: return OnlyWeekEnd;
-    case OnlyOfficialHolidays: return OnlyOfficialHolidays;
-    case OnlySpecialDays: return OnlySpecialDays;
-    case OnlySchoolHolidays: return OnlySchoolHolidays;
-    case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
-    case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
+    case NoRestriction_24_7: return BusinessHours::NoRestriction_24_7;
+    case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;
+    case OnlyWeekDays: return BusinessHours::OnlyWeekDays;
+    case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd;
+    case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays;
+    case OnlySpecialDays: return BusinessHours::OnlySpecialDays;
+    case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays;
+    case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays;
+    case OnlyOpenForBusinessDays: return BusinessHours::OnlyOpenForBusinessDays;
+    case AllDaysWithRestrictedHours: return BusinessHours::AllDaysWithRestrictedHours;
     }
-    return NoBusinessHoursDefined;
+    return BusinessHours::NoBusinessHoursDefined;
 }
 
 uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {

main/main.cpp

@@ -136,9 +136,11 @@ int main() {
         QDateTime s(QDate(2023, 11, 30), QTime());
         QDateTime end;
         struct price_t price;
-        memset(&price, 0, sizeof(struct price_t));
         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);
             qCritical() << "start=" << start.toString(Qt::ISODate)
@@ -156,13 +158,12 @@ int main() {
 #endif
 
 #if NEUHAUSER_LINSINGER_MASCHINENBAU==1
-    std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
+    std::ifstream input("/opt/ptu5/opt/customer_741/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
 
-    Calculator calculator;
     Configuration cfg;
 
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
@@ -181,14 +182,14 @@ int main() {
                 QDateTime start = s.addSecs(offset * 60);
                 //qCritical() << "start" << start.toString(Qt::ISODate);
 
-                double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
+                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
                 //qCritical() << "";
                 //qCritical() << "start" << start.toString(Qt::ISODate)
                 //            << "end" << end.toString(Qt::ISODate)
                 //            << "duration" << marken[duration]
                 //            << "cost" << cost;
 
-                std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), 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;