Use isParkingAllowed() to steamline source code.

value = value.value_or(...)

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,22 @@ 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 {
+    SHORT_TERM_PARKING,
+    DAY_TICKET,
+    SZEGED_START,
+    SZEGED_STOP,
+    DAY_TICKET_ADULT,
+    DAY_TICKET_TEEN,
+    DAY_TICKET_CHILD,
+    INVALID
 };
 
 struct CALCULATE_LIBRARY_API CalcState {
@@ -46,13 +63,31 @@ struct CALCULATE_LIBRARY_API CalcState {
         ABOVE_MAX_PARKING_TIME,
         BELOW_MIN_PARKING_TIME,
         BELOW_MIN_PARKING_PRICE,
-        OVERPAID
+        OVERPAID,
+        OUTSIDE_ALLOWED_PARKING_TIME
     };
 
     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);
@@ -75,7 +110,7 @@ struct CALCULATE_LIBRARY_API CalcState {
             break;
         case State::NEGATIVE_PARING_TIME:
             s = "NEGATIVE_PARKING_TIME";
-            break;
+           break;
         case State::ABOVE_MAX_PARKING_TIME:
             s = "ABOVE_MAX_PARKING_TIME";
             break;
@@ -96,12 +131,23 @@ 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";
         }
         return s + ":" + m_desc;
     }
 
     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,
@@ -112,7 +158,10 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
 
 QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg);
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(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);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,
@@ -143,6 +192,13 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
                                             QDateTime &ticketEndTime);
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
+                                            parking_tariff_t *tariff,
+                                            QDateTime const &start_parking_time,
+                                            QDateTime &ticketEndTime,
+                                            PERMIT_TYPE permitType,
+                                            struct price_t *price);
 //#ifdef __cplusplus
 //} // extern "C"
 //#endif

library/include/mobilisis/calculator_functions.h

@@ -5,6 +5,7 @@
 #include <optional>
 
 #include "configuration.h"
+#include "calculate_price.h"
 #include "payment_method.h"
 #include "ticket.h"
 #include "tariff_time_range.h"
@@ -14,6 +15,7 @@ using namespace std;
 
 class Calculator {
     mutable QList<int> m_timeSteps;
+    mutable QList<int> m_priceSteps;
 
 protected:
     explicit Calculator() = default;
@@ -30,6 +32,11 @@ public:
     void ResetTimeSteps() { m_timeSteps.clear(); }
     QList<int> timeSteps() const { return m_timeSteps; }
 
+    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>
@@ -53,6 +60,7 @@ public:
 
     // Daily ticket
     QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+    std::optional<struct price_t> GetDailyTicketPrice(Configuration* cfg, QDateTime const &startDatetime, QDateTime &endTime, PERMIT_TYPE permitType);
 
     //
     // helper function to find time steps for a tariff with PaymentMethod::Steps
@@ -61,6 +69,8 @@ public:
     QList<int> GetTimeSteps(Configuration *cfg) const;
     QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
 
+    QList<int> GetPriceSteps(Configuration *cfg) const;
+
     // additional helper functions
     bool noSpecialDays(Configuration const *cfg) const {
         return (cfg->SpecialDays.size() == 0) && (cfg->SpecialDaysWorktime.size() == 0);
@@ -75,12 +85,12 @@ public:
     }
 
 // testing public:
-private:
     // Introduced for PaymentMethod::Steps (e.g. Schoenau)
     // For tariff of following structure: only steps, no special days, nonstop.
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
     uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
 
+private:
     Ticket private_GetCostFromDuration(Configuration const* cfg,
                                        QDateTime const &start,
                                        int durationMinutes,

library/include/mobilisis/configuration.h

@@ -26,6 +26,7 @@
 #include "tariff_timestep_config.h"
 
 #include <QVector>
+#include <optional>
 
 using namespace std;
 using namespace rapidjson;
@@ -51,6 +52,7 @@ public:
     multimap<int, ATBTimeRange> TimeRange;
     multimap<int, ATBTimeStepConfig> TimeStepConfig;
     multimap<int, ATBTimeBase> TimeBase;
+    multimap<int, ATBCustomer> Customer;
 
 	/// <summary>
 	/// Parse JSON string
@@ -61,7 +63,14 @@ public:
 
     ATBPaymentOption &getPaymentOptions();
     ATBPaymentOption const &getPaymentOptions() const;
-    QVector<ATBDailyTicket> const &getDailyTickets() const;
+    QVector<ATBPaymentOption> &getAllPaymentOptions();
+    QVector<ATBPaymentOption> const &getAllPaymentOptions() const;
+    std::optional<QVector<ATBPaymentRate>> getPaymentRateForAllKeys() const;
+    std::optional<QVector<ATBPaymentRate>> getPaymentRateForKey(int key) const;
+    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForAllKeys() const;
+    std::optional<QVector<ATBDailyTicket>> getDailyTicketsForKey(int key) const;
+    std::optional<ATBCustomer> getCustomerForType(ATBCustomer::CustomerType customerType);
+    std::optional<ATBWeekDaysWorktime> getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek);
 
 private:
 	/// <summary>
@@ -71,5 +80,5 @@ private:
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
 
-    ATBPaymentOption currentPaymentOptions;
+    QVector<ATBPaymentOption> currentPaymentOptions;
 };

library/include/mobilisis/payment_opt.h

@@ -6,6 +6,23 @@ class ATBPaymentOption
 public:
     ATBPaymentOption() = default;
 
+    void reset() {
+        pop_id = 0;
+        pop_label = "";
+        pop_payment_method_id = 0;
+        pop_day_end_time = "";
+        pop_day_night_end_time = "";
+        pop_price_night = 0;
+        pop_min_time = 0;
+        pop_max_time = 0;
+        pop_min_price = 0;
+        pop_carry_over = -1;
+        pop_carry_over_time_range_id = -1;
+        pop_daily_card_price = -1;
+        pop_business_hours = -1;
+        pop_time_step_config = -1;
+    }
+
     int pop_id;
     std::string pop_label;
     int pop_payment_method_id;

library/include/mobilisis/tariff_business_hours.h

@@ -15,6 +15,7 @@ enum BusinessHours
     OnlySchoolHolidays          = 32,
     SpecialAndSchoolHolidays    = 48,
     OnlyOpenForBusinessDays     = 64,   // verkaufsoffen
+    AllDaysWithRestrictedHours  = 128,  // every day, restricted to some time range
     NoBusinessHoursDefined      = 255
 };
 

library/include/mobilisis/tariff_customer.h

@@ -10,25 +10,31 @@ struct ATBCustomer {
 
     ATBCustomer() = default;
 
+    int cust_id;
     CustomerType cust_type;
     QString cust_label;
 
     friend QDebug operator<<(QDebug debug, ATBCustomer const &customer) {
         QDebugStateSaver saver(debug);
 
+        debug.nospace() << "CUSTOMER" << "\n";
+
         switch(customer.cust_type) {
         case ATBCustomer::CustomerType::ADULT:
             debug.nospace()
+                << "   cust_id: " << customer.cust_id << "\n"
                 << " cust_type: " << "CustomerType::ADULT" << "\n"
                 << "cust_label: " << customer.cust_label << "\n";
             break;
         case ATBCustomer::CustomerType::CHILD:
             debug.nospace()
+                << "   cust_id: " << customer.cust_id << "\n"
                 << " cust_type: " << "CustomerType::CHILD" << "\n"
                 << "cust_label: " << customer.cust_label << "\n";
             break;
         case ATBCustomer::CustomerType::TEEN:
             debug.nospace()
+                << "   cust_id: " << customer.cust_id << "\n"
                 << " cust_type: " << "CustomerType::TEEN" << "\n"
                 << "cust_label: " << customer.cust_label << "\n";
             break;

library/include/mobilisis/tariff_daily_ticket.h

@@ -4,6 +4,7 @@
 #include <QString>
 #include <QDateTime>
 #include <QDebug>
+#include <QVector>
 #include <QDebugStateSaver>
 
 
@@ -15,65 +16,49 @@ struct ATBDailyTicket {
     ATBDailyTicket() = default;
 
     int daily_ticket_payment_option_id;
-    int daily_ticket_unit_id;
+    int daily_ticket_id;
-    double daily_ticket_price;
+    int daily_ticket_price_id;
 
-    ATBTimeBase::TimeBaseType daily_ticket_tbase_type;
+    int daily_ticket_tb_id;
                                         // time base setting for ticket:
                                         // absolute: using time stamps
                                         // relative: use offsets from
                                         //    some reference time point,
                                         //    typically "start time".
 
-    ATBCustomer::CustomerType daily_ticket_clearance_customer_type;
+    QVector<int> daily_ticket_clearance_customer_ids;
                                         // who is allowed to buy the ticket:
                                         // list of customer types
 
-    int daily_ticket_weekday_range;  // [mon-sun]
+    QTime daily_ticket_from_min;        // absolute time base
-    int daily_ticket_special_day_range;
+    QTime daily_ticket_to_max;
+    int daily_ticket_from_offset_min; // relative time base
+    int daily_ticket_to_offset_max;
 
+    void reset() {
+        daily_ticket_payment_option_id = 0;
+        daily_ticket_id = 0;
+        daily_ticket_price_id = 0;
+        daily_ticket_tb_id = 0;
+        daily_ticket_clearance_customer_ids.clear();
+        daily_ticket_from_min = QTime();
+        daily_ticket_to_max = QTime();
+        daily_ticket_from_offset_min = 0;
+        daily_ticket_to_offset_max = 0;
+    }
 
     friend QDebug operator<<(QDebug debug, ATBDailyTicket const &ticket) {
         QDebugStateSaver saver(debug);
 
         debug.nospace()
-                << "      daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
+                << "DAILY TICKET                         " << "\n"
-                << "                daily_ticket_unit_id: " << ticket.daily_ticket_unit_id << "\n"
+                << "                    daily_ticket_id: " << ticket.daily_ticket_id << "\n"
-                << "                  daily_ticket_price: " << ticket.daily_ticket_price << "\n";
+                << "     daily_ticket_payment_option_id: " << ticket.daily_ticket_payment_option_id << "\n"
-
+                << "              daily_ticket_tbase_id: " << ticket.daily_ticket_tb_id << "\n"
-        switch(ticket.daily_ticket_tbase_type) {
+                << "              daily_ticket_price_id: " << ticket.daily_ticket_price_id << "\n"
-        case ATBTimeBase::TimeBaseType::ABSOLUTE:
+                << "daily_ticket_clearance_customer_ids: " << ticket.daily_ticket_clearance_customer_ids << "\n"
-            debug.nospace()
+                << "              daily_ticket_from_min: " << ticket.daily_ticket_from_min.toString(Qt::ISODate) << "\n"
-                << "             daily_ticket_tbase_type: " << "TimeBaseType::ABSOLUTE" << "\n";
+                << "                daily_ticket_to_min: " << ticket.daily_ticket_to_max.toString(Qt::ISODate) << "\n";
-            break;
-        case ATBTimeBase::TimeBaseType::RELATIVE:
-            debug.nospace()
-                << "             daily_ticket_tbase_type: " << "TimeBaseType::RELATIVE" << "\n";
-            break;
-        }
-
-        switch(ticket.daily_ticket_clearance_customer_type) {
-        case ATBCustomer::CustomerType::ADULT:
-            debug.nospace()
-                << "daily_ticket_clearance_customer_type: " << "CustomerType::ADULT" << "\n";
-            break;
-        case ATBCustomer::CustomerType::CHILD:
-            debug.nospace()
-                << "daily_ticket_clearance_customer_type: " << "CustomerType::CHILD" << "\n";
-            break;
-        case ATBCustomer::CustomerType::TEEN:
-            debug.nospace()
-                << "daily_ticket_clearance_customer_type: " << "CustomerType::TEEN" << "\n";
-            break;
-        default:
-            debug.nospace()
-                << "daily_ticket_clearance_customer_type: " << "CustomerType::???" << "\n";
-            break;
-        }
-
-        debug.nospace()
-            << "          daily_ticket_weekday_range: " << ticket.daily_ticket_weekday_range << "\n"
-            << "      daily_ticket_special_day_range: " << ticket.daily_ticket_special_day_range << "\n";
 
         return debug;
     }

library/include/mobilisis/tariff_timebase.h

@@ -16,6 +16,8 @@ struct ATBTimeBase {
     friend QDebug operator<<(QDebug debug, ATBTimeBase const &timeBase) {
         QDebugStateSaver saver(debug);
 
+        debug.nospace() << "TIMEBASE" << "\n";
+
         switch(timeBase.tbase_type) {
         case ATBTimeBase::TimeBaseType::ABSOLUTE:
             debug.nospace()

library/src/calculate_price.cpp

@@ -14,12 +14,94 @@ QList<int> CALCULATE_LIBRARY_API get_time_steps(Configuration *cfg) {
     return Calculator::GetInstance().GetTimeSteps(cfg);
 }
 
-int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg) {
+int CALCULATE_LIBRARY_API get_minimal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
-    // for each new sell-procedure, recomute the timesteps. implicitly, set
+    int minTime = 0;
-    // the minimal parking time.
+
-    Calculator::GetInstance().ResetTimeSteps();
+    switch(permitType) {
-    Calculator::GetInstance().GetTimeSteps(cfg);
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
-    return qRound(cfg->getPaymentOptions().pop_min_time);
+        minTime = cfg->getPaymentOptions().pop_min_time;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    default:
+        // for each new sell-procedure, recomute the timesteps. implicitly, set
+        // the minimal parking time.
+        Calculator::GetInstance().ResetTimeSteps();
+        Calculator::GetInstance().GetTimeSteps(cfg);
+        minTime = qRound(cfg->getPaymentOptions().pop_min_time);
+    }
+
+    return minTime;
+}
+
+int CALCULATE_LIBRARY_API get_maximal_parkingtime(Configuration *cfg, PERMIT_TYPE permitType) {
+    int maxTime = 0;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        maxTime = cfg->getPaymentOptions().pop_max_time;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    default: ;
+    }
+
+    return maxTime;
+}
+
+int CALCULATE_LIBRARY_API get_minimal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
+    int minPrice = -1;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        minPrice = cfg->getPaymentOptions().pop_min_price;
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN: {
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD: {
+    } break;
+    default: ;
+    }
+
+    return minPrice;
+}
+
+int CALCULATE_LIBRARY_API get_maximal_parkingprice(Configuration *cfg, PERMIT_TYPE permitType) {
+    int maxPrice = -1;
+
+    switch(permitType) {
+    case PERMIT_TYPE::SHORT_TERM_PARKING: { // e.g. szeged (customer_281)
+        int const key = cfg->getPaymentOptions().pop_id;
+        int const maxTime = cfg->getPaymentOptions().pop_max_time; // maxTime is given in minutes
+        std::optional<QVector<ATBPaymentRate>> const &pv = cfg->getPaymentRateForKey(key);
+        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
+                maxPrice = qRound((maxTime * price) / 60.0f);
+            }
+        }
+    } break;
+    case PERMIT_TYPE::DAY_TICKET_ADULT:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_TEEN:
+        break;
+    case PERMIT_TYPE::DAY_TICKET_CHILD:
+        break;
+    default: ;
+    }
+
+    return maxPrice;
 }
 
 int CALCULATE_LIBRARY_API get_zone_nr(int zone)
@@ -229,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);
     }
 
@@ -293,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);
     }
 
@@ -415,3 +495,27 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff
     return calcState.set(CalcState::State::SUCCESS);
 }
 
+
+CalcState CALCULATE_LIBRARY_API compute_price_for_daily_ticket(
+                                    parking_tariff_t *tariff,
+                                    QDateTime const &startDatetime,
+                                    QDateTime &endDatetime,
+                                    PERMIT_TYPE permitType,
+                                    struct price_t *price) {// return value
+    CalcState calcState;
+
+
+    if (startDatetime.isValid()) {
+        if (std::optional<struct price_t> p =
+            Calculator::GetInstance().GetDailyTicketPrice(tariff,
+                                                          startDatetime,
+                                                          endDatetime,
+                                                          permitType)) {
+           *price = p.value();
+        }
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+    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, inputDate)) {
-            if (Utilities::IsYearPeriodActive(cfg, start)) {
                 if (!prepaid) {
-                    BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
+                    CalcState cs = isParkingAllowed(cfg, inputDate);
-                    if (businessHours == BusinessHours::OnlyWeekDays) {
+                    if (cs) {
-                        int const weekdayId = start.date().dayOfWeek();
+                        inputDate.setTime(cs.getAllowedTimeRange().getTimeUntil());
-
+                        return inputDate.toString(Qt::ISODate).toStdString();
-                        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();
-                            }
-                        }
                     }
                 }
 
-                qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
+                qCritical() << __func__ << ":" << __LINE__ << "NOT YET IMPLEMENTED";
-                return 0;
+                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);
+                    CalcState cs = isParkingAllowed(cfg, start_datetime);
-                    if (businessHours == BusinessHours::OnlyWeekDays) {
+                    if (cs) {
-                        int const weekdayId = start_datetime.date().dayOfWeek();
+                        end_datetime = start_datetime.addSecs(durationMinutes*60);
-
+                        double cost = GetCostFromDuration(cfg, start_datetime, end_datetime);
-                        using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
+                        end_datetime = start_datetime;
-                        std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
+                        end_datetime.setTime(cs.getAllowedTimeRange().getTimeUntil());
-
+                        return cost;
-                        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) {
-                                end_datetime = start_datetime.addSecs(durationMinutes*60);
-                                return GetCostFromDuration(cfg, start_datetime, end_datetime);
-                            }
-                        }
                     }
                 }
 
@@ -695,6 +733,10 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
                cost, Ticket::s[VALID]);
 }
 
+QList<int> Calculator::GetPriceSteps(Configuration * /*cfg*/) const {
+    return QList<int>();
+}
+
 QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     if (m_timeSteps.size() > 0) {
         //qCritical() << __PRETTY_FUNCTION__ << "timeSteps:" << m_timeSteps;
@@ -708,9 +750,9 @@ QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
     int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over;
     int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config;
 
-    qCritical() << __PRETTY_FUNCTION__ << "             start parking time:" << start.toString(Qt::ISODate);
+    qCritical() << __func__ << ":" << __LINE__ << "       start parking time:" << start.toString(Qt::ISODate);
-    qCritical() << __PRETTY_FUNCTION__ << "              payment option id:" << pop_id;
+    qCritical() << __func__ << ":" << __LINE__ << "        payment option id:" << pop_id;
-    qCritical() << __PRETTY_FUNCTION__ << "      payment option carry over:" << pop_carry_over;
+    qCritical() << __func__ << ":" << __LINE__ << "payment option carry over:" << pop_carry_over;
 
     if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) {
         //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC";
@@ -832,3 +874,120 @@ uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
 
     return duration;
 }
+
+std::optional<struct price_t>
+Calculator::GetDailyTicketPrice(Configuration* cfg,
+                                QDateTime const &startDatetime,
+                                QDateTime &endTime,
+                                PERMIT_TYPE permitType) {
+    struct price_t price;
+    std::optional<struct price_t> value;
+
+    std::optional<ATBWeekDaysWorktime> workTime =
+        cfg->getWeekDayWorkTime(startDatetime.time(),
+                                (Qt::DayOfWeek)startDatetime.date().dayOfWeek());
+    if (workTime) {
+        ATBWeekDaysWorktime const &wt = workTime.value();
+        endTime = startDatetime;
+        endTime.setTime(QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate));
+        std::optional<QVector<ATBDailyTicket>> dailyTickets = cfg->getDailyTicketsForAllKeys();
+        if (dailyTickets) {
+            QVector<ATBDailyTicket> const tickets = dailyTickets.value();
+            switch (permitType) {
+                case PERMIT_TYPE::DAY_TICKET_ADULT: {
+                    std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::ADULT);
+                    if (c) {
+                        for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
+                            if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
+                                int priceId = tickets[i].daily_ticket_price_id;
+                                QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
+                                for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
+                                    int const pop_id = paymentOptions.at(j).pop_id;
+                                    std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
+                                    if (paymentRates) {
+                                        QVector<ATBPaymentRate> const &pr = paymentRates.value();
+                                        for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
+                                            if (pr.at(k).pra_payment_option_id == pop_id) {
+                                                if (priceId == pr.at(k).pra_payment_unit_id) {
+                                                    price.netto = pr.at(k).pra_price;
+                                                    value = value.value_or(price);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } break;
+                case PERMIT_TYPE::DAY_TICKET_TEEN: {
+                    std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::TEEN);
+                    if (c) {
+                        for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
+                            if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
+                                int priceId = tickets[i].daily_ticket_price_id;
+                                QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
+                                for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
+                                    int const pop_id = paymentOptions.at(j).pop_id;
+                                    std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
+                                    if (paymentRates) {
+                                        QVector<ATBPaymentRate> const &pr = paymentRates.value();
+                                        for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
+                                            if (pr.at(k).pra_payment_option_id == pop_id) {
+                                                if (priceId == pr.at(k).pra_payment_unit_id) {
+                                                    price.netto = pr.at(k).pra_price;
+                                                    value = value.value_or(price);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } break;
+                case PERMIT_TYPE::DAY_TICKET_CHILD: {
+                    std::optional<ATBCustomer> c = cfg->getCustomerForType(ATBCustomer::CustomerType::CHILD);
+                    if (c) {
+                        for (QVector<ATBDailyTicket>::size_type i=0; i<tickets.size(); ++i) {
+                            if (tickets[i].daily_ticket_clearance_customer_ids.contains(c.value().cust_id)) {
+                                int priceId = tickets[i].daily_ticket_price_id;
+                                QVector<ATBPaymentOption> const &paymentOptions = cfg->getAllPaymentOptions();
+                                for (QVector<ATBPaymentOption>::size_type j=0; j < paymentOptions.size(); ++j) {
+                                    int const pop_id = paymentOptions.at(j).pop_id;
+                                    std::optional<QVector<ATBPaymentRate>> const &paymentRates = cfg->getPaymentRateForKey(pop_id);
+                                    if (paymentRates) {
+                                        QVector<ATBPaymentRate> const &pr = paymentRates.value();
+                                        for (QVector<ATBPaymentRate>::size_type k=0; k < pr.size(); ++k) {
+                                            if (pr.at(k).pra_payment_option_id == pop_id) {
+                                                if (priceId == pr.at(k).pra_payment_unit_id) {
+                                                    price.netto = pr.at(k).pra_price;
+                                                    value = value.value_or(price);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+                // [[fallthrough]];
+                case PERMIT_TYPE::SHORT_TERM_PARKING: {
+                }
+                // [[fallthrough]];
+                case PERMIT_TYPE::DAY_TICKET: {
+                }
+                // [[fallthrough]];
+                case PERMIT_TYPE::SZEGED_START:
+                    // [[fallthrough]];
+                case PERMIT_TYPE::SZEGED_STOP:
+                    // [[fallthrough]];
+                case PERMIT_TYPE::INVALID:
+                    break;
+            }
+        }
+    }
+
+    return value;
+}

library/src/configuration.cpp

@@ -87,7 +87,6 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
         ATBSpecialDays SpecialDays;
         ATBWeekDays  WeekDays;
         ATBWeekDaysWorktime  WeekDaysWorktime;
-        ATBPaymentOption PaymentOption;
         ATBPeriodYear YearPeriod;
         ATBDailyTicket DailyTicket;
         ATBTimeBase TimeBase;
@@ -96,6 +95,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
         ATBTimeStepConfig TimeStepConfig;
 
         MemberType mb_type = MemberType::UnknownType;
+        this->currentPaymentOptions.clear();
 
 		// Get all JSON object members
 		// This code should run only once (to load JSON variables into memory)
@@ -214,57 +214,64 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
                                 DailyTicket.daily_ticket_payment_option_id = k->value.GetInt();
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_unit_id")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_id")) {
                             if (k->value.IsInt()) {
-                                DailyTicket.daily_ticket_unit_id = k->value.GetInt();
+                                DailyTicket.daily_ticket_id = k->value.GetInt();
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_price")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_price_id")) {
                             if (k->value.IsInt()) {
-                                DailyTicket.daily_ticket_price = k->value.GetInt();
+                                DailyTicket.daily_ticket_price_id = k->value.GetInt();
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_tbase_type")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_tb_id")) {
                             if (k->value.IsInt()) {
-                                int baseType = k->value.GetInt();
+                                DailyTicket.daily_ticket_tb_id = k->value.GetInt();
-                                switch(baseType) {
+                            }
-                                case (int)ATBTimeBase::TimeBaseType::ABSOLUTE:
+                        } else
-                                    DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::ABSOLUTE;
+                        if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_ids")) {
-                                    break;
+                            if (k->value.IsArray()) {
-                                case (int)ATBTimeBase::TimeBaseType::RELATIVE:
+                                auto customerIds = k->value.GetArray();
-                                    DailyTicket.daily_ticket_tbase_type = ATBTimeBase::TimeBaseType::RELATIVE;
+                                for (rapidjson::SizeType i=0; i < customerIds.Size(); ++i) {
-                                    break;
+                                    if (customerIds[i].IsInt()) {
+                                        DailyTicket.daily_ticket_clearance_customer_ids.append(customerIds[i].GetInt());
+                                    }
                                 }
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_clearance_customer_type")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_from_min")) {
-                            if (k->value.IsInt()) {
+                            if (k->value.IsString()) {
-                                int CustomerType = k->value.GetInt();
+                                std::string const from_min =  k->value.GetString();
-                                switch (CustomerType) {
+                                char const *from_min_c_str = from_min.c_str(); // for debugging
-                                case (int)ATBCustomer::CustomerType::ADULT:
+                                DailyTicket.daily_ticket_from_min = QTime::fromString(from_min_c_str, Qt::ISODate);
-                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::ADULT;
-                                    break;
-                                case (int)ATBCustomer::CustomerType::CHILD:
-                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::CHILD;
-                                    break;
-                                case (int)ATBCustomer::CustomerType::TEEN:
-                                    DailyTicket.daily_ticket_clearance_customer_type = ATBCustomer::CustomerType::TEEN;
-                                    break;
-                                }
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_weekday_range")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_to_max")) {
-                            if (k->value.IsInt()) {
+                            if (k->value.IsString()) {
-                                DailyTicket.daily_ticket_weekday_range = k->value.GetInt();
+                                std::string const to_max =  k->value.GetString();
+                                char const *to_max_c_str =  to_max.c_str();
+                                DailyTicket.daily_ticket_to_max = QTime::fromString(to_max_c_str, Qt::ISODate);
                             }
                         } else
-                        if (QString(inner_obj_name) == QString("daily_ticket_special_day_range")) {
+                        if (QString(inner_obj_name) == QString("daily_ticket_from_offset_min")) {
                             if (k->value.IsInt()) {
-                                DailyTicket.daily_ticket_special_day_range = k->value.GetInt();
+                                int const from_offset_min = k->value.GetInt();
+                                DailyTicket.daily_ticket_from_offset_min = from_offset_min;
+                            }
+                        } else
+                        if (QString(inner_obj_name) == QString("daily_ticket_to_offset_max")) {
+                            if (k->value.IsInt()) {
+                                int to_offset_max = k->value.GetInt();
+                                DailyTicket.daily_ticket_to_offset_max = to_offset_max;
                             }
                         }
                         break;
                     case MemberType::CustomerType:
+                        if (QString(inner_obj_name) == QString("cust_id")) {
+                            if (k->value.IsInt()) {
+                                Customer.cust_id = k->value.GetInt();
+                            }
+                        } else
                         if (QString(inner_obj_name) == QString("cust_type")) {
                             if (k->value.IsInt()) {
                                 int cust_type = k->value.GetInt();
@@ -313,21 +320,37 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pra_price") == 0) PaymentRate.pra_price = k->value.GetDouble();
 						break;
 					case MemberType::PaymentOptionType:
-						if (strcmp(inner_obj_name, "pop_id") == 0) PaymentOption.pop_id = k->value.GetInt();
+                        if (strcmp(inner_obj_name, "pop_id") == 0) {
-						else if (strcmp(inner_obj_name, "pop_label") == 0) PaymentOption.pop_label = k->value.GetString();
+                            this->currentPaymentOptions.append(ATBPaymentOption());
-						else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) PaymentOption.pop_payment_method_id = k->value.GetInt();
+                            this->currentPaymentOptions.last().reset();
-						else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) PaymentOption.pop_day_end_time = k->value.GetString();
+                            this->currentPaymentOptions.last().pop_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pop_day_night_end_time") == 0) PaymentOption.pop_day_night_end_time = k->value.GetString();
+                        } else if (strcmp(inner_obj_name, "pop_label") == 0) {
-						else if (strcmp(inner_obj_name, "pop_price_night") == 0) PaymentOption.pop_price_night = k->value.GetDouble();
+                            this->currentPaymentOptions.last().pop_label = k->value.GetString();
-						else if (strcmp(inner_obj_name, "pop_min_time") == 0) PaymentOption.pop_min_time = k->value.GetDouble();
+                        } else if (strcmp(inner_obj_name, "pop_payment_method_id") == 0) {
-						else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
+                            this->currentPaymentOptions.last().pop_payment_method_id = k->value.GetInt();
-						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
+                        } else if (strcmp(inner_obj_name, "pop_day_end_time") == 0) {
-						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
+                            this->currentPaymentOptions.last().pop_day_end_time = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pop_carry_over_time_range_id") == 0) PaymentOption.pop_carry_over_time_range_id = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_day_night_end_time") == 0) {
-                        else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
+                            this->currentPaymentOptions.last().pop_day_night_end_time = k->value.GetString();
-                        else if (strcmp(inner_obj_name, "pop_business_hours") == 0) PaymentOption.pop_business_hours = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_price_night") == 0) {
-                        else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) PaymentOption.pop_time_step_config = k->value.GetInt();
+                            this->currentPaymentOptions.last().pop_price_night = k->value.GetDouble();
-                        this->currentPaymentOptions = PaymentOption;
+                        } else if (strcmp(inner_obj_name, "pop_min_time") == 0) {
+                            this->currentPaymentOptions.last().pop_min_time = k->value.GetDouble();
+                        } else if (strcmp(inner_obj_name, "pop_max_time") == 0) {
+                            this->currentPaymentOptions.last().pop_max_time = k->value.GetDouble();
+                        } else if (strcmp(inner_obj_name, "pop_min_price") == 0) {
+                            this->currentPaymentOptions.last().pop_min_price = k->value.GetDouble();
+                        } else if (strcmp(inner_obj_name, "pop_carry_over") == 0) {
+                            this->currentPaymentOptions.last().pop_carry_over = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_carry_over_time_range_id") == 0) {
+                            this->currentPaymentOptions.last().pop_carry_over_time_range_id = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) {
+                            this->currentPaymentOptions.last().pop_daily_card_price = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_business_hours") == 0) {
+                            this->currentPaymentOptions.last().pop_business_hours = k->value.GetInt();
+                        } else if (strcmp(inner_obj_name, "pop_time_step_config") == 0) {
+                            this->currentPaymentOptions.last().pop_time_step_config = k->value.GetInt();
+                        }
                         break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -385,12 +408,16 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 				case MemberType::PaymentMethodType:
 					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 					break;
-				case MemberType::PaymentRateType:
+                case MemberType::PaymentRateType:
+                    // qCritical() << "PaymentRate" << PaymentRate;
                     cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
 					break;
-				case MemberType::PaymentOptionType:
+                case MemberType::PaymentOptionType: {
-					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
+                    if (!this->currentPaymentOptions.isEmpty()) {
-					break;
+                        ATBPaymentOption const &PaymentOption = this->currentPaymentOptions.last();
+                        cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
+                    }
+                } break;
 				case MemberType::DurationType:
 					cfg->Duration.insert(pair<int, ATBDuration>(Duration.pun_id, Duration));
 					break;
@@ -410,22 +437,25 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					cfg->YearPeriod.insert(pair<int, ATBPeriodYear>(YearPeriod.pye_id, YearPeriod));
 					break;
                 case MemberType::DailyTicketType:
-                    // qCritical() << DailyTicket;
+                    cfg->DailyTicket.insert(pair<int, ATBDailyTicket>(DailyTicket.daily_ticket_id, DailyTicket));
+                    qCritical() << DailyTicket;
+                    DailyTicket.reset();
                     break;
                 case MemberType::CustomerType:
-                    // qCritical() << Customer;
+                    cfg->Customer.insert(pair<int, ATBCustomer>(Customer.cust_id, Customer));
+                    qCritical() << Customer;
                     break;
                 case MemberType::TimeBaseType:
-                    qCritical() << TimeBase;
                     cfg->TimeBase.insert(pair<int, ATBTimeBase>(TimeBase.tbase_id, TimeBase));
+                    qCritical() << TimeBase;
                     break;
                 case MemberType::TimeRangeType:
-                    qCritical() << TimeRange;
                     cfg->TimeRange.insert(pair<int, ATBTimeRange>(TimeRange.time_range_id, TimeRange));
+                    // qCritical() << TimeRange;
                     break;
                 case MemberType::TimeStepConfigType:
-                    qCritical() << TimeStepConfig;
                     cfg->TimeStepConfig.insert(pair<int, ATBTimeStepConfig>(TimeStepConfig.tsconfig_id, TimeStepConfig));
+                    // qCritical() << TimeStepConfig;
                     break;
                 default:
 					break;
@@ -440,12 +470,123 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 	}
 }
 
-
-
 ATBPaymentOption const &Configuration::getPaymentOptions() const {
-    return this->currentPaymentOptions;
+    Q_ASSERT(!this->currentPaymentOptions.isEmpty());
+    return this->currentPaymentOptions.at(0);
 }
 
 ATBPaymentOption &Configuration::getPaymentOptions() {
+    Q_ASSERT(!this->currentPaymentOptions.isEmpty());
+    return this->currentPaymentOptions[0];
+}
+
+QVector<ATBPaymentOption> const &Configuration::getAllPaymentOptions() const {
     return this->currentPaymentOptions;
 }
+
+QVector<ATBPaymentOption> &Configuration::getAllPaymentOptions() {
+    return this->currentPaymentOptions;
+}
+
+std::optional<QVector<ATBDailyTicket>>
+Configuration::getDailyTicketsForAllKeys() const {
+    QVector<ATBDailyTicket> tickets;
+    std::optional<QVector<ATBDailyTicket>> value;
+
+    for (std::multimap<int, ATBDailyTicket>::const_iterator it = this->DailyTicket.cbegin();
+        it != this->DailyTicket.cend(); ++it) {
+        tickets.append(it->second);
+    }
+
+    if (tickets.size() > 0) {
+        value = value.value_or(tickets);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBDailyTicket>>
+Configuration::getDailyTicketsForKey(int key) const {
+    QVector<ATBDailyTicket> tickets;
+    std::optional<QVector<ATBDailyTicket>> value;
+
+    tickets.clear();
+
+    for (auto[it, rangeEnd] = this->DailyTicket.equal_range(key); it != rangeEnd; ++it) {
+        tickets.append(it->second);
+    }
+
+    if (tickets.size() > 0) {
+        value = value.value_or(tickets);
+    }
+
+    return value;
+}
+
+std::optional<QVector<ATBPaymentRate>>
+Configuration::getPaymentRateForAllKeys() const {
+    QVector<ATBPaymentRate> paymentRates;
+    std::optional<QVector<ATBPaymentRate>> value;
+
+    for (std::multimap<int, ATBPaymentRate>::const_iterator it = this->PaymentRate.cbegin();
+        it != this->PaymentRate.cend(); ++it) {
+        paymentRates.append(it->second);
+    }
+
+    if (paymentRates.size() > 0) {
+        value = value.value_or(paymentRates);
+    }
+
+    return value;
+
+}
+
+std::optional<QVector<ATBPaymentRate>>
+Configuration::getPaymentRateForKey(int key) const {
+    QVector<ATBPaymentRate> paymentRate;
+    std::optional<QVector<ATBPaymentRate>> value;
+
+    paymentRate.clear();
+
+    for (auto[it, rangeEnd] = this->PaymentRate.equal_range(key); it != rangeEnd; ++it) {
+        paymentRate.append(it->second);
+    }
+
+    if (paymentRate.size() > 0) {
+        value = value.value_or(paymentRate);
+    }
+
+    return value;
+}
+
+std::optional<ATBCustomer>
+Configuration::getCustomerForType(ATBCustomer::CustomerType customerType) {
+    for (std::multimap<int, ATBCustomer>::const_iterator it = this->Customer.cbegin();
+        it != this->Customer.cend(); ++it) {
+        ATBCustomer const &customer = it->second;
+        if (customer.cust_type == customerType) {
+            return customer;
+        }
+    }
+
+    return std::nullopt;
+}
+
+std::optional<ATBWeekDaysWorktime>
+Configuration::getWeekDayWorkTime(QTime const &time, Qt::DayOfWeek dayOfWeek) {
+    ATBWeekDaysWorktime worktime;
+    std::optional<ATBWeekDaysWorktime> value;
+
+    std::multimap<int, ATBWeekDaysWorktime>::const_iterator it = this->WeekDaysWorktime.find((int)dayOfWeek);
+    if (it != this->WeekDaysWorktime.cend()) {
+
+        ATBWeekDaysWorktime const &wt = it->second;
+
+        if (time >= QTime::fromString(wt.pwd_time_from.c_str(), Qt::ISODate)
+         && time < QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate)) {
+            value = value.value_or(wt);
+        }
+    }
+
+    return value;
+}

library/src/utilities.cpp

@@ -4,7 +4,7 @@
 #include <QDebug>
 #include <algorithm>
 
-static int protection_counter = 0;
+// static int protection_counter = 0;
 
 /// <summary>
 /// Helper function
@@ -354,22 +354,24 @@ 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();
 
-    switch (it->first) {
+    if (it != cfg->PaymentOption.cend()) {
-    case PaymentMethod::Linear:
+        switch (it->first) {
-        return PaymentMethod::Linear;
+        case PaymentMethod::Linear:
-    case PaymentMethod::Steps:
+            return PaymentMethod::Linear;
-        return PaymentMethod::Steps;
+        case PaymentMethod::Steps:
-    case PaymentMethod::Degressive:
+            return PaymentMethod::Steps;
-        return PaymentMethod::Degressive;
+        case PaymentMethod::Degressive:
-    case PaymentMethod::Progressive:
+            return PaymentMethod::Degressive;
-        return PaymentMethod::Progressive;
+        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 NoRestriction_24_7: return BusinessHours::NoRestriction_24_7;
-    case OnlyWorkingDays: return OnlyWorkingDays;
+    case OnlyWorkingDays: return BusinessHours::OnlyWorkingDays;
-    case OnlyWeekDays: return OnlyWeekDays;
+    case OnlyWeekDays: return BusinessHours::OnlyWeekDays;
-    case OnlyWeekEnd: return OnlyWeekEnd;
+    case OnlyWeekEnd: return BusinessHours::OnlyWeekEnd;
-    case OnlyOfficialHolidays: return OnlyOfficialHolidays;
+    case OnlyOfficialHolidays: return BusinessHours::OnlyOfficialHolidays;
-    case OnlySpecialDays: return OnlySpecialDays;
+    case OnlySpecialDays: return BusinessHours::OnlySpecialDays;
-    case OnlySchoolHolidays: return OnlySchoolHolidays;
+    case OnlySchoolHolidays: return BusinessHours::OnlySchoolHolidays;
-    case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
+    case SpecialAndSchoolHolidays: return BusinessHours::SpecialAndSchoolHolidays;
-    case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
+    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

@@ -31,16 +31,62 @@ extern "C" char* strptime(const char* s,
 #include <fstream>
 #include <sstream>
 #include "calculator_functions.h"
-#include <calculate_price.h>
+#include "calculate_price.h"
 
 #define SZEGED                                  (0)
+#define SCHOENAU_KOENIGSEE                      (0)
 #define NEUHAUSER_KORNEUBURG                    (0)
 #define NEUHAUSER_LINSINGER_MASCHINENBAU        (0)
-#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (0)
+#define NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM (1)
-#define NEUHAUSER_BILEXA_GALTUER                (1)
+#define NEUHAUSER_BILEXA_GALTUER                (0)
 
 
 int main() {
+#if SCHOENAU_KOENIGSEE==1
+    QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff01.json");
+    //QString f("/opt/ptu5/opt/customer_332/etc/psa_tariff/tariff02.json");
+
+    std::ifstream input(f.toUtf8().constData());
+
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    if (isParsed) {
+        qCritical() << "parsed" << f;
+
+        int minParkingTime = get_minimal_parkingtime(&cfg);
+        qCritical() << "minimal_parking_time" << minParkingTime;
+
+        QDateTime start = QDateTime::currentDateTime();
+
+        // zone 1
+        //int timeSteps[9] = {60, 180, 1440, 2880, 4320, 5670, 7200, 8640, 10080};
+
+
+        // zone 2
+        //int timeSteps[3] = {60, 180, 1440};
+
+        static QList<int> const timeSteps = Calculator::GetInstance().GetTimeSteps(&cfg);
+        qCritical() << "TimeSteps" << timeSteps;
+
+        // for (int i = 0 ; i < timeSteps.size(); ++i) {
+        //    QDateTime end = start.addSecs(timeSteps.at(i)*60);
+        //
+        //    double price = Calculator::GetInstance().GetCostFromDuration(
+        //                         &cfg,
+        //                         start,
+        //                         timeSteps.at(i));
+        //    qDebug() << "GetCostFromDuration() time: " << timeSteps.at(i) << "price=" << price;
+        //}
+    }
+#endif
+
 #if NEUHAUSER_BILEXA_GALTUER==1
     std::ifstream input("/opt/ptu5/opt/customer_745/etc/psa_tariff/tariff01.json");
 
@@ -75,7 +121,7 @@ int main() {
 #endif
 
 #if NEUHAUSER_NORDISCHES_AUSBILDUNGSZENTRUM==1
-    std::ifstream input("/tmp/tariff_naz.json");
+    std::ifstream input("/opt/ptu5/opt/customer_744/etc/psa_tariff/tariff01.json");
 
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
@@ -87,20 +133,37 @@ int main() {
     cout << endl;
 
     if (isParsed) {
-        // Calculator calculator;
+        QDateTime s(QDate(2023, 11, 30), QTime());
+        QDateTime end;
+        struct price_t price;
+        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)
+                        << "end" << end.toString(Qt::ISODate) << "price" << price.netto;
+        }
+        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
 
 #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());
@@ -119,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;
@@ -186,33 +249,37 @@ int main() {
 
 #elif SZEGED==1
     std::ifstream input;
+    int pop_min_time;
     int pop_max_time;
+    int pop_min_price;
+    int pop_max_price;
 
-    for (int t=6; t < 7; t+=20) {
+    for (int t=2; t < 3; ++t) {
+    //for (int t=6; t < 7; t+=20) {
         switch (t) {
         case 1: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
-            pop_max_time = 6*60;
+            //pop_max_time = 6*60;
         } break;
         case 2: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff02.json");
-            pop_max_time = 5*60;
+            //pop_max_time = 5*60;
         } break;
         case 3: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff03.json");
-            pop_max_time = 6*60;
+            //pop_max_time = 6*60;
         } break;
         case 4: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff04.json");
-            pop_max_time = 4*60;
+            //pop_max_time = 4*60;
         } break;
         case 5: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff05.json");
-            pop_max_time = 6*60;
+            //pop_max_time = 6*60;
         } break;
         case 6: {
             input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff06.json");
-            pop_max_time = 4*60;
+            //pop_max_time = 4*60;
         } break;
         default:
             continue;
@@ -221,13 +288,24 @@ int main() {
         while(input >> sstr.rdbuf());
         std::string json(sstr.str());
 
-        Calculator calculator;
         Configuration cfg;
 
         bool isParsed = cfg.ParseJson(&cfg, json.c_str());
         cout << endl;
 
         if (isParsed) {
+            // test library functions
+
+            pop_min_time = get_minimal_parkingtime(&cfg);
+            pop_max_time = get_maximal_parkingtime(&cfg);
+            pop_min_price = get_minimal_parkingprice(&cfg);
+            pop_max_price = get_maximal_parkingprice(&cfg);
+
+            qCritical() << " pop_min_time: " << pop_min_time;
+            qCritical() << " pop_max_time: " << pop_max_time;
+            qCritical() << "pop_min_price: " << pop_min_price;
+            qCritical() << "pop_max_price: " << pop_max_price;
+
             {
                 // zone 1 (lila)
                 QDateTime s(QDate(2023, 11, 30), QTime());
@@ -235,17 +313,17 @@ int main() {
                 for (int duration = 15; duration <= pop_max_time; duration += 5) {
                     for (int offset = 480; offset < 1080; ++offset) {
                         QDateTime start = s.addSecs(offset * 60);
-                        //qCritical() << "start" << start.toString(Qt::ISODate);
+                        // qCritical() << "start" << start.toString(Qt::ISODate);
 
-                        double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration);
+                        double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, duration);
-                        //Q_ASSERT(cost == duration*2.5);
+                        // Q_ASSERT(cost == duration*2.5);
-                        //qCritical() << "";
+                        qCritical() << "";
-                        //qCritical() << "start" << start.toString(Qt::ISODate)
+                        qCritical() << "start" << start.toString(Qt::ISODate)
-                        //            << "end" << end.toString(Qt::ISODate)
+                                    << "end" << end.toString(Qt::ISODate)
-                        //            << "duration" << duration
+                                    << "duration" << duration
-                        //            << "cost" << cost;
+                                    << "cost" << cost;
 
-                        std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), 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
@@ -253,20 +331,22 @@ int main() {
                     }
                 }
             }
+#if 0
             {
                 QDateTime start(QDate(2023, 12, 1), QTime(18, 0));
                 QDateTime end;
-                double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+                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.GetCostFromDuration(&cfg, 3, start, end, 60);
+                double cost = Calculator::GetInstance().GetCostFromDuration(&cfg, 3, start, end, 60);
                 //Q_ASSERT(cost == 150);
                 qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
             }
+#endif
         }
     }
 

tariffs/tariff_naz.json

@@ -43,16 +43,39 @@
       "tbase_label": "relative time"
     }
   ],
+  "TimeRange" : [
+    {
+      "time_range_id": 1,
+      "time_range_from": "00:00:00",
+      "time_range_to": "00:01:00",
+      "time_range_comment": "<from>-<to> <= 60secs -> time range is time point <from>"
+    }
+  ],
+  "TimeStepConfig" : [
+    {	
+      "tsconfig_id" : 1,
+      "tsconfig_label" : "static",
+      "tsconfig_comment" : "read time steps as given in jsonfiles"		
+    },
+    {
+      "tsconfig_id" : 2,
+      "tsconfig_label" : "dynamic",
+      "tsconfig_comment" : "determine timesteps at runtime"		
+    }
+  ],
   "Customer": [
     {
+      "cust_id": 1,
       "cust_type": 1000,
       "cust_label": "Adult"
     },
     {
+      "cust_id": 2,
       "cust_type": 1001,
       "cust_label": "Child"
     },
     {
+      "cust_id": 3,
       "cust_type": 1002,
       "cust_label": "Teen"
     }
@@ -62,64 +85,72 @@
       "pop_id": 1049,
       "pop_label": "Zone 1",
       "pop_payment_method_id": 4,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "08:00:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_night_end_time": "20:00:00",
       "pop_price_night": 0,
       "pop_min_time": 1,
-      "pop_max_time": 2,
+      "pop_max_time": 720,
-      "pop_min_price": 900,
+      "pop_min_price": 400,
       "pop_carry_over": 0,
       "pop_daily_card_price": 0,
-      "pop_business_hours": 2 
+      "pop_business_hours": 128
+    },
+    {
+      "pop_id": 1050,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "08:00:00",
+      "pop_day_night_end_time": "20:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 1,
+      "pop_max_time": 720,
+      "pop_min_price": 800,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0,
+      "pop_business_hours": 128 
     }
   ],
   "PaymentRate": [
     {
-      "pop_comment":"Unused"
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 400
+    },
+    {
+      "pra_payment_option_id": 1050,
+      "pra_payment_unit_id": 2,
+      "pra_price": 800
     }
   ],
   "DailyTicket": [
     {
       "daily_ticket_payment_option_id": 1049,
-      "daily_ticket_unit_id": 1,
+      "daily_ticket_id": 1,
-      "daily_ticket_price": 400,
+      "daily_ticket_price_id": 1,
-
+      "daily_ticket_tb_id": 1,
-      "daily_ticket_tbase_type": 0,
+      "daily_ticket_clearance_customer_ids": [3],
-      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
+      "daily_ticket_from_min": "08:00:00",
-
+      "daily_ticket_to_max": "20:00:00",
-      "daily_ticket_clearance_customer_type": 1002,
+      "daily_ticket_from_offset_min": 0,
-      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
+      "daily_ticket_to_offset_max": 0
-
-      "daily_ticket_weekday_range" : 1,
-      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
-      "daily_ticket_special_day_range": 0
     },
     {
-      "daily_ticket_payment_option_id": 1049,
+      "daily_ticket_payment_option_id": 1050,
-      "daily_ticket_unit_id": 2,
+      "daily_ticket_id": 2,
-      "daily_ticket_price": 800,
+      "daily_ticket_price_id": 2,
-
+      "daily_ticket_tb_id": 1,
-      "daily_ticket_tbase_type": 0,
+      "daily_ticket_clearance_customer_ids": [1],
-      "daily_ticket_tbase_type_comment": "absolute or relative to offset",
+      "daily_ticket_from_min": "08:00:00",
-
+      "daily_ticket_to_max": "20:00:00",
-      "daily_ticket_clearance_customer_type": 1000,
+      "daily_ticket_from_offset_min": 0,
-      "daily_ticket_clearance_customer_type_comment": "who is allowed to buy a ticket",
+      "daily_ticket_to_offset_max": 0
-
-      "daily_ticket_weekday_ranges" : 1,
-      "daily_ticket_weekday_ranges_comment" : "ticket valid on week day id and associated time range",
-      "daily_ticket_special_day_ranges": 0
     }
   ],
   "Duration": [
     {
-      "pun_comment":"Unused"
+      "pun_id": 1,
-    }
+      "pun_label": "Tagesticket",
-  ],
+      "pun_duration": 720
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
     }
   ],
   "WeekDaysWorktime": [
@@ -168,7 +199,7 @@
     {
       "pwd_id": 627,
       "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
+      "pwd_period_day_in_week_id": 7,
       "pwd_time_from": "08:00:00",
       "pwd_time_to": "20:00:00"
     }