library/include/mobilisis/calculator_functions.h

@@ -1,14 +1,7 @@
-#ifndef CALCULATOR_FUNCTIONS_H_INCLUDED
-#define CALCULATOR_FUNCTIONS_H_INCLUDED
-
+#pragma once
 #include <iostream>
-#include <optional>
-
 #include "configuration.h"
 #include "payment_method.h"
-#include "ticket.h"
-#include "tariff_time_range.h"
-
 #include <QDateTime>
 using namespace std;
 
@@ -56,13 +49,13 @@ private:
     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);
+    uint32_t private_GetCostFromDuration(Configuration const* cfg,
+                                         QDateTime const &start,
+                                         QDateTime &end,
+                                         int durationMinutes,
+                                         bool nextDay = false,
+                                         bool prepaid = false,
+                                         bool overtime = false);
 
     bool checkDurationMinutes(bool overTime,
                               int minParkingTime, int maxParkingTime,
@@ -71,13 +64,4 @@ private:
     //
     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/ticket.h

@@ -21,10 +21,7 @@ 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();
 
@@ -38,15 +35,6 @@ public:
     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;
 
@@ -57,8 +45,20 @@ private:
     int m_durationMinutesBrutto;
 
     uint32_t m_price;
+
+    static constexpr const Status s[STATUS_END] = {
+        {NOT_INITIALIZED       , "NOT_INITIALIZED"       , "Ticket not initialized"           },
+        {VALID                 , "VALID"                 , "Ticket is valid"                  },
+        {INVALID_FROM_DATETIME , "INVALID_FROM_DATETIME" , "Ticket has invalid start datetime"},
+        {INVALID_UNTIL_DATETIME, "INVALID_UNTIL_DATETIME", "Ticket has invalid end datetime"  }
+    };
 };
     
-QDebug operator<<(QDebug debug, Ticket::Status const &status);
+QDebug operator<<(QDebug debug, Ticket::Status const &status) {
+    QDebugStateSaver saver(debug);
+    debug << "Ticket-Status: " << std::get<1>(status) 
+          << "(" << std::get<2>(status) << ")";
+    return debug;
+}
 
 #endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -1,85 +1,78 @@
-#pragma once
-#include <cstring>
-#include <string.h>
-#include <ctime>
-#include <iostream>
-#include <cmath>
-
-#include "day_of_week.h"
-#include "configuration.h"
-#include "time_range.h"
-#include "payment_method.h"
-
-#include <QDateTime>
-
-using namespace std;
-
-namespace Utilities {
-	/// <summary>
-	/// Get day of week from current date (Zeller's Algorithm), starting day is Sunday
-	/// </summary>
-	/// <param name="date"></param>
-	/// <returns></returns>
-	DayOfWeek GetDayOfWeek(struct tm* tm);
-
-	/// <summary>
-	/// Date and time parse helper function
-	/// </summary>
-	/// <returns>Returns time (tm) structure</returns>
-	struct tm DateTimeToStructTm(const char* dateTimeStr);
-
-	/// <summary>
-	/// Date parse helper function
-	/// </summary>
-	/// <returns>Returns time (tm) structure</returns>
-	struct tm DateToStructTm(const char* dateStr);
-
-	/// <summary>
-	/// Time parse helper function
-	/// </summary>
-	/// <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>
-	/// <returns>Returns time_t structure</returns>
-	time_t GetCurrentLocalTime();
-
-	/// <summary>
-	/// Zeller's algorithm for determining day of week
-	/// </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>
-	/// <param name="tariff_cfg"></param>
-	/// <param name="currentDateTime"></param>
-	/// <returns></returns>
-	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
-    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
-
-	/// <summary>
-	/// Check permissions
-	/// </summary>
-	bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
-	bool CheckSpecialDay(Configuration const *cfg,
-						 QDateTime const &currentDateTimeS,
-						 int* specialDayId, uint32_t *specialDayPrice);
-
-	/// <summary>
-	/// Calculates price per unit
-	/// </summary>
-	/// <param name="pra_price"></param>
-	/// <returns></returns>
-	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);
-}
+#pragma once
+#include <cstring>
+#include <string.h>
+#include <ctime>
+#include <iostream>
+#include <cmath>
+
+#include "day_of_week.h"
+#include "configuration.h"
+#include "time_range.h"
+
+#include <QDateTime>
+
+using namespace std;
+
+namespace Utilities {
+	/// <summary>
+	/// Get day of week from current date (Zeller's Algorithm), starting day is Sunday
+	/// </summary>
+	/// <param name="date"></param>
+	/// <returns></returns>
+	DayOfWeek GetDayOfWeek(struct tm* tm);
+
+	/// <summary>
+	/// Date and time parse helper function
+	/// </summary>
+	/// <returns>Returns time (tm) structure</returns>
+	struct tm DateTimeToStructTm(const char* dateTimeStr);
+
+	/// <summary>
+	/// Date parse helper function
+	/// </summary>
+	/// <returns>Returns time (tm) structure</returns>
+	struct tm DateToStructTm(const char* dateStr);
+
+	/// <summary>
+	/// Time parse helper function
+	/// </summary>
+	/// <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>
+	/// <returns>Returns time_t structure</returns>
+	time_t GetCurrentLocalTime();
+
+	/// <summary>
+	/// Zeller's algorithm for determining day of week
+	/// </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>
+	/// <param name="tariff_cfg"></param>
+	/// <param name="currentDateTime"></param>
+	/// <returns></returns>
+	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
+
+	/// <summary>
+	/// Check permissions
+	/// </summary>
+	bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
+	bool CheckSpecialDay(Configuration const *cfg,
+						 QDateTime const &currentDateTimeS,
+						 int* specialDayId, uint32_t *specialDayPrice);
+
+	/// <summary>
+	/// Calculates price per unit
+	/// </summary>
+	/// <param name="pra_price"></param>
+	/// <returns></returns>
+	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
+
+    QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
+    QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
+}

library/src/calculator_functions.cpp

@@ -3,7 +3,6 @@
 #include "utilities.h"
 #include "tariff_log.h"
 #include "tariff_time_range.h"
-#include "ticket.h"
 
 #include <sstream>
 #include <algorithm>
@@ -405,18 +404,9 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         return GetCostFromDuration(cfg, start_datetime, end_datetime);
     }
 
-    QDateTime start = start_datetime;
-
-    Ticket t = private_GetCostFromDuration(cfg, start,
-                                           end_datetime, durationMinutes,
-                                           nextDay, prepaid);
-    if (t) {
-        qCritical().noquote() << t;
-
-        return t.getPrice();
-    }
-
-    return -1;
+    return private_GetCostFromDuration(cfg, start_datetime,
+                                       end_datetime, durationMinutes,
+                                       nextDay, prepaid);
 }
 
 int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
@@ -444,95 +434,66 @@ bool Calculator::checkDurationMinutes(bool overtime,
     return true;
 }
 
-int Calculator::findWorkTimeRange(QDateTime const &dt,
-                                  QScopedArrayPointer<TariffTimeRange> const &worktime,
-                                  size_t size) {
-    for (size_t w = 0; w < size; ++w) {
-        QTime const &worktime_from = worktime[w].getTimeFrom();
-        QTime const &worktime_to = worktime[w].getTimeUntil();
-
-        if ((dt.time() >= worktime_from) && (dt.time() < worktime_to)) {
-            return w;
-        }
-    }
-    return -1;
-}
-
-int Calculator::findNextWorkTimeRange(QDateTime const &dt,
-                                         QScopedArrayPointer<TariffTimeRange> const &worktime,
-                                         size_t size) {
-    int nextWorkTimeRange = -1;
-    for (size_t w = 0; w < size; ++w) {
-        QTime const &worktime_from = worktime[w].getTimeFrom();
-
-        if (dt.time() < worktime_from) {
-            nextWorkTimeRange = w;
-            continue;
-        }
-    }
-    return nextWorkTimeRange;
-}
-
 using namespace Utilities;
 
-Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
-                                               QDateTime const &start,
-                                               QDateTime &end,
-                                               int &durationMinutes,
-                                               bool nextDay,
-                                               bool prepaid,
-                                               bool overtime) {
+uint32_t Calculator::private_GetCostFromDuration(Configuration const* cfg,
+                                                 QDateTime const &start,
+                                                 QDateTime &end,
+                                                 int durationMinutes,
+                                                 bool nextDay,
+                                                 bool prepaid,
+                                                 bool overtime) {
+    // TODO
+    static const PaymentMethod paymentMethodId = PaymentMethod::Linear;
 
-    static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
     static int const minParkingTimeMinutes = getMinimalParkingTime(cfg, paymentMethodId);
     static int const maxParkingTimeMinutes = getMaximalParkingTime(cfg, paymentMethodId);
 
     static bool const checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
 
-    static const int durationMinutesNetto = durationMinutes;
-
     if (!checkMinMaxMinutes) {
         qCritical() << QString(
             "ERROR: CONDITION minMin < maxMin (%1 < %2) IS NOT VALID")
                 .arg(minParkingTimeMinutes).arg(maxParkingTimeMinutes);
-        return Ticket();
+        return 0;
     }
 
     if (!checkDurationMinutes(overtime, minParkingTimeMinutes,
                               maxParkingTimeMinutes, durationMinutes)) {
-        return Ticket();
+        return 0;
     }
 
+    // Get input date
     QDateTime inputDate = start;
 
+    // Get day of week
     int const weekdayId = inputDate.date().dayOfWeek();
 
-    uint32_t price = 0;
-    double durationUnit = 60.0;
+
+    uint32_t day_price = 0;
+    uint32_t price_per_unit = 0;
 
     int current_special_day_id = -1;
 
-    // there might be more than 1 worktime ranges per day
     int const timeRanges = std::max((int)cfg->WeekDaysWorktime.count(weekdayId), 1);
     QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
-    int ranges = 0;
+    int index = 0;
 
-    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &price)) {
+    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &day_price)) {
         // Set special day price:
-        durationUnit = 60.0;
-        worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
-                                      SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
-        ranges = 1;
+        // ACHTUNG: price_per_unit ist eigentlich immer preis pro minute !!!
+        price_per_unit = CalculatePricePerUnit(day_price);
+        worktime[index].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
+                                     SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
     } else {
-        // Set new price for the normal day: do not use a floating-point type
-        // for the price, rather compute with integers. Only at the very end of
-        // the computation the price is divided by durationUnit.
+        // Set new price for the normal day
+
         int pop_id = cfg->PaymentOption.find(paymentMethodId)->second.pop_id;
-        price = cfg->PaymentRate.find(pop_id)->second.pra_price;
+        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
 
         int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
-        durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
+        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)
         if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
@@ -542,162 +503,114 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
             return private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
         }
 
-        using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
-        std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
-
-        for (WTIterator itr = p.first; itr != p.second; ++itr) {
-            worktime[ranges].setTimeRange(WeekDaysWorkTimeFrom(itr),
-                                          WeekDaysWorkTimeUntil(itr));
-            ranges += 1;
+        for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) {
+            qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str();
+            worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()),
+                                         QTime::fromString(itr->second.pwd_time_to.c_str()));
+            index += 1;
         }
     }
 
-    uint32_t costFromDuration = 0;
-    QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
-    int currentRange = -1;
+    if (price_per_unit < 0) price_per_unit = 1.0f;
+    qDebug() << "Calculated price per minute=" << price_per_unit;
 
-    if (nextDay) { // this means the function has been called recursively
-        currentRange = 0;
-        inputDate.setTime(worktime[currentRange].getTimeFrom());
-    } else {
-        // check if inputDate is located inside a valid worktime-range...
-        currentRange = findWorkTimeRange(inputDate, worktime, ranges);
-        if (currentRange == -1) { // no...
-            if (!prepaid) {       // parking is not allowed
-                return Ticket(start, end, durationMinutesNetto, 0,
-                              0, Ticket::s[INVALID_FROM_DATETIME]);
+    double costFromDuration = 0.0;
+    for (int w = 0; w < index; ++w) {
+        QTime worktime_from = worktime[w].getTimeFrom();
+        QTime worktime_to = worktime[w].getTimeUntil();
+
+        if (price_per_unit == 0) {
+            inputDate = inputDate.addDays(1);
+            inputDate.setTime(worktime_from);
+            uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
+            if (partialCost == 0) {
+                return 0;
             }
-            // find the next worktime-range (on the same day), and start from there
-            currentRange = findNextWorkTimeRange(inputDate, worktime, ranges);
-            inputDate.setTime(worktime[currentRange].getTimeFrom());
+            costFromDuration += partialCost;
+            continue;
         }
-    }
 
-    for (int w = currentRange; w < ranges; ++w) {
-        if (durationMinutes > 0) {
-            QTime const &worktime_from = worktime[w].getTimeFrom();
-            QTime const &worktime_to = worktime[w].getTimeUntil();
+        // If overtime flag is set
+        if (overtime || nextDay) {
+            inputDate.setTime(worktime_from);
+            overtime = false;
+        }
 
-            qCritical() << "from" << worktime_from;
-            qCritical() << "until" << worktime_to;
-
-            //if (w > 0) { // durationMinutes are always meant as netto time and
-            //             // the time between worktime-ranges are free.
-            //    inputDate.setTime(worktime_from);
-            //}
-
-            // TODO: hier muss dann der preis hin
-            if (price == 0) {
-                inputDate = inputDate.addDays(1);
+        // Check prepaid
+        if (!prepaid) {
+            if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) {
+                qDebug() << "[STOP] * Ticket is not valid * ";
+                return 0.0f;
+            }
+        } else {
+            qDebug() << "* PREPAID MODE ACTIVE *";
+            if (inputDate.time() < worktime_from) {
                 inputDate.setTime(worktime_from);
-                Ticket t = private_GetCostFromDuration(
-                                                    cfg, // TODO: erklaerung
-                                                    inputDate,
-                                                    end, durationMinutes,
-                                                    true, prepaid);
-                if (!t.isValid()) {
-                    return t;
+            } else if(inputDate.time() > worktime_to) {
+                qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
+                inputDate = inputDate.addDays(1);
+                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
+                if (partialCost == 0) {
+                    return 0;
                 }
-                costFromDuration += t.getPrice();
+                costFromDuration += partialCost;
                 continue;
             }
+        }
 
-            // If overtime flag is set
-            // TODO: ueberpruefen, kann man wohl nach oben ziehen
-            //if (overtime || nextDay) {
-            //    inputDate.setTime(worktime_from);
-            //    overtime = false;
-            //}
-
-            qCritical() << "inputDate.time()=" << inputDate.time();
-
-            // Check prepaid
-            if (!prepaid) {
-                if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to)) {
-                    qDebug() << "[STOP] * Ticket is not valid * ";
-                    return Ticket();
-                }
-            } else {
-                qDebug() << "* PREPAID MODE ACTIVE *";
-                if (inputDate.time() < worktime_from) {
-                    inputDate.setTime(worktime_from);
-                //} else if(inputDate.time() > worktime_to) {
-                } else if(inputDate.time() > lastWorktimeTo) {
-                    qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
-                    // wieso ist hier overtime nicht gesetzt
-                    inputDate = inputDate.addDays(1);
-                    Ticket t = private_GetCostFromDuration(
-                                                cfg, inputDate, end,
-                                                durationMinutes, true, prepaid);
-                    if (!t.isValid()) {
-                        return t;
-                    }
-                    costFromDuration += t.getPrice();
-                    continue;
-                }
+        while(durationMinutes > 0) {
+            // Check for active year period
+            if (std::none_of(cfg->YearPeriod.begin(),
+                             cfg->YearPeriod.end(),
+                    [&inputDate](std::pair<int, ATBPeriodYear> const &year) {
+                        QDate const input(2004, // 2004 is a leap year
+                                          inputDate.date().month(),
+                                          inputDate.date().day());
+                        QDate const s(2004, year.second.pye_start_day, year.second.pye_start_month);
+                        QDate const e(2004, year.second.pye_end_day, year.second.pye_end_month);
+                        return (input >= s && input <= e);
+                    })) {
+                qCritical() << "NO VALID YEAR PERIOD";
+                return 0.0;
             }
 
-            while(durationMinutes > 0) {
-                // Check for active year period
-                if (!IsYearPeriodActive(cfg, inputDate)) {
-                    return Ticket();
+            // Go to next day if minutes not spent
+            if(inputDate.time() >= worktime_to) {
+                // check for carry_over status
+                if (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1) {
+                    break;
                 }
 
-                qDebug() << "inputDate" << inputDate.toString(Qt::ISODate);
+                qDebug() << "Reached end of worktime, searching for the next working day";
 
-                if(inputDate.time() >= lastWorktimeTo) {
-                    // Go to next day if minutes not spent
-                    if (carryOverNotSet) {
-                        // no carry_over, so stop computation
-                        break;
-                    }
-
-                    qDebug() << "Reached end of worktime, searching for the next working day";
-
-                    inputDate = inputDate.addDays(1);
-                    inputDate.setTime(QTime());
-                    overtime = true;
-                    Ticket t = private_GetCostFromDuration(
-                                                cfg, inputDate, end,
-                                                durationMinutes, true, prepaid, overtime);
-                    if (!t.isValid()) {
-                        return t;
-                    }
-                    costFromDuration += t.getPrice();
-                    break; // stop while, and continue in outer loop
-                } else {
-                    if(inputDate.time() < worktime_to) {
-                        // Increment input date minutes for each monetary unit
-                        inputDate = inputDate.addSecs(60);
-
-                        qDebug() << "inputDate" << inputDate.toString(Qt::ISODate);
-
-                        durationMinutes -= 1;
-                        //costFromDuration += price_per_unit;
-                        costFromDuration += price;
-                    } else break;
+                inputDate = inputDate.addDays(1);
+                overtime = true;
+                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
+                if (partialCost == 0) {
+                    return 0;
                 }
+                costFromDuration += partialCost;
+                break; // stop while, and continue in outer loop
+            } else {
+                // Increment input date minutes for each monetary unit
+                inputDate = inputDate.addSecs(60);
+                durationMinutes -= 1;
+                costFromDuration += price_per_unit;
             }
         }
     }
 
+    qDebug() << "GetCostFromDuration(): Valid until:" << inputDate.toString(Qt::ISODate);
 
-    if (inputDate >= end) {
-        end = inputDate;
-    }
+    end = inputDate;
 
-    if (nextDay == false) {
-        qDebug() << "GetCostFromDuration(): Valid until:" << end.toString(Qt::ISODate);
-    }
+    //double ret_val = total_cost;
+    //total_cost = 0.0f;
+    //return ceil(ret_val);
 
-    return
-        Ticket(start, end,
-               durationMinutesNetto,
-               start.secsTo(end) / 60,
-               nextDay ?
-                   costFromDuration :
-                   llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
-               Ticket::s[VALID]);
+    // TODO: runden nur falls oberster stack-rahmen
+
+    return ceil(costFromDuration);
 }
 
 

library/src/ticket.cpp

@@ -11,19 +11,7 @@ Ticket::Ticket()
     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;
@@ -66,23 +54,14 @@ void Ticket::setPrice(uint32_t price) {
     
 Ticket::operator QString() {
     QStringList status;
-    status << QString("**********************");
-    status << QString("Status ............. : %1 (%2)")
+    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("**********************");
+    status << QString("Price ......... : %1").arg(m_price);
 
-    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;
+    return status.join('\n');;
 }

library/src/utilities.cpp

@@ -1,375 +1,319 @@
-#include "utilities.h"
-#include "tariff_log.h"
-
-#include <QDebug>
-#include <algorithm>
-
-static int protection_counter = 0;
-
-/// <summary>
-/// Helper function
-/// </summary>
-/// <param name="pra_price"></param>
-/// <returns></returns>
-double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
-{
-	try
-	{
-		double price_per_unit = pra_price;
-        double unit = durationUnit;
-
-        if(unit < 0 || unit > 65535 ) unit = 60.0f;
-        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
-		//printf("Price per unit (min) is: %lf\n", price_per_unit);
-		return price_per_unit;
-	}
-	catch (...)
-	{
-		throw std::invalid_argument("An error has occurred in CalculatePricePerUnit() function\n");
-	}
-}
-
-/// <inheritdoc/>
-time_t Utilities::GetCurrentLocalTime()
-{
-	try
-	{
-		time_t curr_time = time(NULL);
-		tm tm_curr_time = {};
-		memset(&tm_curr_time, '\0', sizeof(struct tm));
-
-		tm_curr_time = *localtime(&curr_time);
-        curr_time = mktime(&tm_curr_time); //- timezone;
-		return curr_time;
-	}
-	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;
-	if (month > 2) mon = month; //for march to december month code is same as month
-	else {
-		mon = (12 + month); //for Jan and Feb, month code will be 13 and 14
-		year--; //decrease year for month Jan and Feb
-	}
-	int y = year % 100; //last two digit
-	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;
-	return w;
-}
-
-/// <inheritdoc/>
-struct tm Utilities::DateToStructTm(const char* dateStr)
-{
-	struct tm t = {};
-	memset(&t, '\0', sizeof(struct tm));
-
-	if (dateStr == nullptr || strlen(dateStr) <= 0) throw std::invalid_argument("DateToStructTm has failed parsing date string (null or empty)\n");
-	try
-	{
-		int success = sscanf(dateStr, "%d-%d-%d", &t.tm_year, &t.tm_mon, &t.tm_mday);
-		if (success != 3) throw std::invalid_argument("DateToStructTm() has failed parsing datetime string\n");
-
-		t.tm_year = t.tm_year - 1900;
-		t.tm_mon = t.tm_mon - 1;
-		t.tm_isdst = 0;
-		return t;
-	}
-	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 = {};
-	memset(&t, '\0', sizeof(struct tm));
-
-	if (timeStr == nullptr || strlen(timeStr) <= 0) throw std::invalid_argument("TimeToStructTm() has failed parsing time string (null or empty)\n");
-	try
-	{
-		int success_time = sscanf(timeStr, "%d:%d:%d", &t.tm_hour, &t.tm_min, &t.tm_sec);
-		if (success_time != 3) throw std::invalid_argument("TimeToStructTm() has failed parsing time string\n");
-
-		struct tm tm_struct;
-		t.tm_year = year;
-		t.tm_mon = mon;
-		t.tm_mday = mday;
-		t.tm_wday = wday;
-		t.tm_isdst = 0;
-		return t;
-	}
-	catch (...)
-	{
-		throw std::invalid_argument("An error has occurred in TimeToStructTm() function\n");
-	}
-}
-
-/// <inheritdoc/>
-struct tm Utilities::DateTimeToStructTm(const char* dateTimeStr)
-{
-	struct tm t = {};
-	memset(&t, '\0', sizeof(struct tm));
-
-	if (dateTimeStr == nullptr || strlen(dateTimeStr) <= 0) throw std::invalid_argument("DateTimeToStructTm() has failed parsing date string (null or empty)");
-	try
-	{
-		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 (success != 6) throw std::invalid_argument("DateTimeToStructTm() has failed parsing datetime string\n");
-
-		t.tm_year = t.tm_year - 1900;
-		t.tm_mon = t.tm_mon - 1;
-		t.tm_isdst = 0;
-		return t;
-	}
-	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");
-	try
-	{
-		int d = t->tm_mday;
-		int m = t->tm_mon + 1;
-		int y = t->tm_year + 1900;
-
-		int wd = Utilities::ZellersAlgorithm(d, m, y);
-		return static_cast<DayOfWeek>(wd);
-	}
-	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");
-	if (currentDateTime_tm == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Current datetime not set\n");
-
-	try
-	{
-		//// Parse input date
-		int dayCurrent = currentDateTime_tm->tm_mday;
-		int monthCurrent = currentDateTime_tm->tm_mon + 1;
-
-		// 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)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	catch (...)
-	{
-		cout << "IsYearPeriodActive() => An exception has occurred, ignoring check, returning true" << endl;
-		return true;
-	}
-}
-
-bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
-    if (std::none_of(cfg->YearPeriod.cbegin(),
-                     cfg->YearPeriod.cend(),
-            [&dt](std::pair<int, ATBPeriodYear> const &year) {
-                QDate const d(2004, // 2004 is a leap year
-                              dt.date().month(),
-                              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);
-                return (d >= s && d <= e);
-            })) {
-        qCritical() << "NO VALID YEAR PERIOD";
-        return false;
-    }
-    return true;
-}
-
-/// <inheritdoc/>
-bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice)
-{
-	try
-	{
-		*specialDayId = -1;
-		*specialDayPrice = 0.0f;
-
-		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 current_tm = Utilities::DateTimeToStructTm(currentDateTimeStr);
-		//cout << "CheckSpecialDay() => Current: " << asctime(&current_tm) << endl;
-
-		multimap<int, ATBSpecialDays>::iterator spec_days_itr;
-
-		for (spec_days_itr = cfg->SpecialDays.begin(); spec_days_itr != cfg->SpecialDays.end(); spec_days_itr++)
-		{
-			int repeat_every_year = 0;
-			repeat_every_year = spec_days_itr->second.ped_year;
-
-			string start = spec_days_itr->second.ped_date_start;
-			if (start.length() <= 0) continue;
-			//cout << "CheckSpecialDay() => Start: " << start << endl;
-
-			string end = spec_days_itr->second.ped_date_end;
-			if (end.length() <= 0) continue;
-			//cout << "CheckSpecialDay() => End: " << end << endl;
-
-			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());
-			//cout << "CheckSpecialDay() => End: " << asctime(&end_tm) << endl;
-
-			if (repeat_every_year <= 0)
-			{
-				//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))
-				{
-					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;
-						}
-					}
-				}
-			}
-			else
-			{
-				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;
-}
+#include "utilities.h"
+#include "tariff_log.h"
+
+#include <QDebug>
+
+static int protection_counter = 0;
+
+/// <summary>
+/// Helper function
+/// </summary>
+/// <param name="pra_price"></param>
+/// <returns></returns>
+double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
+{
+	try
+	{
+		double price_per_unit = pra_price;
+        double unit = durationUnit;
+
+        if(unit < 0 || unit > 65535 ) unit = 60.0f;
+        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
+		//printf("Price per unit (min) is: %lf\n", price_per_unit);
+		return price_per_unit;
+	}
+	catch (...)
+	{
+		throw std::invalid_argument("An error has occurred in CalculatePricePerUnit() function\n");
+	}
+}
+
+/// <inheritdoc/>
+time_t Utilities::GetCurrentLocalTime()
+{
+	try
+	{
+		time_t curr_time = time(NULL);
+		tm tm_curr_time = {};
+		memset(&tm_curr_time, '\0', sizeof(struct tm));
+
+		tm_curr_time = *localtime(&curr_time);
+        curr_time = mktime(&tm_curr_time); //- timezone;
+		return curr_time;
+	}
+	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;
+	if (month > 2) mon = month; //for march to december month code is same as month
+	else {
+		mon = (12 + month); //for Jan and Feb, month code will be 13 and 14
+		year--; //decrease year for month Jan and Feb
+	}
+	int y = year % 100; //last two digit
+	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;
+	return w;
+}
+
+/// <inheritdoc/>
+struct tm Utilities::DateToStructTm(const char* dateStr)
+{
+	struct tm t = {};
+	memset(&t, '\0', sizeof(struct tm));
+
+	if (dateStr == nullptr || strlen(dateStr) <= 0) throw std::invalid_argument("DateToStructTm has failed parsing date string (null or empty)\n");
+	try
+	{
+		int success = sscanf(dateStr, "%d-%d-%d", &t.tm_year, &t.tm_mon, &t.tm_mday);
+		if (success != 3) throw std::invalid_argument("DateToStructTm() has failed parsing datetime string\n");
+
+		t.tm_year = t.tm_year - 1900;
+		t.tm_mon = t.tm_mon - 1;
+		t.tm_isdst = 0;
+		return t;
+	}
+	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 = {};
+	memset(&t, '\0', sizeof(struct tm));
+
+	if (timeStr == nullptr || strlen(timeStr) <= 0) throw std::invalid_argument("TimeToStructTm() has failed parsing time string (null or empty)\n");
+	try
+	{
+		int success_time = sscanf(timeStr, "%d:%d:%d", &t.tm_hour, &t.tm_min, &t.tm_sec);
+		if (success_time != 3) throw std::invalid_argument("TimeToStructTm() has failed parsing time string\n");
+
+		struct tm tm_struct;
+		t.tm_year = year;
+		t.tm_mon = mon;
+		t.tm_mday = mday;
+		t.tm_wday = wday;
+		t.tm_isdst = 0;
+		return t;
+	}
+	catch (...)
+	{
+		throw std::invalid_argument("An error has occurred in TimeToStructTm() function\n");
+	}
+}
+
+/// <inheritdoc/>
+struct tm Utilities::DateTimeToStructTm(const char* dateTimeStr)
+{
+	struct tm t = {};
+	memset(&t, '\0', sizeof(struct tm));
+
+	if (dateTimeStr == nullptr || strlen(dateTimeStr) <= 0) throw std::invalid_argument("DateTimeToStructTm() has failed parsing date string (null or empty)");
+	try
+	{
+		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 (success != 6) throw std::invalid_argument("DateTimeToStructTm() has failed parsing datetime string\n");
+
+		t.tm_year = t.tm_year - 1900;
+		t.tm_mon = t.tm_mon - 1;
+		t.tm_isdst = 0;
+		return t;
+	}
+	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");
+	try
+	{
+		int d = t->tm_mday;
+		int m = t->tm_mon + 1;
+		int y = t->tm_year + 1900;
+
+		int wd = Utilities::ZellersAlgorithm(d, m, y);
+		return static_cast<DayOfWeek>(wd);
+	}
+	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");
+	if (currentDateTime_tm == nullptr) throw std::invalid_argument("IsYearPeriodActive() = > Current datetime not set\n");
+
+	try
+	{
+		//// Parse input date
+		int dayCurrent = currentDateTime_tm->tm_mday;
+		int monthCurrent = currentDateTime_tm->tm_mon + 1;
+
+		// 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)
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	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
+	{
+		*specialDayId = -1;
+		*specialDayPrice = 0.0f;
+
+		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 current_tm = Utilities::DateTimeToStructTm(currentDateTimeStr);
+		//cout << "CheckSpecialDay() => Current: " << asctime(&current_tm) << endl;
+
+		multimap<int, ATBSpecialDays>::iterator spec_days_itr;
+
+		for (spec_days_itr = cfg->SpecialDays.begin(); spec_days_itr != cfg->SpecialDays.end(); spec_days_itr++)
+		{
+			int repeat_every_year = 0;
+			repeat_every_year = spec_days_itr->second.ped_year;
+
+			string start = spec_days_itr->second.ped_date_start;
+			if (start.length() <= 0) continue;
+			//cout << "CheckSpecialDay() => Start: " << start << endl;
+
+			string end = spec_days_itr->second.ped_date_end;
+			if (end.length() <= 0) continue;
+			//cout << "CheckSpecialDay() => End: " << end << endl;
+
+			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());
+			//cout << "CheckSpecialDay() => End: " << asctime(&end_tm) << endl;
+
+			if (repeat_every_year <= 0)
+			{
+				//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))
+				{
+					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;
+						}
+					}
+				}
+			}
+			else
+			{
+				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);
+}

main/main.cpp

@@ -50,12 +50,9 @@ int main() {
 
     if (isParsed)
     {
-        QDateTime start = QDateTime::fromString("2023-11-27T17:50:00",Qt::ISODate);
-        //QDateTime start = QDateTime::currentDateTime();
+        QDateTime start = QDateTime::fromString("2023-05-11T08:00:00",Qt::ISODate);
         QDateTime end = start.addSecs(120);
-        uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
-        qCritical() << "cost=" << cost;
-        qCritical() << "end=" << end;
+        calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
     }
 
     return 0;