Start reimplementation of

private_GetCostFromDuration() in terms of ticket.

library/include/mobilisis/calculator_functions.h

@@ -1,13 +1,21 @@
-#pragma once
+#ifndef CALCULATOR_FUNCTIONS_H_INCLUDED
+#define CALCULATOR_FUNCTIONS_H_INCLUDED
+
 #include <iostream>
+#include <optional>
+
 #include "configuration.h"
 #include "payment_method.h"
+#include "ticket.h"
+#include "tariff_time_range.h"
+
 #include <QDateTime>
 using namespace std;
 
 class Calculator
 {
 public:
+
 	/// <summary>
 	/// Gets duration in seconds from cost
 	/// </summary>
@@ -27,7 +35,7 @@ public:
     /// <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, 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);
@@ -44,8 +52,32 @@ private:
     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);
+
+    Ticket 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;
+
+    int findWorkTimeRange(QDateTime const &dt,
+                          QScopedArrayPointer<TariffTimeRange> const &worktime,
+                          size_t size);
+    int findNextWorkTimeRange(QDateTime const &dt,
+                              QScopedArrayPointer<TariffTimeRange> const &worktime,
+                              size_t size);
 };
+
+#endif // CALCULATOR_FUNCTIONS_H_INCLUDED

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,
+	Undefined = 0xFF,
-	Progressive = 0x01,
+	Progressive = 0x01,
-	Degressive = 0x02,
+	Degressive = 0x02,
-	Linear = 0x03,
+	Linear = 0x03,
-	Steps = 0x04
+	Steps = 0x04
-};
+};
+
+#endif // PAYMENT_METHOD_H_INCLUDED

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()
-    TariffTimeRange() : time_from(0), time_to(0) {}
+    : 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 Ticket(QDateTime const &s, QDateTime const &e,
+                    int durationMinutesNetto, int durationMinutesBrutto,
+                    uint32_t price, Status status);
+
+    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);
+
+    bool isValid() { return operator bool(); }
+
+    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"  }
+    };
+
+private:
+    Status m_status;
+
+    QDateTime m_validFrom;
+    QDateTime m_validUntil;
+    
+    int m_durationMinutesNetto;
+    int m_durationMinutesBrutto;
+
+    uint32_t m_price;
+};
+    
+QDebug operator<<(QDebug debug, Ticket::Status const &status);
+
+#endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

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

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 \
@@ -66,7 +67,8 @@ HEADERS += \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
     include/mobilisis/calculate_price.h \
-    include/mobilisis/atb_project.h
+    include/mobilisis/atb_project.h \
+    include/mobilisis/ticket.h
 
 OTHER_FILES += src/main.cpp
 

library/src/ticket.cpp

@@ -0,0 +1,88 @@
+#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::Ticket(QDateTime const &s, QDateTime const &e,
+               int durationMinutesNetto, int durationMinutesBrutto,
+               uint32_t price, Ticket::Status status)
+  : m_status(status)
+  , m_validFrom(s)
+  , m_validUntil(e)
+  , m_durationMinutesNetto(durationMinutesNetto)
+  , m_durationMinutesBrutto(durationMinutesBrutto)
+  , m_price(price) {
+}
+
+
+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 << 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);
+    status << QString("**********************");
+
+    return status.join('\n');
+}
+
+QDebug operator<<(QDebug debug, Ticket::Status const &status) {
+    QDebugStateSaver saver(debug);
+    debug << "Ticket-Status: " << std::get<1>(status)
+          << "(" << std::get<2>(status) << ")";
+    return debug;
+}

library/src/utilities.cpp

@@ -1,273 +1,375 @@
-#include "utilities.h"
+#include "utilities.h"
-#include "tariff_log.h"
+#include "tariff_log.h"
-
+
-static int protection_counter = 0;
+#include <QDebug>
-
+#include <algorithm>
-/// <summary>
+
-/// Helper function
+static int protection_counter = 0;
-/// </summary>
+
-/// <param name="pra_price"></param>
+/// <summary>
-/// <returns></returns>
+/// Helper function
-double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
+/// </summary>
-{
+/// <param name="pra_price"></param>
-	try
+/// <returns></returns>
-	{
+double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
-		double price_per_unit = pra_price;
+{
-        double unit = durationUnit;
+	try
-
+	{
-        if(unit < 0 || unit > 65535 ) unit = 60.0f;
+		double price_per_unit = pra_price;
-        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
+        double unit = durationUnit;
-		//printf("Price per unit (min) is: %lf\n", price_per_unit);
+
-		return price_per_unit;
+        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
-	catch (...)
+		//printf("Price per unit (min) is: %lf\n", price_per_unit);
-	{
+		return price_per_unit;
-		throw std::invalid_argument("An error has occurred in CalculatePricePerUnit() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in CalculatePricePerUnit() function\n");
-/// <inheritdoc/>
+	}
-time_t Utilities::GetCurrentLocalTime()
+}
-{
+
-	try
+/// <inheritdoc/>
-	{
+time_t Utilities::GetCurrentLocalTime()
-		time_t curr_time = time(NULL);
+{
-		tm tm_curr_time = {};
+	try
-		memset(&tm_curr_time, '\0', sizeof(struct tm));
+	{
-
+		time_t curr_time = time(NULL);
-		tm_curr_time = *localtime(&curr_time);
+		tm tm_curr_time = {};
-        curr_time = mktime(&tm_curr_time); //- timezone;
+		memset(&tm_curr_time, '\0', sizeof(struct tm));
-		return curr_time;
+
-	}
+		tm_curr_time = *localtime(&curr_time);
-	catch (...)
+        curr_time = mktime(&tm_curr_time); //- timezone;
-	{
+		return curr_time;
-		throw std::invalid_argument("An error has occurred in GetCurrentLocalTime() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in GetCurrentLocalTime() function\n");
-/// <inheritdoc/>
+	}
-int Utilities::ZellersAlgorithm(int day, int month, int year)
+}
-{
+
-	int mon;
+/// <inheritdoc/>
-	if (month > 2) mon = month; //for march to december month code is same as month
+int Utilities::ZellersAlgorithm(int day, int month, int year)
-	else {
+{
-		mon = (12 + month); //for Jan and Feb, month code will be 13 and 14
+	int mon;
-		year--; //decrease year for month Jan and Feb
+	if (month > 2) mon = month; //for march to december month code is same as month
-	}
+	else {
-	int y = year % 100; //last two digit
+		mon = (12 + month); //for Jan and Feb, month code will be 13 and 14
-	int c = year / 100; //first two digit
+		year--; //decrease year for month Jan and Feb
-	int w = (day + floor((13 * (mon + 1)) / 5) + y + floor(y / 4) + floor(c / 4) + (5 * c));
+	}
-	w = ((w + 5) % 7) + 1; //w % 7;
+	int y = year % 100; //last two digit
-	return w;
+	int c = year / 100; //first two digit
-}
+	int w = (day + floor((13 * (mon + 1)) / 5) + y + floor(y / 4) + floor(c / 4) + (5 * c));
-
+	w = ((w + 5) % 7) + 1; //w % 7;
-/// <inheritdoc/>
+	return w;
-struct tm Utilities::DateToStructTm(const char* dateStr)
+}
-{
+
-	struct tm t = {};
+/// <inheritdoc/>
-	memset(&t, '\0', sizeof(struct tm));
+struct tm Utilities::DateToStructTm(const char* dateStr)
-
+{
-	if (dateStr == nullptr || strlen(dateStr) <= 0) throw std::invalid_argument("DateToStructTm has failed parsing date string (null or empty)\n");
+	struct tm t = {};
-	try
+	memset(&t, '\0', sizeof(struct tm));
-	{
+
-		int success = sscanf(dateStr, "%d-%d-%d", &t.tm_year, &t.tm_mon, &t.tm_mday);
+	if (dateStr == nullptr || strlen(dateStr) <= 0) throw std::invalid_argument("DateToStructTm has failed parsing date string (null or empty)\n");
-		if (success != 3) throw std::invalid_argument("DateToStructTm() has failed parsing datetime string\n");
+	try
-
+	{
-		t.tm_year = t.tm_year - 1900;
+		int success = sscanf(dateStr, "%d-%d-%d", &t.tm_year, &t.tm_mon, &t.tm_mday);
-		t.tm_mon = t.tm_mon - 1;
+		if (success != 3) throw std::invalid_argument("DateToStructTm() has failed parsing datetime string\n");
-		t.tm_isdst = 0;
+
-		return t;
+		t.tm_year = t.tm_year - 1900;
-	}
+		t.tm_mon = t.tm_mon - 1;
-	catch (...)
+		t.tm_isdst = 0;
-	{
+		return t;
-		throw std::invalid_argument("An error has occurred in DateToStructTm() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in DateToStructTm() function\n");
-/// <inheritdoc/>
+	}
-struct tm Utilities::TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday)
+}
-{
+
-	struct tm t = {};
+/// <inheritdoc/>
-	memset(&t, '\0', sizeof(struct tm));
+struct tm Utilities::TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday)
-
+{
-	if (timeStr == nullptr || strlen(timeStr) <= 0) throw std::invalid_argument("TimeToStructTm() has failed parsing time string (null or empty)\n");
+	struct tm t = {};
-	try
+	memset(&t, '\0', sizeof(struct tm));
-	{
+
-		int success_time = sscanf(timeStr, "%d:%d:%d", &t.tm_hour, &t.tm_min, &t.tm_sec);
+	if (timeStr == nullptr || strlen(timeStr) <= 0) throw std::invalid_argument("TimeToStructTm() has failed parsing time string (null or empty)\n");
-		if (success_time != 3) throw std::invalid_argument("TimeToStructTm() has failed parsing time string\n");
+	try
-
+	{
-		struct tm tm_struct;
+		int success_time = sscanf(timeStr, "%d:%d:%d", &t.tm_hour, &t.tm_min, &t.tm_sec);
-		t.tm_year = year;
+		if (success_time != 3) throw std::invalid_argument("TimeToStructTm() has failed parsing time string\n");
-		t.tm_mon = mon;
+
-		t.tm_mday = mday;
+		struct tm tm_struct;
-		t.tm_wday = wday;
+		t.tm_year = year;
-		t.tm_isdst = 0;
+		t.tm_mon = mon;
-		return t;
+		t.tm_mday = mday;
-	}
+		t.tm_wday = wday;
-	catch (...)
+		t.tm_isdst = 0;
-	{
+		return t;
-		throw std::invalid_argument("An error has occurred in TimeToStructTm() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in TimeToStructTm() function\n");
-/// <inheritdoc/>
+	}
-struct tm Utilities::DateTimeToStructTm(const char* dateTimeStr)
+}
-{
+
-	struct tm t = {};
+/// <inheritdoc/>
-	memset(&t, '\0', sizeof(struct tm));
+struct tm Utilities::DateTimeToStructTm(const char* dateTimeStr)
-
+{
-	if (dateTimeStr == nullptr || strlen(dateTimeStr) <= 0) throw std::invalid_argument("DateTimeToStructTm() has failed parsing date string (null or empty)");
+	struct tm t = {};
-	try
+	memset(&t, '\0', sizeof(struct tm));
-	{
+
-		int success = sscanf(dateTimeStr, "%d-%d-%dT%d:%d:%dZ", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec);
+	if (dateTimeStr == nullptr || strlen(dateTimeStr) <= 0) throw std::invalid_argument("DateTimeToStructTm() has failed parsing date string (null or empty)");
-		if (success != 6) throw std::invalid_argument("DateTimeToStructTm() has failed parsing datetime string\n");
+	try
-
+	{
-		t.tm_year = t.tm_year - 1900;
+		int success = sscanf(dateTimeStr, "%d-%d-%dT%d:%d:%dZ", &t.tm_year, &t.tm_mon, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec);
-		t.tm_mon = t.tm_mon - 1;
+		if (success != 6) throw std::invalid_argument("DateTimeToStructTm() has failed parsing datetime string\n");
-		t.tm_isdst = 0;
+
-		return t;
+		t.tm_year = t.tm_year - 1900;
-	}
+		t.tm_mon = t.tm_mon - 1;
-	catch (...)
+		t.tm_isdst = 0;
-	{
+		return t;
-		throw std::invalid_argument("An error has occurred in DateTimeToStructTm() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in DateTimeToStructTm() function\n");
-/// <inheritdoc/>
+	}
-DayOfWeek Utilities::GetDayOfWeek(struct tm* t)
+}
-{
+
-	if (t == nullptr) throw std::invalid_argument("GetDayOfWeekFromDate() => parameter 't' is null\n");
+/// <inheritdoc/>
-	try
+DayOfWeek Utilities::GetDayOfWeek(struct tm* t)
-	{
+{
-		int d = t->tm_mday;
+	if (t == nullptr) throw std::invalid_argument("GetDayOfWeekFromDate() => parameter 't' is null\n");
-		int m = t->tm_mon + 1;
+	try
-		int y = t->tm_year + 1900;
+	{
-
+		int d = t->tm_mday;
-		int wd = Utilities::ZellersAlgorithm(d, m, y);
+		int m = t->tm_mon + 1;
-		return static_cast<DayOfWeek>(wd);
+		int y = t->tm_year + 1900;
-	}
+
-	catch (...)
+		int wd = Utilities::ZellersAlgorithm(d, m, y);
-	{
+		return static_cast<DayOfWeek>(wd);
-		throw std::invalid_argument("An error has occurred in GetDayOfWeekFromDate() function\n");
+	}
-	}
+	catch (...)
-}
+	{
-
+		throw std::invalid_argument("An error has occurred in GetDayOfWeekFromDate() function\n");
-/// <inheritdoc/>
+	}
-bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime_tm)
+}
-{
+
-	if (cfg == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Configuration not set\n");
+/// <inheritdoc/>
-	if (currentDateTime_tm == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Current datetime not set\n");
+bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime_tm)
-
+{
-	try
+	if (cfg == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Configuration not set\n");
-	{
+	if (currentDateTime_tm == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Current datetime not set\n");
-		//// Parse input date
+
-		int dayCurrent = currentDateTime_tm->tm_mday;
+	try
-		int monthCurrent = currentDateTime_tm->tm_mon + 1;
+	{
-
+		//// Parse input date
-		// Current date time
+		int dayCurrent = currentDateTime_tm->tm_mday;
-		int cdt = (monthCurrent * 100) + dayCurrent;
+		int monthCurrent = currentDateTime_tm->tm_mon + 1;
-
+
-		multimap<int, ATBPeriodYear>::iterator year_period_itr;
+		// Current date time
-		for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
+		int cdt = (monthCurrent * 100) + dayCurrent;
-		{
+
-			int dStart = year_period_itr->second.pye_start_day;
+		multimap<int, ATBPeriodYear>::iterator year_period_itr;
-			int dEnd = year_period_itr->second.pye_end_day;
+		for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
-
+		{
-			int mStart = year_period_itr->second.pye_start_month;
+			int dStart = year_period_itr->second.pye_start_day;
-			int mEnd = year_period_itr->second.pye_end_month;
+			int dEnd = year_period_itr->second.pye_end_day;
-
+
-			int start = (mStart * 100) + dStart;
+			int mStart = year_period_itr->second.pye_start_month;
-			int end = (mEnd * 100) + dEnd;
+			int mEnd = year_period_itr->second.pye_end_month;
-
+
-			if (cdt >= start && cdt <= end)
+			int start = (mStart * 100) + dStart;
-			{
+			int end = (mEnd * 100) + dEnd;
-				return true;
+
-			}
+			if (cdt >= start && cdt <= end)
-		}
+			{
-		return false;
+				return true;
-	}
+			}
-	catch (...)
+		}
-	{
+		return false;
-		cout << "IsYearPeriodActive() => An exception has occurred, ignoring check, returning true" << endl;
+	}
-		return true;
+	catch (...)
-	}
+	{
-}
+		cout << "IsYearPeriodActive() => An exception has occurred, ignoring check, returning true" << endl;
-
+		return true;
-/// <inheritdoc/>
+	}
-bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
+}
-{
+
-	try
+bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
-	{
+    if (std::none_of(cfg->YearPeriod.cbegin(),
-		*specialDayId = -1;
+                     cfg->YearPeriod.cend(),
-		*specialDayPrice = 0.0f;
+            [&dt](std::pair<int, ATBPeriodYear> const &year) {
-
+                QDate const d(2004, // 2004 is a leap year
-		if (cfg == nullptr) throw std::invalid_argument("CheckSpecialDay() => configuration is not set\n");
+                              dt.date().month(),
-		if (currentDateTimeStr == nullptr) throw std::invalid_argument("CheckSpecialDay() => invalid date/time string set\n");
+                              dt.date().day());
-
+                QDate const s(2004, year.second.pye_start_month, year.second.pye_start_day);
-
+                QDate const e(2004, year.second.pye_end_month, year.second.pye_end_day);
-		struct tm current_tm = Utilities::DateTimeToStructTm(currentDateTimeStr);
+                return (d >= s && d <= e);
-		//cout << "CheckSpecialDay() => Current: " << asctime(&current_tm) << endl;
+            })) {
-
+        qCritical() << "NO VALID YEAR PERIOD";
-		multimap<int, ATBSpecialDays>::iterator spec_days_itr;
+        return false;
-
+    }
-		for (spec_days_itr = cfg->SpecialDays.begin(); spec_days_itr != cfg->SpecialDays.end(); spec_days_itr++)
+    return true;
-		{
+}
-			int repeat_every_year = 0;
+
-			repeat_every_year = spec_days_itr->second.ped_year;
+/// <inheritdoc/>
-
+bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
-			string start = spec_days_itr->second.ped_date_start;
+{
-			if (start.length() <= 0) continue;
+	try
-			//cout << "CheckSpecialDay() => Start: " << start << endl;
+	{
-
+		*specialDayId = -1;
-			string end = spec_days_itr->second.ped_date_end;
+		*specialDayPrice = 0.0f;
-			if (end.length() <= 0) continue;
+
-			//cout << "CheckSpecialDay() => End: " << end << endl;
+		if (cfg == nullptr) throw std::invalid_argument("CheckSpecialDay() => configuration is not set\n");
-
+		if (currentDateTimeStr == nullptr) throw std::invalid_argument("CheckSpecialDay() => invalid date/time string set\n");
-			struct tm start_tm = Utilities::DateToStructTm(start.c_str());
+
-			//cout << "CheckSpecialDay() => Start: " << asctime(&start_tm) << endl;
+
-
+		struct tm current_tm = Utilities::DateTimeToStructTm(currentDateTimeStr);
-			struct tm end_tm = Utilities::DateToStructTm(end.c_str());
+		//cout << "CheckSpecialDay() => Current: " << asctime(&current_tm) << endl;
-			//cout << "CheckSpecialDay() => End: " << asctime(&end_tm) << endl;
+
-
+		multimap<int, ATBSpecialDays>::iterator spec_days_itr;
-			if (repeat_every_year <= 0)
+
-			{
+		for (spec_days_itr = cfg->SpecialDays.begin(); spec_days_itr != cfg->SpecialDays.end(); spec_days_itr++)
-				//cout << "CheckSpecialDay() => Repeat every year is: 0" << endl;
+		{
-				if ((current_tm.tm_year == start_tm.tm_year) && (current_tm.tm_year == end_tm.tm_year))
+			int repeat_every_year = 0;
-				{
+			repeat_every_year = spec_days_itr->second.ped_year;
-					if ((current_tm.tm_mon >= start_tm.tm_mon) && (current_tm.tm_mon <= end_tm.tm_mon))
+
-					{
+			string start = spec_days_itr->second.ped_date_start;
-						//cout << "CheckSpecialDay() => Month is in range between start and end" << endl;
+			if (start.length() <= 0) continue;
-						if ((current_tm.tm_mday >= start_tm.tm_mday) && (current_tm.tm_mday <= end_tm.tm_mday))
+			//cout << "CheckSpecialDay() => Start: " << start << endl;
-						{
+
-							LOG_DEBUG("CheckSpecialDay() => SPECIAL DAY");
+			string end = spec_days_itr->second.ped_date_end;
-							*specialDayId = spec_days_itr->second.ped_id;
+			if (end.length() <= 0) continue;
-							*specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
+			//cout << "CheckSpecialDay() => End: " << end << endl;
-							return true;
+
-						}
+			struct tm start_tm = Utilities::DateToStructTm(start.c_str());
-					}
+			//cout << "CheckSpecialDay() => Start: " << asctime(&start_tm) << endl;
-				}
+
-			}
+			struct tm end_tm = Utilities::DateToStructTm(end.c_str());
-			else
+			//cout << "CheckSpecialDay() => End: " << asctime(&end_tm) << endl;
-			{
+
-				if ((current_tm.tm_mon >= start_tm.tm_mon) && (current_tm.tm_mon <= end_tm.tm_mon))
+			if (repeat_every_year <= 0)
-				{
+			{
-					//cout << "CheckSpecialDay() => Month is in range between start and end" << endl;
+				//cout << "CheckSpecialDay() => Repeat every year is: 0" << endl;
-					if ((current_tm.tm_mday >= start_tm.tm_mday) && (current_tm.tm_mday <= end_tm.tm_mday))
+				if ((current_tm.tm_year == start_tm.tm_year) && (current_tm.tm_year == end_tm.tm_year))
-					{
+				{
-						LOG_DEBUG("CheckSpecialDay() => SPECIAL DAY");
+					if ((current_tm.tm_mon >= start_tm.tm_mon) && (current_tm.tm_mon <= end_tm.tm_mon))
-						*specialDayId = spec_days_itr->second.ped_id;
+					{
-						*specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
+						//cout << "CheckSpecialDay() => Month is in range between start and end" << endl;
-						return true;
+						if ((current_tm.tm_mday >= start_tm.tm_mday) && (current_tm.tm_mday <= end_tm.tm_mday))
-					}
+						{
-				}
+							LOG_DEBUG("CheckSpecialDay() => SPECIAL DAY");
-			}
+							*specialDayId = spec_days_itr->second.ped_id;
-		}
+							*specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
-		//cout << "CheckSpecialDay() => NOT SPECIAL DAY" << endl;
+							return true;
-		return false;
+						}
-	}
+					}
-	catch (...)
+				}
-	{
+			}
-		throw std::invalid_argument("CheckSpecialDay() => An error has occurred\n");
+			else
-		return false;
+			{
-	}
+				if ((current_tm.tm_mon >= start_tm.tm_mon) && (current_tm.tm_mon <= end_tm.tm_mon))
-}
+				{
+					//cout << "CheckSpecialDay() => Month is in range between start and end" << endl;
+					if ((current_tm.tm_mday >= start_tm.tm_mday) && (current_tm.tm_mday <= end_tm.tm_mday))
+					{
+						LOG_DEBUG("CheckSpecialDay() => SPECIAL DAY");
+						*specialDayId = spec_days_itr->second.ped_id;
+						*specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
+						return true;
+					}
+				}
+			}
+		}
+		//cout << "CheckSpecialDay() => NOT SPECIAL DAY" << endl;
+		return false;
+	}
+	catch (...)
+	{
+		throw std::invalid_argument("CheckSpecialDay() => An error has occurred\n");
+		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);
+}
+
+QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+    return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
+}
+
+QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
+    return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
+}
+
+bool Utilities::isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
+    return !isCarryOverNotSet(cfg, paymentMethodId);
+}
+
+bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
+    return (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1);
+}
+
+PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
+    if (cfg->PaymentOption.size() != 1) {
+        return PaymentMethod::Undefined;
+    }
+
+    std::multimap<int, ATBPaymentOption>::const_iterator it =
+        cfg->PaymentOption.cbegin();
+
+    switch (it->first) {
+    case PaymentMethod::Linear:
+        return PaymentMethod::Linear;
+    case PaymentMethod::Steps:
+        return PaymentMethod::Steps;
+    case PaymentMethod::Degressive:
+        return PaymentMethod::Degressive;
+    case PaymentMethod::Progressive:
+        return PaymentMethod::Progressive;
+    }
+
+    return PaymentMethod::Undefined;
+}

main/main.cpp

@@ -36,7 +36,7 @@ extern "C" char* strptime(const char* s,
 
 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());
@@ -47,14 +47,15 @@ int main() {
     bool isParsed = cfg.ParseJson(&cfg, json.c_str());
     cout << endl;
 
-    char const *startDate = "";
 
     if (isParsed)
     {
-        startDate = "2023-05-10T13:52:18.665Z";
+        QDateTime start = QDateTime::fromString("2023-11-27T17:50:00",Qt::ISODate);
-        std::string duration = calculator.GetDurationFromCost(&cfg, 3, (char *)startDate, 33, false, true);
+        //QDateTime start = QDateTime::currentDateTime();
-        cout << "---> startDate " << startDate << " _price_ = " << 33
+        QDateTime end = start.addSecs(120);
-             << " Total duration is: " << duration << endl;
+        uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
+        qCritical() << "cost=" << cost;
+        qCritical() << "end=" << end;
     }
 
     return 0;
@@ -69,6 +70,7 @@ 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 + 615;

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
+    }
+  ]
+}