Use fprintf instead of printf.

library/include/mobilisis/atb_project.h

@@ -1,13 +0,0 @@
-#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,9 +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);
 
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+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,
@@ -120,11 +118,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
-                                            int netto_parking_time,
+                                            QDateTime const &end_parking_time,
-                                            QDateTime &end_parking_time,    // return value
+                                            struct price_t *price);
-                                            struct price_t *price);         // return value
 
-CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             double cost,
@@ -134,11 +131,6 @@ 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,8 +1,7 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
-#include "payment_method.h"
+
-#include <QDateTime>
 using namespace std;
 
 class Calculator
@@ -24,25 +23,7 @@ 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, const QDateTime start_datetime, QDateTime & end_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
+	double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double 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;
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
-    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
 };

library/include/mobilisis/configuration.h

@@ -20,7 +20,6 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
-#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -28,8 +27,8 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-    ATBProject project;
+
-    ATBCurrency Currency;
+	ATBCurrency Currency;
 	ATBDuration duration;
 
 	multimap<int, ATBDuration> Duration;
@@ -49,8 +48,6 @@ 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
@@ -58,6 +55,4 @@ 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
 {
-    Monday = 0x01,
+	Saturday = 0x06,
-    Tuesday = 0x02,
+	Sunday = 0x01,
-    Wednesday = 0x03,
+	Monday = 0x02,
-    Thursday = 0x04,
+	Tuesday = 0x02,
-    Friday = 0x05,
+	Wednesday = 0x03,
-    Saturday = 0x06,
+	Thursday = 0x04,
-    Sunday = 0x07,
+	Friday = 0x05,
-    UndefinedDay = 0xFF
+	UndefinedDay = 0xFF
 };

library/include/mobilisis/payment_opt.h

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

library/include/mobilisis/utilities.h

@@ -68,6 +68,5 @@ public:
 	/// </summary>
 	/// <param name="pra_price"></param>
 	/// <returns></returns>
-    static double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
+	static double CalculatePricePerUnit(double pra_price);
-
 };

library/library.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = mobilisis_calc
-#CONFIG += staticlib
+# CONFIG += staticlib
 
 QMAKE_CXXFLAGS += -std=c++17 -g -O0
 
@@ -65,8 +65,7 @@ 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
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -14,7 +14,7 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone)
 {
     if(zone > -1) return zone;
     else
-    {
+  {
         QFile zone("/etc/zone_nr");
         if (zone.exists()) {
             QFileInfo finfo(zone);
@@ -26,7 +26,7 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone)
             }
         }
         return -1;
-    }
+   }
 }
 
 CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
@@ -65,7 +65,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
 
     QFile fname(confFile);
     if (fname.exists() &&
-            fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
         // DEBUG
         qCritical() << "      ... confFile is open";
 
@@ -92,54 +92,14 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
     }
 }
 
-
-//
-// UpDown 1 -> up; 0 -> down
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
-{
-    static const QList<int> stepList = calculator.GetTimeSteps(tariff);
-
-    int currentStepIndex = stepList.indexOf(currentTimeMinutes);
-
-    if (currentStepIndex == -1) {
-        qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-        return  currentTimeMinutes;
-    }
-
-    if (UpDown == 1) { // UP
-        if (stepList[currentStepIndex] == stepList.last()) {
-            qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-            return  currentTimeMinutes;
-        }
-        else {
-            return stepList[currentStepIndex + 1];
-        }
-    }
-    if (UpDown == 0) { // DOWN
-        if (stepList[currentStepIndex] == stepList.first()) {
-            qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-            return  currentTimeMinutes;
-        }
-        else {
-            return stepList[currentStepIndex - 1];
-        }
-    }
-
-    qCritical() << "compute_next_timestep() *CAN NOT COMPUTE* for currentTimeMinutes (" << currentTimeMinutes << ")";
-    return  currentTimeMinutes;
-}
-
-
-
-// this is currently not used
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-        parking_tariff_t *tariff,
+                                    parking_tariff_t *tariff,
-        time_t start_parking_time, // in minutes
+                                    time_t start_parking_time, // in minutes
-        time_t end_parking_time,   // netto time in minutes
+                                    time_t end_parking_time,   // in minutes
-        struct price_t *price) {
+                                    struct price_t *price) {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -149,7 +109,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     int const duration = end_parking_time - start_parking_time;
     if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
-                          .arg(end_parking_time, start_parking_time));
+                            .arg(end_parking_time, start_parking_time));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
     if (duration > maxMin) {
@@ -169,15 +129,13 @@ 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,
+                        tariff, PaymentOption::Option1,
-                    tariff->getPaymentOptions().pop_payment_method_id,
+                        cs.toLocal8Bit().constData(),
-                    start,
+                        duration, false, true);
-                    end,
+        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
-                    duration, false, true);
-        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);
@@ -192,52 +150,51 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-        parking_tariff_t *tariff,
+                                            parking_tariff_t *tariff,
-        QDateTime const &start_parking_time,
+                                            QDateTime const &start_parking_time,
-        int netto_parking_time,
+                                            QDateTime const &end_parking_time,
-        QDateTime &end_parking_time,
+                                            struct price_t *price) {
-        struct price_t *price)
-{
     CalcState calcState;
-    double minMin = tariff->getPaymentOptions().pop_min_time;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->getPaymentOptions().pop_max_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
                 << "          start_parking_time: " << start_parking_time << endl
-                << "          netto_parking_time: " << netto_parking_time << endl
+                << "            end_parking_time: " << end_parking_time   << endl
                 << "                      minMin: " << minMin << endl
                 << "                      maxMin: " << maxMin;
 
 
-    if (netto_parking_time < 0) {
+    int const duration = (end_parking_time.toSecsSinceEpoch() -
+                          start_parking_time.toSecsSinceEpoch()) / 60;
+
+    if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
-                          .arg(end_parking_time.toString(Qt::ISODate),
+                            .arg(end_parking_time.toString(Qt::ISODate),
-                               start_parking_time.toString(Qt::ISODate)));
+                                 start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
-    if (netto_parking_time > maxMin) {
+    if (duration > maxMin) {
-        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
         return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
     }
-    if (netto_parking_time < minMin) {
+    if (duration < minMin) {
-        calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
-    if (netto_parking_time == 0) {
+    if (duration == 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,
+                        tariff, PaymentOption::Option1,
-                        tariff->getPaymentOptions().pop_payment_method_id,
+                        cs.toLocal8Bit().constData(),
-                        start_parking_time,         // starting time
+                        duration, false, true);
-                        end_parking_time,           // return value: end time
+        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
-                        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);
@@ -256,10 +213,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
-        parking_tariff_t *tariff,
+                                            parking_tariff_t *tariff,
-        time_t start_parking_time,
+                                            time_t start_parking_time,
-        double price,
+                                            double price,
-        QString &duration) {
+                                            QString &duration) {
     CalcState calcState;
     QDate const d(1970, 1, 1);
     QTime const t(0, 0, 0);
@@ -273,11 +230,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
-        duration = calculator.GetDurationFromCost(tariff,
+        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
-                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
-        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
+        QDateTime d = QDateTime::fromString(duration);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
             return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
@@ -290,19 +246,17 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
-        parking_tariff_t *tariff,
+                                            parking_tariff_t *tariff,
-        QDateTime const &start_parking_time,
+                                            QDateTime const &start_parking_time,
-        double price,
+                                            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,
+                                        tariff, PaymentOption::Option1,
-                    tariff->getPaymentOptions().pop_payment_method_id,
+                                        cs.toLocal8Bit().constData(),
-                    cs.toLocal8Bit().constData(),
+                                        price, false, true).c_str();
-                    price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
         // DEBUG
@@ -320,30 +274,3 @@ 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,5 +1,5 @@
 #include "calculator_functions.h"
-#include "payment_option.h"
+#include "payment_method.h"
 #include "utilities.h"
 #include "tariff_log.h"
 
@@ -12,104 +12,13 @@ double total_cost = 0.0f;
 bool overtime = false;
 
 #ifdef _WIN32
-inline struct tm* localtime_r(const time_t *clock, struct tm* result){
+    inline struct tm* localtime_r(const time_t *clock, struct tm* result){
     if(!clock || !result) return NULL;
     memcpy(result,localtime(clock),sizeof(*result));
     return 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,
@@ -118,286 +27,301 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
                                             bool nextDay,
                                             bool prepaid)
 {
+	// Get current date time from input
+	struct tm current_datetime = Utilities::DateTimeToStructTm(start_datetime);
+	time_t current_datetime_t;
 
-    // Get input date
+	// Get day of week
-    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
+	DayOfWeek weekdayId = DayOfWeek::UndefinedDay;
+	weekdayId = Utilities::GetDayOfWeek(&current_datetime);
 
-    // use tariff with structure as for instance Schnau, Koenigsee:
+	//std::stringstream ss;
-    // 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();
+	// ss << "*** Input date is: " << start_datetime << " [weekday id = " << weekdayId << "]" << endl;
-    }
+	LOG_DEBUG("*** Input date is: ", start_datetime, " [weekday id = ", weekdayId, "]");
+
+	double minMin = 0;
+	minMin = cfg->PaymentOption.find(payment_option)->second.pop_min_time;
+	if (minMin < 0) minMin = 0;
+
+	double maxMin = 0;
+	maxMin = cfg->PaymentOption.find(payment_option)->second.pop_max_time;
+	if (maxMin <= 0) maxMin = 60;
+
+	if (minMin >= maxMin)
+	{
+		LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
+		return "PARKING NOT ALLOWED";
+	}
+
+	if (maxMin <= minMin)
+	{
+		LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
+		return "PARKING NOT ALLOWED";
+	}
+
+	uint8_t p_method = PaymentMethod::Undefined;
+	p_method = payment_option;
+	LOG_DEBUG("Payment method id: ", (unsigned)p_method);
+
+	double day_price = 0.0f;
+	int current_special_day_id = -1;
+	bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime, &current_special_day_id, &day_price);
+	LOG_DEBUG("Special day: ", is_special_day);
+
+	double money_left = price;
+	LOG_DEBUG("Total money:", money_left);
+
+	double price_per_unit = 0.0f;
+
+	string worktime_from = "";
+	string worktime_to = "";
+
+	if (is_special_day)
+	{
+		// Set special day price
+		price_per_unit = Utilities::CalculatePricePerUnit(day_price);
+		worktime_from = cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from;
+		worktime_to = cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to;
+	}
+	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);
+
+		// If no working day found, skip it (recursively call method again)
+		size_t found = 0;
+		found = cfg->WeekDaysWorktime.count(weekdayId);
+
+		if (found <= 0)
+		{
+			LOG_DEBUG("- No workday found, trying to find next available day");
+			current_datetime_t = mktime(&current_datetime);
+			current_datetime_t += 86400;
+			current_datetime = *localtime(&current_datetime_t);
+
+			char buffer_datetime[80];
+			strftime(buffer_datetime, 80, "%Y-%m-%dT%H:%M:%S", &current_datetime);
+
+			// Make new datetime string and call function again recursively
+			start_datetime = buffer_datetime;
+			return GetDurationFromCost(cfg, payment_option, start_datetime, price, true);
+		}
+
+		worktime_from = cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from;
+		worktime_to = cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to;
+	}
+
+	if (price_per_unit < 0) price_per_unit = 1.0f;
+	LOG_DEBUG("Calculated price per minute: ", price_per_unit);
+
+	LOG_DEBUG("Worktime from: ", worktime_from);
+	LOG_DEBUG("Worktime to: ", worktime_to);
+
+	struct tm from_tm;
+	struct tm to_tm;
+
+	from_tm = Utilities::TimeToStructTm(worktime_from.c_str(), current_datetime.tm_year, current_datetime.tm_mon, current_datetime.tm_mday, current_datetime.tm_wday);
+	from_tm.tm_year = current_datetime.tm_year;
+	from_tm.tm_mon = current_datetime.tm_mon;
+	from_tm.tm_wday = current_datetime.tm_wday;
+	from_tm.tm_mday = current_datetime.tm_mday;
+
+	to_tm = Utilities::TimeToStructTm(worktime_to.c_str(), current_datetime.tm_year, current_datetime.tm_mon, current_datetime.tm_mday, current_datetime.tm_wday);
+	to_tm.tm_year = current_datetime.tm_year;
+	to_tm.tm_mon = current_datetime.tm_mon;
+	to_tm.tm_wday = current_datetime.tm_wday;
+	to_tm.tm_mday = current_datetime.tm_mday;
+
+	// Convert tm structures to time_t
+	current_datetime_t = mktime(&current_datetime);
+	time_t from_datetime_t = mktime(&from_tm);
+	time_t to_datetime_t = mktime(&to_tm);
+
+	/*Newly added */
+	//current_datetime.tm_hour = from_tm.tm_hour;
+	//current_datetime.tm_min = from_tm.tm_min;
+	//current_datetime.tm_sec = from_tm.tm_sec;
+	//current_datetime_t = mktime(&current_datetime);
+
+	// If overtime flag is set
+	if (overtime || nextDay)
+	{
+		current_datetime.tm_hour = from_tm.tm_hour;
+		current_datetime.tm_min = from_tm.tm_min;
+		current_datetime.tm_sec = from_tm.tm_sec;
+		current_datetime_t = mktime(&current_datetime);
+		LOG_DEBUG(" *** New input date set according to worktime: ", asctime(&current_datetime));
+		overtime = false;
+	}
+
+	// Validate ticket
+	if (!prepaid)
+	{
+		if ((current_datetime_t < from_datetime_t) || (current_datetime_t > to_datetime_t))
+		{
+			LOG_DEBUG("[STOP] * Ticket is not valid * ");
+			return "PARKING NOT ALLOWED";
+		}
+	}
+	else
+	{
+		LOG_DEBUG("* PREPAID MODE ACTIVE *");
+
+		if (current_datetime_t < from_datetime_t)
+		{
+			current_datetime.tm_hour = from_tm.tm_hour;
+			current_datetime.tm_min = from_tm.tm_min;
+			current_datetime.tm_sec = from_tm.tm_sec;
+			current_datetime_t = mktime(&current_datetime);
+			LOG_DEBUG(" *** PREPAID *** Current time is before the time range start, adjusting time to: ", asctime(&current_datetime));
+		}
+		else if (current_datetime_t > to_datetime_t)
+		{
+			LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
+			current_datetime_t = mktime(&current_datetime);
+			current_datetime_t += 86400;
+			current_datetime = *localtime(&current_datetime_t);
+
+			char buffer_datetime[80];
+			strftime(buffer_datetime, 80, "%Y-%m-%dT%H:%M:%S", &current_datetime);
+
+			//Make new datetime string and call function again recursively
+			start_datetime = buffer_datetime;
+			return GetDurationFromCost(cfg, payment_option, start_datetime, price, true, prepaid);
+		}
+	}
+
+	while (true)
+	{
+		if (!Utilities::IsYearPeriodActive(cfg, &current_datetime))
+		{
+			LOG_DEBUG("Year period is not valid");
+			return "PARKING NOT ALLOWED";
+		}
+
+		// Increment by 1 minute
+		current_datetime_t = mktime(&current_datetime);
+		current_datetime_t += 60;
+		current_datetime = *localtime(&current_datetime_t);
+		total_duration_min += 1.0f;
+		money_left -= price_per_unit;
 
 
-    // Get day of week
+		// If no money left (e.g. spent all of the money before reaching end of worktime)
-    int weekdayId = 0;
+		if (money_left <= 0)
-    weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
+		{
+			LOG_DEBUG("No money left ");
+			break;
+		}
+		else
+		{
+			if (total_duration_min >= maxMin)
+			{
+				LOG_DEBUG("Total duration is greater or equal to max_min");
 
-    //Get min and max time defined in JSON
+				current_datetime_t = mktime(&current_datetime);
-    double minMin = 0;
+				current_datetime_t -= 60;
-    minMin = cfg->getPaymentOptions().pop_min_time;
+				current_datetime = *localtime(&current_datetime_t);
+				total_duration_min = maxMin;
+				break;
+			}
 
-    double maxMin = 0;
+			// If money has left but the end of worktime has been reached (go to next day)
-    maxMin = cfg->getPaymentOptions().pop_max_time;
+			if (current_datetime_t >= to_datetime_t)
+			{
+				total_duration_min -= 1.0f;
 
-    double min_price = 0;
+				int carry_over_status = 0;
-    min_price = cfg->getPaymentOptions().pop_min_price;
+				carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
+				LOG_DEBUG("Carry over status: ", carry_over_status);
+				if (carry_over_status < 1) break;
 
-    if(price < min_price)
+				LOG_DEBUG("Reached end of worktime");
-    {
+				LOG_DEBUG("Trying to find next available day, money left = ", money_left);
-        return "PARKING NOT ALLOWED";
+				current_datetime_t = mktime(&current_datetime);
-    }
+				current_datetime_t += 86400;
+				current_datetime = *localtime(&current_datetime_t);
 
-    if (minMin < 0) minMin = 0;
+				char buffer_datetime[80];
-    if (maxMin < 0) maxMin = 0;
+				strftime(buffer_datetime, 80, "%Y-%m-%dT%H:%M:%S", &current_datetime);
-    if (minMin >= maxMin)
-    {
-        LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
-        return "PARKING NOT ALLOWED";
-    }
 
-    if (maxMin <= minMin)
+				// Make new datetime string and call function again recursively
-    {
+				start_datetime = buffer_datetime;
-        LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
+				overtime = true;
-        return "PARKING NOT ALLOWED";
+                return GetDurationFromCost(cfg, payment_option, start_datetime, price);
-    }
+			}
+		}
+	}
 
+	time_t valid_until_datetime_t = current_datetime_t;
 
-    // Get payment method
+	if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
-    uint8_t p_method = PaymentMethod::Undefined;
+	{
-    p_method = payment_option;
+		LOG_DEBUG("Total duration is lower than min_min");
-    LOG_DEBUG("Payment method id: ", (unsigned)p_method);
+		//valid_until_datetime_t += (minMin - total_duration_min) * 60;
+		//total_duration_min = minMin;
+		//return "PARKING NOT ALLOWED";
 
-    // Check special day
+		valid_until_datetime_t = from_datetime_t;
-    double day_price = 0.0f;
+		total_duration_min = 0;
-    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);
 
-    double money_left = price;
+	double ret_val = 0;
-    double price_per_unit = 0.0f;
+	double calc_price = (int)total_duration_min - (int)price / price_per_unit;
 
-    QTime worktime_from;
+	if (calc_price > 0 && total_duration_min > 0)
-    QTime worktime_to;
+	{
+		valid_until_datetime_t -= (int)ceil(calc_price) * 60;
+		ret_val = total_duration_min - calc_price;
+	}
+	else ret_val = total_duration_min;
 
-    if(is_special_day)
+	cout << "Total minutes: " << (int)ret_val << endl;
-    {
-        // 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
-    {
-        // Set new price for the normal day
-        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;
-        found = cfg->WeekDaysWorktime.count(weekdayId);
-
-        // When no workday found, go to next available day
-        if(found <=0)
-        {
-            LOG_DEBUG("- No workday found, trying to find next available day");
-            inputDate = inputDate.addDays(1);
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left,true,prepaid);
-        }
-        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;
-
-    // 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)
-    {
-        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 * ");
-            return "PARKING NOT ALLOWED";
-        }
-    }
-    else
-    {
-        LOG_DEBUG("* 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");
-            inputDate = inputDate.addDays(1);
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
-        }
-    }
-
-    while(true)
-    {
-        if((int)money_left <= 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 "PARKING NOT ALLOWED";
-        }
-
-        if(total_duration_min > maxMin)
-        {
-            total_duration_min = maxMin;
-            break;
-        }
-
-        // If reached end of worktime go to next day
-        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;
-
-            inputDate = inputDate.addDays(1);
-            overtime = true;
-            return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left ,true, prepaid);
-        }
-
-        if(money_left > 1)
-            inputDate = inputDate.addSecs(60);
-
-        if(price_per_unit > 0) total_duration_min +=1;
-        money_left -= price_per_unit;
-
-        //qDebug() <<"Timestamp:" << inputDate << ", total duration min: " << total_duration_min << ", money left = " << money_left;
-    }
-
-    //    if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
-    //    {
-    //        LOG_DEBUG("Total duration is lower than min_min");
-    //        inputDate.time() = worktime_from;
-    //        total_duration_min = 0;
-    //    }
-
-    double ret_val = 0;
-    // 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(price >= min_price && total_duration_min >= minMin)
-        qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
-    else
-    {
-        qDebug() << "Parking not allowed";
-        total_duration_min = 0;
-    }
-
-    ret_val = total_duration_min;
-    if(ret_val < 0) ret_val = 0;
-    qDebug() << "Duration: " << ret_val;
     if (ret_val <= 0) return "PARKING NOT ALLOWED";
 
-    total_duration_min = 0;
+#ifdef __linux__
-    return inputDate.toString(Qt::ISODate).toStdString();
+    #if !defined(_SVID_SOURCE) && !defined(_XOPEN_SOURCE)
+        // needed for timezone-correction
+        #error "!defined(_SVID_SOURCE) && !defined(_XOPEN_SOURCE)"
+    #else
+        // timezone correction: localtime() needs argument in UTC-timezone
+        // The global variable 'timezone' is set by tzset(), see
+        // https://linux.die.net/man/3/tzset, so I change of the timezone will
+        // also change the value of the variable 'timezone'.
+        valid_until_datetime_t += timezone;
+    #endif
+#else // windows, only for testing
+    static const long timezone = -3600;
+    valid_until_datetime_t += timezone;
+#endif
+
+    struct tm valid_until_datetime;
+    memset(&valid_until_datetime, 0x00, sizeof(valid_until_datetime));
+
+    if (!localtime_r(&valid_until_datetime_t, &valid_until_datetime)) {
+        return "LOCALTIME_R() ERROR";
+    }
+
+    // return in ISO-format: "%Y-%m-%dT%H:%M:%S"
+    char buf[128];
+    memset(buf, 0x00, sizeof(buf));
+    strftime(buf, sizeof(buf)-1, "%Y-%m-%dT%H:%M:%S", &valid_until_datetime);
+
+    LOG_DEBUG("Ticket is valid until ", buf);
+
+	total_duration_min = 0.0f;
+    return std::string(buf);
 }
 
 ///////////////////////////////////////
 
 /// <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,  double durationMin, bool nextDay, bool prepaid)
 {
-    if (cfg->YearPeriod.size() == 0
-        && cfg->SpecialDays.size() == 0
-        && cfg->SpecialDaysWorktime.size() == 0)
-    {
-        end_datetime = start_datetime.addSecs(durationMin*60);
-        return GetCostFromDuration(cfg, start_datetime, end_datetime);
-    }
-
     // Get input date
-    QDateTime inputDate = start_datetime;
+    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 
     // Get day of week
     int weekdayId = 0;
@@ -467,13 +391,8 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
     else
     {
         // Set new price for the normal day
-
+        day_price = cfg->PaymentRate.find(payment_option)->second.pra_price;
-        int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
+        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
-        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;
@@ -484,7 +403,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
         {
             LOG_DEBUG("- No workday found, trying to find next available day");
             inputDate = inputDate.addDays(1);
-            return floor(GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid));
+            return floor(GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid));
         }
         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());
@@ -497,7 +416,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
     {
         inputDate = inputDate.addDays(1);
         inputDate.setTime(worktime_from);
-        return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid);
+        return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid);
     }
 
     // If overtime flag is set
@@ -527,7 +446,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
         {
             LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
             inputDate = inputDate.addDays(1);
-            return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, durationMin, true, prepaid);
+            return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), durationMin, true, prepaid);
         }
     }
 
@@ -568,18 +487,17 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
             return 0.0f;
         }
 
-        int carry_over_status = 0;
-        carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
-
         // 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;
 
             LOG_DEBUG("Reached end of worktime, searching for the next working day");
             inputDate = inputDate.addDays(1);
             overtime = true;
-            return GetCostFromDuration(cfg, payment_option, inputDate, end_datetime, total_duration_min);
+            return GetCostFromDuration(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), total_duration_min);
         }
 
         // Increment input date minutes for each monetary unit
@@ -588,75 +506,8 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
         total_cost += price_per_unit;
 
     }
-    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate).toStdString().c_str();
+    qDebug() << "Valid until:" << inputDate.toString(Qt::ISODate).toStdString().c_str();
-
-    end_datetime = inputDate;
-
     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;
-}
-
-/**
- * private: read price directly from config file (used with PaymentMethod::Steps)
- *
- * return duration in minutes for greatest pra_price < price
- */
-
-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 (price == pra_price) {
-            return durationUnit;
-        }
-        if (pra_price < price) {
-            duration = durationUnit;
-        }
-    }
-
-    return duration;
-}

library/src/configuration.cpp

@@ -23,12 +23,12 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 	{
 		if (cfg == nullptr)
 		{
-			printf("TariffConfiguration pointer not set\n");
+            fprintf(stderr, "TariffConfiguration pointer not set\n");
 			return false;
 		}
 		if (json == NULL)
 		{
-			printf("%s", "Input JSON string is NULL\n");
+            fprintf(stderr, "%s", "Input JSON string is NULL\n");
 			return false;
 		}
 
@@ -40,17 +40,17 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		ParseErrorCode err = document.GetParseError();
 		if (err != 0)
 		{
-			printf("%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
+            fprintf(stderr, "%s %d (%s)\n", "Unable to parse JSON, error code:", err, GetParseError_En(err));
 			return false;
 		}
 
 		// Validate JSON, check if it's a JSON object
-		printf("%s", "JSON parsing has been successful\n");
+        fprintf(stderr, "%s", "JSON parsing has been successful\n");
 		if (!document.IsObject()) {
-			printf("%s", "Error: not a (valid) JSON object\n");
+            fprintf(stderr, "%s", "Error: not a (valid) JSON object\n");
 			return false;
 		}
-		printf("%s", "Valid JSON object identified\n");
+        fprintf(stderr, "%s", "Valid JSON object identified\n");
 
 		// Validate JSON, check configuration members
 		if (!document.HasMember("Currency")
@@ -59,14 +59,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			|| !document.HasMember("PaymentRate")
 			|| !document.HasMember("Duration")
 			//|| !document.HasMember("WeekDays")
-            //|| !document.HasMember("SpecialDaysWorktime")
+			|| !document.HasMember("SpecialDaysWorktime")
-            //|| !document.HasMember("SpecialDays")
+			|| !document.HasMember("SpecialDays"))
-            )
 		{
 			printf("%s", "Error: not a valid configuration JSON\n");
 			return false;
 		}
-		printf("%s", "Valid JSON configuration identified\n");
+        fprintf(stderr, "%s", "Valid JSON configuration identified\n");
 
 		ATBCurrency Currency;
 		ATBDuration Duration;
@@ -88,26 +87,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            if (document[mb_name].IsString()) {
+            // if (!document[mb_name].IsArray()) {
-                QString const _mb_name(mb_name);
+                std::string const _mb_name(mb_name);
-                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                if (_mb_name == "version" || _mb_name == "project" ||
-                    cfg->project.project = document[mb_name].GetString();
+                    _mb_name == "zone" || _mb_name == "info") {
-                    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);
 
@@ -129,7 +115,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 					const char* inner_obj_name = k->name.GetString();
 					if (inner_obj_name == NULL)
 					{
-						printf("Inner object name is NULL\n");
+                        fprintf(stderr, "Inner object name is NULL\n");
 						continue;
 					}
 
@@ -168,9 +154,7 @@ 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();
+						break;
-                        this->currentPaymentOptions = PaymentOption;
-                        break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
 						else if (strcmp(inner_obj_name, "pun_label") == 0) Duration.pun_label = k->value.GetString();
@@ -225,7 +209,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_option_id, PaymentRate));
+					cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_unit_id, PaymentRate));
 					break;
 				case MemberType::PaymentOptionType:
 					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
@@ -256,14 +240,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		return true;
 	}
 	catch (...) {
-		printf("%s\n", "General exception has occurred while parsing JSON\n");
+        fprintf(stderr, "%s\n", "General exception has occurred while parsing JSON\n");
 		return false;
 	}
 }
-
-
-
-const ATBPaymentOption & Configuration::getPaymentOptions()
-{
-    return this->currentPaymentOptions;
-}

library/src/utilities.cpp

@@ -8,15 +8,12 @@ static int protection_counter = 0;
 /// </summary>
 /// <param name="pra_price"></param>
 /// <returns></returns>
-double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
+double Utilities::CalculatePricePerUnit(double pra_price)
 {
 	try
 	{
 		double price_per_unit = pra_price;
-        double unit = durationUnit;
+		price_per_unit /= 60.0f; // Divided by 60 because price per unit is set per hour and we are using minutes
-
-        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;
 	}

main/main.cpp

@@ -1,9 +1,10 @@
+#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,
@@ -26,135 +27,94 @@ extern "C" char* strptime(const char* s,
 
 #include <QDebug>
 #include <QDateTime>
-#include <QDir>
-
-#include <fstream>
-#include <sstream>
-#include "calculator_functions.h"
-#include <calculate_price.h>
-
 
 int main() {
 
-    std::ifstream input(QDir::homePath().append("/tariff01.json").toStdString());
-    std::stringstream sstr;
-    while(input >> sstr.rdbuf());
-    std::string json(sstr.str());
-
-    Calculator calculator;
-    Configuration cfg;
-
-    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;
-    }
-
-    return 0;
-
-
-
-
-
-
-
     parking_tariff_t *tariff = 0;
-    if (init_tariff(&tariff, "/etc/psa_tariff/")) {      
+    if (init_tariff(&tariff, "C:\\Users\\MROD\\Documents\\QtCreator\\build-MOBILISIS-Calculator-Desktop_Qt_5_12_12_MSVC2017_32bit-Debug\\main\\etc\\psa_tariff\\zone1.json")) {
         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 + 615;
+        time_t end_parking_time = start_parking_time + 1230;
 
         if (compute_price_for_parking_ticket(tariff,
                                              start_parking_time,
                                              end_parking_time,
-                                             &price))
+                                             &price)) {
-        {
+            qDebug() << "price=" << price.netto;
-            qDebug() << "GetCostFromDuration() => price=" << price.netto;
         }
 
-        QString duration;
+//        QString duration;
-        if(compute_duration_for_parking_ticket(tariff,start_parking_time,3090,duration))
+//        if(compute_duration_for_parking_ticket(tariff,start_parking_time,3090,duration))
-        {
+//        {
-            qDebug() << "GetDurationFromCost() => duration=" << duration;
+//            qDebug() << "duration=" << duration;
-        }
+//        }
 
-        // Daily ticket
+//        // tests
-        //compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
+//        struct tm now;
+//        memset(&now, 0, sizeof(now));
 
-        //Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
+//        // 3.Jan 2023 -> Tuesday
-        //        // tests
+//        strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
-        //        struct tm now;
+//        for (int i = 0; i < 600; ++i) {
-        //        memset(&now, 0, sizeof(now));
+//            start_parking_time = mktime(&now);
+//            end_parking_time = start_parking_time + 240; // duration == 240
 
-        //        // 3.Jan 2023 -> Tuesday
+//            if (compute_price_for_parking_ticket(tariff,
-        //        strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
+//                                                 start_parking_time,
-        //        for (int i = 0; i < 600; ++i) {
+//                                                 end_parking_time,
-        //            start_parking_time = mktime(&now);
+//                                                 &price)) {
-        //            end_parking_time = start_parking_time + 240; // duration == 240
+//                int const zone = get_zone_nr(1);
+//                switch (zone) {
+//                case 1:
+//                    assert(price.netto == 879);    // expected value: 880
+//                    break;
+//                case 2:
+//                    /* fall through */
+//                case 3:
+//                    assert(price.netto == 1920);
+//                    break;
+//                }
+//            }
+//            time_t t = start_parking_time + 60;
+//            now = *localtime(&t);
+//        }
+//        //
+//        // test May 1st 2023
+//        //
+//        memset(&now, 0, sizeof(now));
+//        strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
+//        now.tm_hour -= 1; // for ctime
+//        // for (int i=0; i<6*24; ++i) {
+//        for (int i=0; i<1; ++i) {
+//            int const duration = 120;
+//            time_t t = mktime(&now);
+//            start_parking_time = t / 60;
+//            end_parking_time = start_parking_time + duration;
 
-        //            if (compute_price_for_parking_ticket(tariff,
+//            if (compute_price_for_parking_ticket(tariff,
-        //                                                 start_parking_time,
+//                                                 start_parking_time,
-        //                                                 end_parking_time,
+//                                                 end_parking_time,
-        //                                                 &price)) {
+//                                                 &price)) {
-        //                int const zone = get_zone_nr(1);
+//                int const zone = get_zone_nr();
-        //                switch (zone) {
+//                switch (zone) {
-        //                case 1:
+//                case 1:
-        //                    assert(price.netto == 879);    // expected value: 880
+//                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                    break;
+//                    assert(price.netto == 440);
-        //                case 2:
+//                    break;
-        //                    /* fall through */
+//                case 2:
-        //                case 3:
+//                    /* fall through */
-        //                    assert(price.netto == 1920);
+//                case 3:
-        //                    break;
+//                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                }
+//                    assert(price.netto == 960);
-        //            }
+//                    break;
-        //            time_t t = start_parking_time + 60;
+//                }
-        //            now = *localtime(&t);
+//            }
-        //        }
-        //        //
-        //        // test May 1st 2023
-        //        //
-        //        memset(&now, 0, sizeof(now));
-        //        strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
-        //        now.tm_hour -= 1; // for ctime
-        //        // for (int i=0; i<6*24; ++i) {
-        //        for (int i=0; i<1; ++i) {
-        //            int const duration = 120;
-        //            time_t t = mktime(&now);
-        //            start_parking_time = t / 60;
-        //            end_parking_time = start_parking_time + duration;
 
-        //            if (compute_price_for_parking_ticket(tariff,
+//            t = (start_parking_time + 60)*60;
-        //                                                 start_parking_time,
+//            now = *localtime(&t);
-        //                                                 end_parking_time,
+//        }
-        //                                                 &price)) {
-        //                int const zone = get_zone_nr();
-        //                switch (zone) {
-        //                case 1:
-        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                    assert(price.netto == 440);
-        //                    break;
-        //                case 2:
-        //                    /* fall through */
-        //                case 3:
-        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
-        //                    assert(price.netto == 960);
-        //                    break;
-        //                }
-        //            }
-
-        //            t = (start_parking_time + 60)*60;
-        //            now = *localtime(&t);
-        //        }
 
         free_tariff(tariff);
     }
@@ -191,7 +151,7 @@ int main() {
             struct tm now; // = Utilities::DateTimeToStructTm("2023-03-01T16:00:00");
             memset(&now, 0, sizeof(now));
             char buffer[64];
-            //#if 0
+//#if 0
             // 3.Jan 2023 -> Tuesday
             strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
             for (int i = 0; i < 600; ++i) {
@@ -266,8 +226,8 @@ int main() {
 
                 int const duration = 120;
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                                             PaymentOption::Option1, buffer, duration,
+                                PaymentOption::Option1, buffer, duration,
-                                                             false, true);
+                                false, true);
 
                 switch (zone) {
                 case 1:
@@ -305,8 +265,8 @@ int main() {
 
                 int const duration = 120;
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                                             PaymentOption::Option1, buffer, duration,
+                                PaymentOption::Option1, buffer, duration,
-                                                             false, true);
+                                false, true);
 
                 switch (zone) {
                 case 1:
@@ -339,8 +299,8 @@ int main() {
 
                 double const compCost = (duration < 15) ? 0 : duration * ((zone == 1) ? 3.6666 : 8.0);
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                                             PaymentOption::Option1, buffer, duration,
+                                PaymentOption::Option1, buffer, duration,
-                                                             false, true);
+                                false, true);
                 if (fabs(cost - compCost) > 1.0) { // zone 1 has rounding errors
                     cout << "ERROR ===> [" << i << "] " << asctime(&now)
                          << " - Total cost is: " << cost << " FT (computed="

main/main.pro

@@ -7,8 +7,6 @@ QMAKE_CFLAGS = -c -pipe -std=c11 -g -O0 -Wall -Wno-attributes -W -DDEBUG -D_REEN
 QMAKE_CXX_FLAGS += -std=c11
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobilisis/
-INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/rapidjson/
-INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/
 INCLUDEPATH += .
 
 unix {