Start reimplementation of

private_GetCostFromDuration() in terms of ticket.

library/include/mobilisis/calculator_functions.h

@@ -1,7 +1,14 @@
-#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;
 
@@ -49,13 +56,13 @@ private:
     int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
     int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
 
-    uint32_t private_GetCostFromDuration(Configuration const* cfg,
-                                         QDateTime const &start,
-                                         QDateTime &end,
-                                         int durationMinutes,
-                                         bool nextDay = false,
-                                         bool prepaid = false,
-                                         bool overtime = false);
+    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,
@@ -64,4 +71,13 @@ 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,6 +21,9 @@ 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();
@@ -35,6 +38,15 @@ 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;
 
@@ -45,20 +57,8 @@ 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) {
-    QDebugStateSaver saver(debug);
-    debug << "Ticket-Status: " << std::get<1>(status) 
-          << "(" << std::get<2>(status) << ")";
-    return debug;
-}
+QDebug operator<<(QDebug debug, Ticket::Status const &status);
 
 #endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -8,6 +8,7 @@
 #include "day_of_week.h"
 #include "configuration.h"
 #include "time_range.h"
+#include "payment_method.h"
 
 #include <QDateTime>
 
@@ -57,6 +58,7 @@ namespace Utilities {
 	/// <param name="currentDateTime"></param>
 	/// <returns></returns>
 	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
+    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
 
 	/// <summary>
 	/// Check permissions
@@ -75,4 +77,9 @@ namespace Utilities {
 
     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/src/calculator_functions.cpp

@@ -3,6 +3,7 @@
 #include "utilities.h"
 #include "tariff_log.h"
 #include "tariff_time_range.h"
+#include "ticket.h"
 
 #include <sstream>
 #include <algorithm>
@@ -404,9 +405,18 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
         return GetCostFromDuration(cfg, start_datetime, end_datetime);
     }
 
-    return private_GetCostFromDuration(cfg, start_datetime,
-                                       end_datetime, durationMinutes,
-                                       nextDay, prepaid);
+    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;
 }
 
 int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
@@ -434,66 +444,95 @@ 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;
 
-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;
+Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
+                                               QDateTime const &start,
+                                               QDateTime &end,
+                                               int &durationMinutes,
+                                               bool nextDay,
+                                               bool prepaid,
+                                               bool overtime) {
 
+    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 0;
+        return Ticket();
     }
 
     if (!checkDurationMinutes(overtime, minParkingTimeMinutes,
                               maxParkingTimeMinutes, durationMinutes)) {
-        return 0;
+        return Ticket();
     }
 
-    // Get input date
     QDateTime inputDate = start;
 
-    // Get day of week
     int const weekdayId = inputDate.date().dayOfWeek();
 
-
-    uint32_t day_price = 0;
-    uint32_t price_per_unit = 0;
+    uint32_t price = 0;
+    double durationUnit = 60.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 index = 0;
+    int ranges = 0;
 
-    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &day_price)) {
+    if(Utilities::CheckSpecialDay(cfg, inputDate, &current_special_day_id, &price)) {
         // Set special day price:
-        // ACHTUNG: price_per_unit ist eigentlich immer preis pro minute !!!
-        price_per_unit = CalculatePricePerUnit(day_price);
-        worktime[index].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
-                                     SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
+        durationUnit = 60.0;
+        worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, current_special_day_id),
+                                      SpecialDaysWorkTimeUntil(cfg, current_special_day_id));
+        ranges = 1;
     } else {
-        // Set new price for the normal day
-
+        // 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.
         int pop_id = cfg->PaymentOption.find(paymentMethodId)->second.pop_id;
-        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
+        price = cfg->PaymentRate.find(pop_id)->second.pra_price;
 
         int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
-        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
-        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
+        durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
 
         // If no working day found, skip it (recursively call method again)
         if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
@@ -503,114 +542,162 @@ uint32_t Calculator::private_GetCostFromDuration(Configuration const* cfg,
             return private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
         }
 
-        for (auto[itr, rangeEnd] = cfg->WeekDaysWorktime.equal_range(weekdayId); itr != rangeEnd; ++itr) {
-            qCritical() << itr->first << itr->second.pwd_time_from.c_str() << itr->second.pwd_time_to.c_str();
-            worktime[index].setTimeRange(QTime::fromString(itr->second.pwd_time_from.c_str()),
-                                         QTime::fromString(itr->second.pwd_time_to.c_str()));
-            index += 1;
+        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;
         }
     }
 
-    if (price_per_unit < 0) price_per_unit = 1.0f;
-    qDebug() << "Calculated price per minute=" << price_per_unit;
+    uint32_t costFromDuration = 0;
+    QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
+    int currentRange = -1;
 
-    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;
+    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]);
             }
-            costFromDuration += partialCost;
-            continue;
+            // find the next worktime-range (on the same day), and start from there
+            currentRange = findNextWorkTimeRange(inputDate, worktime, ranges);
+            inputDate.setTime(worktime[currentRange].getTimeFrom());
         }
+    }
 
-        // If overtime flag is set
-        if (overtime || nextDay) {
-            inputDate.setTime(worktime_from);
-            overtime = false;
-        }
+    for (int w = currentRange; w < ranges; ++w) {
+        if (durationMinutes > 0) {
+            QTime const &worktime_from = worktime[w].getTimeFrom();
+            QTime const &worktime_to = worktime[w].getTimeUntil();
 
-        // 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);
-            } else if(inputDate.time() > worktime_to) {
-                qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
+            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);
-                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid);
-                if (partialCost == 0) {
-                    return 0;
+                inputDate.setTime(worktime_from);
+                Ticket t = private_GetCostFromDuration(
+                                                    cfg, // TODO: erklaerung
+                                                    inputDate,
+                                                    end, durationMinutes,
+                                                    true, prepaid);
+                if (!t.isValid()) {
+                    return t;
                 }
-                costFromDuration += partialCost;
+                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;
+            // 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;
+                }
             }
 
-            // 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;
+            while(durationMinutes > 0) {
+                // Check for active year period
+                if (!IsYearPeriodActive(cfg, inputDate)) {
+                    return Ticket();
                 }
 
-                qDebug() << "Reached end of worktime, searching for the next working day";
+                qDebug() << "inputDate" << inputDate.toString(Qt::ISODate);
 
-                inputDate = inputDate.addDays(1);
-                overtime = true;
-                uint32_t const partialCost = private_GetCostFromDuration(cfg, inputDate, end, durationMinutes, true, prepaid, overtime);
-                if (partialCost == 0) {
-                    return 0;
+                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;
                 }
-                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);
 
-    end = inputDate;
+    if (inputDate >= end) {
+        end = inputDate;
+    }
 
-    //double ret_val = total_cost;
-    //total_cost = 0.0f;
-    //return ceil(ret_val);
+    if (nextDay == false) {
+        qDebug() << "GetCostFromDuration(): Valid until:" << end.toString(Qt::ISODate);
+    }
 
-    // TODO: runden nur falls oberster stack-rahmen
-
-    return ceil(costFromDuration);
+    return
+        Ticket(start, end,
+               durationMinutesNetto,
+               start.secsTo(end) / 60,
+               nextDay ?
+                   costFromDuration :
+                   llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
+               Ticket::s[VALID]);
 }
 
 

library/src/ticket.cpp

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

@@ -2,6 +2,7 @@
 #include "tariff_log.h"
 
 #include <QDebug>
+#include <algorithm>
 
 static int protection_counter = 0;
 
@@ -195,6 +196,23 @@ bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTim
 	}
 }
 
+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)
 {
@@ -317,3 +335,41 @@ QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDa
 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

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