Add class Ticket for future use.

private_GetCostFromDuration().

library/include/mobilisis/atb_project.h

@@ -0,0 +1,13 @@
+#ifndef ATB_PROJECT_H_INCLUDED
+#define ATB_PROJECT_H_INCLUDED
+
+#include <QString>
+
+class ATBProject {
+  public:
+    QString project;
+    QString version;
+    QString info;
+};
+
+#endif // ATB_PROJECT_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -109,7 +109,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 
-CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             time_t end_parking_time,
@@ -118,10 +118,11 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
-                                            QDateTime const &end_parking_time,
-                                            struct price_t *price);
+                                            int netto_parking_time,
+                                            QDateTime &end_parking_time,    // return value
+                                            struct price_t *price);         // return value
 
-CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             double cost,
@@ -131,6 +132,11 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
                                             double cost,
+                                            QDateTime &ticketEndTime);      // return value
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
+                                            parking_tariff_t *tariff,
+                                            QDateTime const &start_parking_time,
                                             QDateTime &ticketEndTime);
 //#ifdef __cplusplus
 //} // extern "C"

library/include/mobilisis/calculator_functions.h

@@ -1,12 +1,14 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
-
+#include "payment_method.h"
+#include <QDateTime>
 using namespace std;
 
 class Calculator
 {
 public:
+
 	/// <summary>
 	/// Gets duration in seconds from cost
 	/// </summary>
@@ -23,7 +25,43 @@ public:
 	/// <param name="tariff_cfg">Pointer to configuration</param>
 	/// <param name="vehicle_type">Type of vehicle</param>
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
+    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-	double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
+    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, int durationMin, bool nextDay = false, bool prepaid = false);
+
+    // Daily ticket
+    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+
+    //
+    // helper function to find time steps for a tariff with PaymentMethod::Steps
+    // (e.g. Schoenau/Koenigsee)
+    //
+    QList<int> GetTimeSteps(Configuration *cfg) const;
+
+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;
+
+    PaymentMethod getPaymentMethodId(Configuration const *cfg);
+    int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+    int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
+
+    uint32_t private_GetCostFromDuration(Configuration const* cfg,
+                                         QDateTime const &start,
+                                         QDateTime &end,
+                                         int durationMinutes,
+                                         bool nextDay = false,
+                                         bool prepaid = false,
+                                         bool overtime = false);
+
+    bool checkDurationMinutes(bool overTime,
+                              int minParkingTime, int maxParkingTime,
+                              int durationMinutes);
+
+    //
+    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
+    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
 };

library/include/mobilisis/configuration.h

@@ -20,6 +20,7 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
+#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -27,7 +28,7 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-
+    ATBProject project;
     ATBCurrency Currency;
 	ATBDuration duration;
 
@@ -48,6 +49,8 @@ public:
 	/// <returns>Returns operation status bool (OK | FAIL) </returns>
 	bool ParseJson(Configuration* cfg, const char* json);
 
+    ATBPaymentOption const & getPaymentOptions();
+
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -55,4 +58,6 @@ private:
 	/// <param name="member_name"></param>
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
+
+    ATBPaymentOption currentPaymentOptions;
 };

library/include/mobilisis/day_of_week.h

@@ -2,12 +2,12 @@
 
 enum DayOfWeek
 {
-	Saturday = 0x06,
-	Sunday = 0x01,
-	Monday = 0x02,
+    Monday = 0x01,
     Tuesday = 0x02,
     Wednesday = 0x03,
     Thursday = 0x04,
     Friday = 0x05,
+    Saturday = 0x06,
+    Sunday = 0x07,
     UndefinedDay = 0xFF
 };

library/include/mobilisis/payment_method.h

@@ -1,10 +1,12 @@
-#pragma once
+#ifndef PAYMENT_METHOD_H_INCLUDED
+#define PAYMENT_METHOD_H_INCLUDED
 
-enum PaymentMethod
-{
+enum PaymentMethod {
 	Undefined = 0xFF,
 	Progressive = 0x01,
 	Degressive = 0x02,
 	Linear = 0x03,
 	Steps = 0x04
 };
+
+#endif // PAYMENT_METHOD_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -14,4 +14,5 @@ public:
 	double pop_max_time;
 	double pop_min_price;
 	int pop_carry_over;
+    int pop_daily_card_price;
 };

library/include/mobilisis/tariff_time_range.h

@@ -1,17 +1,28 @@
-// #pragma once
 #ifndef TARIFF_TIME_RANGE_H_INCLUDED
 #define TARIFF_TIME_RANGE_H_INCLUDED
 
-#include <ctime>
+#include <QTime>
 
 /// <summary>
 /// Time range definition
 /// </summary>
 class TariffTimeRange {
+    QTime m_time_from;
+    QTime m_time_until;
+
 public:
-	time_t time_from;
-    time_t time_to;
-    TariffTimeRange() : time_from(0), time_to(0) {}
+
+    TariffTimeRange()
+    : m_time_from(QTime())
+    , m_time_until(QTime()) {}
+
+    void setTimeRange(QTime const& from, QTime const &until) {
+        m_time_from = from;
+        m_time_until = until;
+    }
+
+    QTime const &getTimeFrom() const { return m_time_from; }
+    QTime const &getTimeUntil() const { return m_time_until; }
 };
 
 #endif // TARIFF_TIME_RANGE_H_INCLUDED

library/include/mobilisis/ticket.h

@@ -0,0 +1,64 @@
+#ifndef TICKET_H_INCLUDED
+#define TICKET_H_INCLUDED
+
+#include <tuple>
+#include <vector>
+
+#include <QDebug>
+#include <QDebugStateSaver>
+#include <QStringList>
+#include <QDateTime>
+
+#define NOT_INITIALIZED         (0)
+#define VALID                   (1)
+#define INVALID_FROM_DATETIME   (2)
+#define INVALID_UNTIL_DATETIME  (3)
+#define STATUS_END              (4)
+
+class Ticket {
+    enum {CODE=0, CODE_STR=1, CODE_DESC=3};
+public:
+    using Status = std::tuple<int, char const*, char const*>;
+
+    explicit Ticket();
+   
+    explicit operator bool() { return std::get<CODE>(m_status) == VALID; }
+    operator QString();
+
+    Status getStatus() const;
+    QDateTime getValidFrom() const;
+    QDateTime getValidUntil() const;
+    uint32_t getPrice() const;
+
+    Status setStatus(Status status);
+    void setValidFrom(QDateTime const &validFrom);
+    void setValidUntil(QDateTime const &validUnil);
+    void setPrice(uint32_t price);
+
+private:
+    Status m_status;
+
+    QDateTime m_validFrom;
+    QDateTime m_validUntil;
+    
+    int m_durationMinutesNetto;
+    int m_durationMinutesBrutto;
+
+    uint32_t m_price;
+
+    static constexpr const Status s[STATUS_END] = {
+        {NOT_INITIALIZED       , "NOT_INITIALIZED"       , "Ticket not initialized"           },
+        {VALID                 , "VALID"                 , "Ticket is valid"                  },
+        {INVALID_FROM_DATETIME , "INVALID_FROM_DATETIME" , "Ticket has invalid start datetime"},
+        {INVALID_UNTIL_DATETIME, "INVALID_UNTIL_DATETIME", "Ticket has invalid end datetime"  }
+    };
+};
+    
+QDebug operator<<(QDebug debug, Ticket::Status const &status) {
+    QDebugStateSaver saver(debug);
+    debug << "Ticket-Status: " << std::get<1>(status) 
+          << "(" << std::get<2>(status) << ")";
+    return debug;
+}
+
+#endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -9,46 +9,46 @@
 #include "configuration.h"
 #include "time_range.h"
 
+#include <QDateTime>
+
 using namespace std;
 
-class Utilities {
-public:
-
+namespace Utilities {
 	/// <summary>
 	/// Get day of week from current date (Zeller's Algorithm), starting day is Sunday
 	/// </summary>
 	/// <param name="date"></param>
 	/// <returns></returns>
-	static DayOfWeek GetDayOfWeek(struct tm* tm);
+	DayOfWeek GetDayOfWeek(struct tm* tm);
 
 	/// <summary>
 	/// Date and time parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	static struct tm DateTimeToStructTm(const char* dateTimeStr);
+	struct tm DateTimeToStructTm(const char* dateTimeStr);
 
 	/// <summary>
 	/// Date parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	static struct tm DateToStructTm(const char* dateStr);
+	struct tm DateToStructTm(const char* dateStr);
 
 	/// <summary>
 	/// Time parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	static struct tm TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday);
+	struct tm TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday);
 
 	/// <summary>
 	/// Get current local time
 	/// </summary>
 	/// <returns>Returns time_t structure</returns>
-	static time_t GetCurrentLocalTime();
+	time_t GetCurrentLocalTime();
 
 	/// <summary>
 	/// Zeller's algorithm for determining day of week
 	/// </summary>
-	static int ZellersAlgorithm(int day, int month, int year);
+	int ZellersAlgorithm(int day, int month, int year);
 
 	/// <summary>
 	///  Checks if current datetime is in range between start and end month of parking worktime
@@ -56,17 +56,23 @@ public:
 	/// <param name="tariff_cfg"></param>
 	/// <param name="currentDateTime"></param>
 	/// <returns></returns>
-	static bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
+	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
 
 	/// <summary>
 	/// Check permissions
 	/// </summary>
-	static bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
+	bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
+	bool CheckSpecialDay(Configuration const *cfg,
+						 QDateTime const &currentDateTimeS,
+						 int* specialDayId, uint32_t *specialDayPrice);
 
 	/// <summary>
 	/// Calculates price per unit
 	/// </summary>
 	/// <param name="pra_price"></param>
 	/// <returns></returns>
-	static double CalculatePricePerUnit(double pra_price);
-};
+	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
+
+    QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
+    QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
+}

library/library.pro

@@ -25,7 +25,8 @@ SOURCES += \
     src/utilities.cpp \
     src/configuration.cpp \
     src/tariff_log.cpp \
-    src/calculate_price.cpp
+    src/calculate_price.cpp \
+    src/ticket.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -65,7 +66,9 @@ HEADERS += \
     include/mobilisis/tariff_period_year.h \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
-    include/mobilisis/calculate_price.h
+    include/mobilisis/calculate_price.h \
+    include/mobilisis/atb_project.h \
+    include/mobilisis/ticket.h
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -92,14 +92,16 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
     }
 }
 
+
+// this is currently not used
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
         time_t start_parking_time, // in minutes
-                                    time_t end_parking_time,   // in minutes
+        time_t end_parking_time,   // netto time in minutes
         struct price_t *price) {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -129,13 +131,15 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     QTime const t(0, 0, 0);
     QDateTime start(d, t, Qt::UTC);
     start = start.toLocalTime().addSecs(start_parking_time * 60);
+    QDateTime end(start);
     if (start.isValid()) {
-        QString cs = start.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
-                        cs.toLocal8Bit().constData(),
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
+                    start,
+                    end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -152,49 +156,50 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
         parking_tariff_t *tariff,
         QDateTime const &start_parking_time,
-                                            QDateTime const &end_parking_time,
-                                            struct price_t *price) {
+        int netto_parking_time,
+        QDateTime &end_parking_time,
+        struct price_t *price)
+{
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
+    double minMin = tariff->getPaymentOptions().pop_min_time;
+    double maxMin = tariff->getPaymentOptions().pop_max_time;
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
                 << "          start_parking_time: " << start_parking_time << endl
-                << "            end_parking_time: " << end_parking_time   << endl
+                << "          netto_parking_time: " << netto_parking_time << endl
                 << "                      minMin: " << minMin << endl
                 << "                      maxMin: " << maxMin;
 
 
-    int const duration = (end_parking_time.toSecsSinceEpoch() -
-                          start_parking_time.toSecsSinceEpoch()) / 60;
-
-    if (duration < 0) {
+    if (netto_parking_time < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
                           .arg(end_parking_time.toString(Qt::ISODate),
                                start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
-    if (duration > maxMin) {
-        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
+    if (netto_parking_time > maxMin) {
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
         return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
     }
-    if (duration < minMin) {
-        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
+    if (netto_parking_time < minMin) {
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
-    if (duration == 0) {
+    if (netto_parking_time == 0) {
         memset(price, 0x00, sizeof(*price));
         return calcState.set(CalcState::State::SUCCESS);
     }
 
     if (start_parking_time.isValid()) {
-        QString cs = start_parking_time.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
-                        cs.toLocal8Bit().constData(),
-                        duration, false, true);
-        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
+                        tariff,
+                        tariff->getPaymentOptions().pop_payment_method_id,
+                        start_parking_time,         // starting time
+                        end_parking_time,           // return value: end time
+                        netto_parking_time,         // minutes, netto
+                        false, true);
+        double minCost = tariff->getPaymentOptions().pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -230,7 +235,8 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
-        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
+        duration = calculator.GetDurationFromCost(tariff,
+                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
         QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
@@ -249,12 +255,14 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         QDateTime const &start_parking_time,
         double price,
-                                            QDateTime &ticketEndTime) {
+        QDateTime &ticketEndTime)
+{
     CalcState calcState;
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = calculator.GetDurationFromCost(
-                                        tariff, PaymentOption::Option1,
+                    tariff,
+                    tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
                     price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
@@ -274,3 +282,30 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 
     return calcState.set(CalcState::State::SUCCESS);
 }
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
+{
+    CalcState calcState;
+    if (start_parking_time.isValid()) {
+
+        ticketEndTime = calculator.GetDailyTicketDuration(tariff,
+                                                            start_parking_time,
+                                                            tariff->getPaymentOptions().pop_payment_method_id,
+                                                            false);    // carry over
+
+        // DEBUG
+        qCritical() << "compute_duration_for_daily_ticket(): ";
+        qCritical() << "           ticketEndTime: " << ticketEndTime;
+
+        if (!ticketEndTime.isValid()) {
+            calcState.setDesc(QString("ticketEndTime=%1").arg(ticketEndTime.toString(Qt::ISODate)));
+            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
+        }
+
+    } else {
+        return calcState.set(CalcState::State::INVALID_START_DATE);
+    }
+
+    return calcState.set(CalcState::State::SUCCESS);
+}
+

library/src/calculator_functions.cpp

@@ -1,11 +1,14 @@
 #include "calculator_functions.h"
-#include "payment_method.h"
+#include "payment_option.h"
 #include "utilities.h"
 #include "tariff_log.h"
+#include "tariff_time_range.h"
 
 #include <sstream>
+#include <algorithm>
 #include <QDateTime>
-#include <qdebug.h>
+#include <QScopedArrayPointer>
+#include <QDebug>
 
 double total_duration_min = 0.0f;
 double total_cost = 0.0f;
@@ -19,6 +22,97 @@ inline struct tm* localtime_r(const time_t *clock, struct tm* result){
 }
 #endif
 
+QDateTime Calculator::GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over)
+{
+    if(!start_datetime.isValid()) {
+        return QDateTime();
+    }
+
+    double day_price = 0.0f;
+    int current_special_day_id = -1;
+    bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
+
+    QDateTime inputDateTime = start_datetime;
+    QTime worktime_from;
+    QTime worktime_to;
+
+    int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
+    if(daily_card_price <= 0) {
+        LOG_ERROR("Calculator::GetDailyTicketDuration(): Daily ticket price zero or less");
+        return QDateTime();
+    }
+
+    if(is_special_day)
+    {
+        worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str(), Qt::ISODate);
+        worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str(),Qt::ISODate);
+
+        if(inputDateTime.time() < worktime_from) inputDateTime.setTime(worktime_from);
+        if(carry_over) inputDateTime.setTime(worktime_from);
+
+        if(inputDateTime.time() >= worktime_to)
+        {
+            // Go to next day if outside worktime
+            inputDateTime = inputDateTime.addSecs(86400);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
+        }
+
+        if(day_price <=0)
+        {
+            // Go to next day if special day price is 0
+            inputDateTime = inputDateTime.addSecs(86400);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
+        }
+
+        int diff = abs(inputDateTime.time().secsTo(worktime_to));
+        inputDateTime = inputDateTime.addSecs(diff);
+
+        //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
+        return inputDateTime;
+    }
+    else
+    {
+        // Get day of week
+        int weekdayId = 0;
+        weekdayId = Utilities::ZellersAlgorithm(inputDateTime.date().day(),inputDateTime.date().month(),inputDateTime.date().year());
+
+        // If no working day found, skip it (recursively call method again)
+        size_t found = 0;
+        found = cfg->WeekDaysWorktime.count(weekdayId);
+
+        // When no workday found, go to next available day
+        if(found <=0)
+        {
+            inputDateTime = inputDateTime.addSecs(86400);
+            return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
+        }
+        else
+        {
+            worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str(),Qt::ISODate);
+            worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str(),Qt::ISODate);
+            if(inputDateTime.time() < worktime_from)
+                inputDateTime.setTime(worktime_from);
+
+            if(carry_over)
+                inputDateTime.setTime(worktime_from);
+
+            if(inputDateTime.time() >= worktime_to)
+            {
+                // Go to next day if outside worktime
+                inputDateTime = inputDateTime.addSecs(86400);
+                return GetDailyTicketDuration(cfg,inputDateTime, payment_option,true);
+            }
+
+            int diff = abs(inputDateTime.time().secsTo(worktime_to));
+            inputDateTime = inputDateTime.addSecs(diff);
+
+            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;            
+            return inputDateTime;
+        }
+    }
+
+    return QDateTime();
+}
 /// <inheritdoc/>
 std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             uint8_t payment_option,
@@ -27,22 +121,36 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             bool nextDay,
                                             bool prepaid)
 {
+
     // Get input date
     QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 
+    // use tariff with structure as for instance Schnau, Koenigsee:
+    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
+    {
+        inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
+
+        return inputDate.toString(Qt::ISODate).toStdString();
+    }
+
+
     // Get day of week
     int weekdayId = 0;
     weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
 
     //Get min and max time defined in JSON
     double minMin = 0;
-    minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
+    minMin = cfg->getPaymentOptions().pop_min_time;
 
     double maxMin = 0;
-    maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
+    maxMin = cfg->getPaymentOptions().pop_max_time;
 
     double min_price = 0;
-    min_price = cfg->PaymentOption.find(payment_option)->second.pop_min_price;
+    min_price = cfg->getPaymentOptions().pop_min_price;
+
     if(price < min_price)
     {
         return "PARKING NOT ALLOWED";
@@ -90,8 +198,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     else
     {
         // Set new price for the normal day
-        day_price = cfg->PaymentRate.find(payment_option)->second.pra_price;
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
+        int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
+        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
+
+        int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
+        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
 
         // If no working day found, skip it (recursively call method again)
         size_t found = 0;
@@ -109,14 +221,9 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     }
 
     if (price_per_unit < 0) price_per_unit = 1.0f;
-    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
 
-    if (price_per_unit < 0)
-    {
-        inputDate = inputDate.addDays(1);
-        inputDate.setTime(worktime_from);
-        return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
-    }
+    // if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED";
+    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
 
     // If overtime flag is set
     if (overtime || nextDay)
@@ -151,7 +258,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     while(true)
     {
-        if(money_left <= 0) break;
+        if((int)money_left <= 0) break;
 
         // Check year period
         bool isYearPeriodActive = false;
@@ -221,15 +328,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
     //    }
 
     double ret_val = 0;
-    double calc_price = (int)total_duration_min - (int)price / price_per_unit;
+    // double calc_price = (int)total_duration_min - (int)price / price_per_unit;
 
-    if (calc_price > 0 && total_duration_min > 0)
-    {
-        inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
-    }
+    //if (calc_price > 0 && total_duration_min > 0)
+    //{
+    //    inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
+    //}
 
     if(price >= min_price && total_duration_min >= minMin)
-        qDebug() << "Valid until: " << inputDate.toString(Qt::ISODate);
+        qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
     else
     {
         qDebug() << "Parking not allowed";
@@ -248,196 +355,321 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 ///////////////////////////////////////
 
 /// <inheritdoc/>
-double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_option, const char* start_datetime, double durationMin, bool nextDay, bool prepaid)
+///
+
+uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
+                                         QDateTime const &start,
+                                         quint64 timeStepInMinutes) const {
+    // for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
+    // special days, nonstop.
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        QDateTime const end = start.addSecs(timeStepInMinutes*60);
+        return GetCostFromDuration(cfg, start, end);
+    }
+    return 0;
+}
+
+uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
+                                         QDateTime const &start,
+                                         QDateTime const &end) const {
+    if (cfg->YearPeriod.size() == 0
+     && cfg->SpecialDays.size() == 0
+     && cfg->SpecialDaysWorktime.size() == 0) {
+        int const timeStepInMinutes = start.secsTo(end) / 60;
+        return GetPriceForTimeStep(cfg, timeStepInMinutes);
+    }
+    return 0;
+}
+
+
+
+
+///////////////////////////////////////
+
+/// <inheritdoc/>
+double Calculator::GetCostFromDuration(Configuration* cfg,
+                                       uint8_t payment_option,
+                                       const QDateTime start_datetime,
+                                       QDateTime &end_datetime,
+                                       int durationMinutes,
+                                       bool nextDay,
+                                       bool prepaid) {
+    if (cfg->YearPeriod.size() == 0
+        && cfg->SpecialDays.size() == 0
+        && cfg->SpecialDaysWorktime.size() == 0)
     {
+        end_datetime = start_datetime.addSecs(durationMinutes*60);
+        return GetCostFromDuration(cfg, start_datetime, end_datetime);
+    }
+
+    return private_GetCostFromDuration(cfg, start_datetime,
+                                       end_datetime, durationMinutes,
+                                       nextDay, prepaid);
+}
+
+int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
+}
+
+int Calculator::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
+    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
+}
+
+bool Calculator::checkDurationMinutes(bool overtime,
+                                      int minParkingTime,
+                                      int maxParkingTime,
+                                      int durationMinutes) {
+    if (!overtime) {
+        if (durationMinutes > maxParkingTime) {
+            qWarning() << QString("Total duration >= max_min (%1 >= %2)").arg(durationMinutes).arg(maxParkingTime);
+            return false;
+        }
+        if (durationMinutes < minParkingTime) {
+            qWarning() << QString("Total duration <= minMin (%1 <= %2)").arg(durationMinutes).arg(minParkingTime);
+            return false;
+        }
+    }
+    return true;
+}
+
+using namespace Utilities;
+
+uint32_t Calculator::private_GetCostFromDuration(Configuration const* cfg,
+                                                 QDateTime const &start,
+                                                 QDateTime &end,
+                                                 int durationMinutes,
+                                                 bool nextDay,
+                                                 bool prepaid,
+                                                 bool overtime) {
+    // TODO
+    static const PaymentMethod paymentMethodId = PaymentMethod::Linear;
+
+    static int const minParkingTimeMinutes = getMinimalParkingTime(cfg, paymentMethodId);
+    static int const maxParkingTimeMinutes = getMaximalParkingTime(cfg, paymentMethodId);
+
+    static bool const checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
+
+    if (!checkMinMaxMinutes) {
+        qCritical() << QString(
+            "ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID")
+                .arg(minParkingTimeMinutes).arg(maxParkingTimeMinutes);
+        return 0;
+    }
+
+    if (!checkDurationMinutes(overtime, minParkingTimeMinutes,
+                              maxParkingTimeMinutes, durationMinutes)) {
+        return 0;
+    }
+
     // Get input date
-    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
+    QDateTime inputDate = start;
 
     // Get day of week
-    int weekdayId = 0;
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
+    int const weekdayId = inputDate.date().dayOfWeek();
 
-    //Get min and max time defined in JSON
-    double minMin = 0;
-    minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
 
-    double maxMin = 0;
-    maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
+    uint32_t day_price = 0;
+    uint32_t price_per_unit = 0;
 
-    if (minMin < 0) minMin = 0;
-    if (maxMin < 0) maxMin = 0;
-    if (minMin >= maxMin)
-    {
-        LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
-        return 0.0f;
-    }
-    if (maxMin <= minMin)
-    {
-        LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
-        return 0.0f;
-    }
-
-    // Check overtime
-    if (!overtime)
-    {
-        if (durationMin > maxMin)
-        {
-            LOG_WARNING("Total duration is greater or equal to max_min");
-            return maxMin;
-        }
-
-        if (durationMin < minMin)
-        {
-            LOG_WARNING("Total duration is lower or equal to min_min");
-            return 0.0f;
-        }
-    }
-
-    // Get payment method
-    uint8_t p_method = PaymentMethod::Undefined;
-    p_method = payment_option;
-    LOG_DEBUG("Payment method id: ", (unsigned)p_method);
-
-    // Check special day
-    double day_price = 0.0f;
     int current_special_day_id = -1;
-    bool is_special_day = Utilities::CheckSpecialDay(cfg, inputDate.toString(Qt::ISODate).toStdString().c_str(), &current_special_day_id, &day_price);
-    LOG_DEBUG("Special day: ", is_special_day);
 
-    total_duration_min = durationMin;
-    LOG_DEBUG("Total min:", total_duration_min);
+    int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
+    QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
+    int index = 0;
 
-    double price_per_unit = 0.0f;
-    QTime worktime_from;
-    QTime worktime_to;
-
-    if(is_special_day)
-    {
-        // Set special day price
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
-        worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str());
-        worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str());
-    }
-    else
-    {
+    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &day_price)) {
+        // Set special day price:
+        // ACHTUNG: price_per_unit ist eigentlich immer preis pro minute !!!
+        price_per_unit = CalculatePricePerUnit(day_price);
+        worktime[index].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
+                                     SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
+    } else {
         // Set new price for the normal day
-        day_price = cfg->PaymentRate.find(payment_option)->second.pra_price;
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
+
+        int pop_id = cfg->PaymentOption.find(paymentMethodId)->second.pop_id;
+        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
+
+        int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
+        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
 
         // If no working day found, skip it (recursively call method again)
-        size_t found = 0;
-        found = cfg->WeekDaysWorktime.count(weekdayId);
-
+        if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
             // When no workday found, go to next available day
-        if(found <=0)
-        {
-            LOG_DEBUG("- No workday found, trying to find next available day");
+            qDebug() << "No workday found, trying to find next available day";
             inputDate = inputDate.addDays(1);
-            return floor(GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid));
+            return private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
+        }
+
+        for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) {
+            qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str();
+            worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()),
+                                         QTime::fromString(itr->second.pwd_time_to.c_str()));
+            index += 1;
         }
-        worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str());
-        worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str());
     }
 
     if (price_per_unit < 0) price_per_unit = 1.0f;
-    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
+    qDebug() << "Calculated price per minute=" << price_per_unit;
 
-    if (price_per_unit == 0)
-    {
+    double costFromDuration = 0.0;
+    for (int w = 0; w < index; ++w) {
+        QTime worktime_from = worktime[w].getTimeFrom();
+        QTime worktime_to = worktime[w].getTimeUntil();
+
+        if (price_per_unit == 0) {
             inputDate = inputDate.addDays(1);
             inputDate.setTime(worktime_from);
-        return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid);
+            uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
+            if (partialCost == 0) {
+                return 0;
+            }
+            costFromDuration += partialCost;
+            continue;
         }
 
         // If overtime flag is set
-    if (overtime || nextDay)
-    {
+        if (overtime || nextDay) {
             inputDate.setTime(worktime_from);
             overtime = false;
         }
 
         // Check prepaid
-    if (!prepaid)
-    {
-        if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to))
-        {
-            LOG_DEBUG("[STOP] * Ticket is not valid * ");
+        if (!prepaid) {
+            if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) {
+                qDebug() << "[STOP] * Ticket is not valid * ";
                 return 0.0f;
             }
-    }
-    else
-    {
-        LOG_DEBUG("* PREPAID MODE ACTIVE *");
-        if (inputDate.time() < worktime_from)
-        {
+        } else {
+            qDebug() << "* PREPAID MODE ACTIVE *";
+            if (inputDate.time() < worktime_from) {
                 inputDate.setTime(worktime_from);
-        }
-        else if(inputDate.time() > worktime_to)
-        {
-            LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
+            } else if(inputDate.time() > worktime_to) {
+                qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
                 inputDate = inputDate.addDays(1);
-            return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid);
+                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
+                if (partialCost == 0) {
+                    return 0;
+                }
+                costFromDuration += partialCost;
+                continue;
             }
         }
 
-    while(true)
-    {
-        if(total_duration_min <= 0) break;
-
-        // Check year period
-        bool isYearPeriodActive = false;
-
-        //// Parse input date
-        int dayCurrent = inputDate.date().day();
-        int monthCurrent = inputDate.date().month();
-
-        // Current date time
-        int cdt = (monthCurrent * 100) + dayCurrent;
-
-        multimap<int, ATBPeriodYear>::iterator year_period_itr;
-        for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
-        {
-            int dStart = year_period_itr->second.pye_start_day;
-            int dEnd = year_period_itr->second.pye_end_day;
-
-            int mStart = year_period_itr->second.pye_start_month;
-            int mEnd = year_period_itr->second.pye_end_month;
-
-            int start = (mStart * 100) + dStart;
-            int end = (mEnd * 100) + dEnd;
-
-            if (cdt >= start && cdt <= end) {
-                isYearPeriodActive = true;
-                break;
-            }
-        }
-        if (!isYearPeriodActive)
-        {
-            LOG_DEBUG("Year period is not valid");
-            return 0.0f;
+        while(durationMinutes > 0) {
+            // Check for active year period
+            if (std::none_of(cfg->YearPeriod.begin(),
+                             cfg->YearPeriod.end(),
+                    [&inputDate](std::pair<int, ATBPeriodYear> const &year) {
+                        QDate const input(2004, // 2004 is a leap year
+                                          inputDate.date().month(),
+                                          inputDate.date().day());
+                        QDate const s(2004, year.second.pye_start_day, year.second.pye_start_month);
+                        QDate const e(2004, year.second.pye_end_day, year.second.pye_end_month);
+                        return (input >= s && input <= e);
+                    })) {
+                qCritical() << "NO VALID YEAR PERIOD";
+                return 0.0;
             }
 
             // Go to next day if minutes not spent
-        if(inputDate.time() >= worktime_to)
-        {
-            int carry_over_status = 0;
-            carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
-            if (carry_over_status < 1) break;
+            if(inputDate.time() >= worktime_to) {
+                // check for carry_over status
+                if (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1) {
+                    break;
+                }
+
+                qDebug() << "Reached end of worktime, searching for the next working day";
 
-            LOG_DEBUG("Reached end of worktime, searching for the next working day");
                 inputDate = inputDate.addDays(1);
                 overtime = true;
-            return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), total_duration_min);
+                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
+                if (partialCost == 0) {
+                    return 0;
                 }
-
+                costFromDuration += partialCost;
+                break; // stop while, and continue in outer loop
+            } else {
                 // Increment input date minutes for each monetary unit
                 inputDate = inputDate.addSecs(60);
-        total_duration_min -=1;
-        total_cost += price_per_unit;
+                durationMinutes -= 1;
+                costFromDuration += price_per_unit;
+            }
+        }
+    }
 
+    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate);
+
+    end = inputDate;
+
+    //double ret_val = total_cost;
+    //total_cost = 0.0f;
+    //return ceil(ret_val);
+
+    // TODO: runden nur falls oberster stack-rahmen
+
+    return ceil(costFromDuration);
 }
-    qDebug() << "Valid until:" << inputDate.toString(Qt::ISODate).toStdString().c_str();
-    double ret_val = total_cost;
-    total_cost = 0.0f;
-    return ceil(ret_val);
+
+
+
+QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
+    QList<int> timeSteps;
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        timeSteps << durationUnit;
+    }
+
+    return timeSteps;
+}
+
+uint32_t Calculator::GetPriceForTimeStep(Configuration *cfg, int timeStep) const {
+
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const payment_unit_id = itr->second.pra_payment_unit_id;
+        int const pun_id = cfg->Duration.find(payment_unit_id)->second.pun_id;
+
+        Q_ASSERT(pun_id == payment_unit_id);
+
+        int const pun_duration = cfg->Duration.find(payment_unit_id)->second.pun_duration;
+        if (timeStep == pun_duration) {
+            return (uint32_t)(itr->second.pra_price);
+        }
+    }
+
+    return 0;
+}
+
+uint32_t Calculator::GetDurationForPrice(Configuration *cfg, int price) const {
+    int const pop_id = cfg->getPaymentOptions().pop_id;
+
+    uint32_t duration = 0;
+
+    for (auto[itr, rangeEnd] = cfg->PaymentRate.equal_range(pop_id); itr != rangeEnd; ++itr)
+    {
+        int const durationId = itr->second.pra_payment_unit_id;
+        int const pra_price = itr->second.pra_price;
+
+        uint32_t const durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+
+        if (pra_price == price) {
+            return durationUnit;
+        }
+
+        if (pra_price < price) {
+            duration = durationUnit;
+        }
+    }
+
+    return duration;
 }

library/src/configuration.cpp

@@ -59,8 +59,9 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			|| !document.HasMember("PaymentRate")
 			|| !document.HasMember("Duration")
 			//|| !document.HasMember("WeekDays")
-			|| !document.HasMember("SpecialDaysWorktime")
-			|| !document.HasMember("SpecialDays"))
+            //|| !document.HasMember("SpecialDaysWorktime")
+            //|| !document.HasMember("SpecialDays")
+            )
 		{
 			printf("%s", "Error: not a valid configuration JSON\n");
 			return false;
@@ -87,13 +88,26 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            // if (!document[mb_name].IsArray()) {
-                std::string const _mb_name(mb_name);
-                if (_mb_name == "version" || _mb_name == "project" ||
-                    _mb_name == "zone" || _mb_name == "info") {
+            if (document[mb_name].IsString()) {
+                QString const _mb_name(mb_name);
+                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                    cfg->project.project = document[mb_name].GetString();
+                    continue;
+                 }
+                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
+                    cfg->project.version = document[mb_name].GetString();
+                    continue;
+                }
+                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
+                    cfg->project.info = document[mb_name].GetString();
+                    continue;
+                }
+            }
+
+            // ... everything else should be an array
+            if (!document[mb_name].IsArray()) {
                 continue;
             }
-            // }
 
 			//printf(" -%s\n", mb_name);
 
@@ -154,6 +168,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
+                        this->currentPaymentOptions = PaymentOption;
                         break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -209,7 +225,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 					break;
 				case MemberType::PaymentRateType:
-					cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_unit_id, PaymentRate));
+                    cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
 					break;
 				case MemberType::PaymentOptionType:
 					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
@@ -244,3 +260,10 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		return false;
 	}
 }
+
+
+
+const ATBPaymentOption & Configuration::getPaymentOptions()
+{
+    return this->currentPaymentOptions;
+}

library/src/ticket.cpp

@@ -0,0 +1,67 @@
+#include "ticket.h"
+
+Ticket::Ticket() 
+  : m_status(Ticket::s[NOT_INITIALIZED])
+  , m_validFrom()
+  , m_validUntil()
+  , m_durationMinutesNetto(0)
+  , m_durationMinutesBrutto(0)
+  , m_price() {
+
+    qDebug() << *this;
+    qDebug() << m_status;
+}
+    
+Ticket::Status Ticket::setStatus(Status status) {
+    Status old = m_status;
+    m_status = status;
+    return old;
+}
+    
+Ticket::Status Ticket::getStatus() const {
+    return m_status;
+}
+    
+void Ticket::setValidFrom(QDateTime const &validFrom) {
+    m_validFrom = validFrom;
+}
+    
+void Ticket::setValidUntil(QDateTime const &validUntil) {
+    m_validUntil = validUntil;
+}
+
+QDateTime Ticket::getValidFrom() const {
+    if (std::get<CODE>(m_status) == VALID) {
+        return m_validFrom;
+    }
+    return QDateTime();
+}
+    
+QDateTime Ticket::getValidUntil() const {
+    if (std::get<CODE>(m_status) == VALID) {
+        return m_validFrom;
+    }
+    return QDateTime();
+}
+
+uint32_t Ticket::getPrice() const {
+    return m_price;
+}
+    
+void Ticket::setPrice(uint32_t price) {
+    m_price = price;
+}
+    
+Ticket::operator QString() {
+    QStringList status;
+    status << QString("Status .............. : %1 (%2)")
+                .arg(std::get<0>(m_status))
+                .arg(std::get<2>(m_status));
+    status << QString("Valid from ......... : %1").arg(m_validFrom.toString(Qt::ISODate));
+    status << QString("Valid until ........ : %1").arg(m_validUntil.toString(Qt::ISODate));
+    status << QString("Duration (netto) ... : %1").arg(m_durationMinutesNetto);
+    status << QString("Duration (brutto)... : %1").arg(m_durationMinutesBrutto);
+    status << QString("Price ......... : %1").arg(m_price);
+
+    return status.join('\n');;
+}

library/src/utilities.cpp

@@ -1,6 +1,8 @@
 #include "utilities.h"
 #include "tariff_log.h"
 
+#include <QDebug>
+
 static int protection_counter = 0;
 
 /// <summary>
@@ -8,12 +10,15 @@ static int protection_counter = 0;
 /// </summary>
 /// <param name="pra_price"></param>
 /// <returns></returns>
-double Utilities::CalculatePricePerUnit(double pra_price)
+double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
 {
 	try
 	{
 		double price_per_unit = pra_price;
-		price_per_unit /= 60.0f; // Divided by 60 because price per unit is set per hour and we are using minutes
+        double unit = durationUnit;
+
+        if(unit < 0 || unit > 65535 ) unit = 60.0f;
+        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
 		//printf("Price per unit (min) is: %lf\n", price_per_unit);
 		return price_per_unit;
 	}
@@ -268,3 +273,47 @@ bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeS
 		return false;
 	}
 }
+
+bool Utilities::CheckSpecialDay(Configuration const *cfg,
+                                QDateTime const &currentDateTime,
+                                int* specialDayId,
+                                uint32_t *specialDayPrice) {
+    *specialDayId = -1;
+    *specialDayPrice = 0;
+
+    std::multimap<int, ATBSpecialDays>::const_iterator spec_days_itr;
+
+    for (spec_days_itr = cfg->SpecialDays.cbegin(); spec_days_itr != cfg->SpecialDays.cend(); ++spec_days_itr) {
+        int repeat_every_year = spec_days_itr->second.ped_year;
+        QDate start = QDate::fromString(spec_days_itr->second.ped_date_start.c_str(), Qt::ISODate);
+        QDate end = QDate::fromString(spec_days_itr->second.ped_date_end.c_str(), Qt::ISODate);
+        if (start.isValid() && end.isValid()) {
+            if ((currentDateTime.date().month() >= start.month()) &&
+                (currentDateTime.date().month() <= end.month())) {
+                if ((currentDateTime.date().day() >= start.day()) &&
+                    (currentDateTime.date().day() <= end.day())) {
+                    if (repeat_every_year <= 0) {
+                        if ((currentDateTime.date().year() != start.year()) ||
+                            (currentDateTime.date().year() != end.year())) {
+                            continue;
+                        }
+                    }
+                    qDebug() << "CheckSpecialDay() => SPECIAL DAY";
+                    *specialDayId = spec_days_itr->second.ped_id;
+                    *specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId) {
+    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_from.c_str(), Qt::ISODate);
+}
+
+QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId) {
+    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
+}

main/main.cpp

@@ -1,10 +1,9 @@
-#include <calculate_price.h>
-
-
 #ifdef WIN32
 #include <time.h>
 #include <iomanip>
 #include <sstream>
+#include <calculate_price.h>
+
 
 extern "C" char* strptime(const char* s,
                           const char* f,
@@ -32,10 +31,12 @@ extern "C" char* strptime(const char* s,
 #include <fstream>
 #include <sstream>
 #include "calculator_functions.h"
+#include <calculate_price.h>
+
 
 int main() {
 
-    std::ifstream input(QDir::homePath().append("/tariff01.json").toStdString());
+    std::ifstream input("/tmp/tariff_korneuburg.json");
     std::stringstream sstr;
     while(input >> sstr.rdbuf());
     std::string json(sstr.str());
@@ -46,14 +47,12 @@ int main() {
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
     cout << endl;
 
-    char const *startDate = "";
 
     if (isParsed)
     {
-        startDate = "2023-05-10T13:52:18.665Z";
-        std::string duration = calculator.GetDurationFromCost(&cfg, 3, (char *)startDate, 33, false, true);
-        cout << "---> startDate " << startDate << " _price_ = " << 33
-             << " Total duration is: " << duration << endl;
+        QDateTime start = QDateTime::fromString("2023-05-11T08:00:00",Qt::ISODate);
+        QDateTime end = start.addSecs(120);
+        calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
     }
 
     return 0;
@@ -68,23 +67,29 @@ int main() {
     if (init_tariff(&tariff, "/etc/psa_tariff/")) {      
         struct price_t price;
         memset(&price, 0x00, sizeof(price));
+
         QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();
         time_t start_parking_time = start.toSecsSinceEpoch() / 60;
-        time_t end_parking_time = start_parking_time + 610;
+        time_t end_parking_time = start_parking_time + 615;
 
         if (compute_price_for_parking_ticket(tariff,
                                              start_parking_time,
                                              end_parking_time,
-                                             &price)) {
+                                             &price))
+        {
             qDebug() << "GetCostFromDuration() => price=" << price.netto;
         }
 
         QString duration;
-        if(compute_duration_for_parking_ticket(tariff,start_parking_time,1525,duration))
+        if(compute_duration_for_parking_ticket(tariff,start_parking_time,3090,duration))
         {
             qDebug() << "GetDurationFromCost() => duration=" << duration;
         }
 
+        // Daily ticket
+        //compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
+
+        //Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
         //        // tests
         //        struct tm now;
         //        memset(&now, 0, sizeof(now));

test-files/tariff_korneuburg.json

@@ -0,0 +1,160 @@
+{
+  "Project" :   "Korneuburg",
+  "Version" :   "1.0.0",
+  "Info"    :   "",
+  "Currency": [
+    {
+      "pcu_id": 2,
+      "pcu_sign": "€",
+      "pcu_major": "EUR",
+      "pcu_minor": "",
+      "pcu_active": true
+    }
+  ],
+  "PaymentMethod": [
+    {
+      "pme_id": 1,
+      "pme_label": "progressive"
+    },
+    {
+      "pme_id": 2,
+      "pme_label": "degressive"
+    },
+    {
+      "pme_id": 3,
+      "pme_label": "linear"
+    },
+    {
+      "pme_id": 4,
+      "pme_label": "steps"
+    }
+  ],
+  "PaymentOption": [
+    {
+      "pop_id": 1049,
+      "pop_label": "Zone 1",
+      "pop_payment_method_id": 3,
+      "pop_day_end_time": "00:00:00",
+      "pop_day_night_end_time": "00:00:00",
+      "pop_price_night": 0,
+      "pop_min_time": 30,
+      "pop_max_time": 180,
+      "pop_min_price": 60,
+      "pop_carry_over": 0,
+      "pop_daily_card_price": 0
+    }
+  ],
+  "PaymentRate": [
+    {
+      "pra_payment_option_id": 1049,
+      "pra_payment_unit_id": 1,
+      "pra_price": 10
+    }
+  ],
+  "Duration": [
+    {
+      "pun_id": 1,
+      "pun_label": "5 min",
+      "pun_duration": 5 
+    },
+    {
+      "pun_id": 3,
+      "pun_label": "15 min",
+      "pun_duration": 15
+    },
+    {
+      "pun_id": 4,
+      "pun_label": "1 min",
+      "pun_duration": 1
+    }
+  ],
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    },
+    {
+      "pwd_id": 625,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 5,
+      "pwd_time_from": "14:00:00",
+      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
+}