Compare commits
	
		
			6 Commits
		
	
	
		
			0.0.2
			...
			moransBran
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 6ea58be34d | |||
| 8a7828c1e6 | |||
| 7bd7f66666 | |||
| 617eee39ed | |||
| 6b3c1cbf0c | |||
| 1142efaec2 | 
@@ -132,6 +132,16 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
				
			|||||||
                                            QDateTime const &start_parking_time,
 | 
					                                            QDateTime const &start_parking_time,
 | 
				
			||||||
                                            double cost,
 | 
					                                            double cost,
 | 
				
			||||||
                                            QDateTime &ticketEndTime);
 | 
					                                            QDateTime &ticketEndTime);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
 | 
				
			||||||
 | 
					                                            parking_tariff_t *tariff,
 | 
				
			||||||
 | 
					                                            QString const &start_parking_time,
 | 
				
			||||||
 | 
					                                            uint8_t paymentMethod);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_24hour_daily_ticket(
 | 
				
			||||||
 | 
					                                            parking_tariff_t *tariff,
 | 
				
			||||||
 | 
					                                            QString const &start_parking_time,
 | 
				
			||||||
 | 
					                                            uint8_t paymentMethod);
 | 
				
			||||||
//#ifdef __cplusplus
 | 
					//#ifdef __cplusplus
 | 
				
			||||||
//} // extern "C"
 | 
					//} // extern "C"
 | 
				
			||||||
//#endif
 | 
					//#endif
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,7 +1,7 @@
 | 
				
			|||||||
#pragma once
 | 
					#pragma once
 | 
				
			||||||
#include <iostream>
 | 
					#include <iostream>
 | 
				
			||||||
#include "configuration.h"
 | 
					#include "configuration.h"
 | 
				
			||||||
 | 
					#include <QDateTime>
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Calculator
 | 
					class Calculator
 | 
				
			||||||
@@ -26,4 +26,10 @@ public:
 | 
				
			|||||||
	/// <param name="durationMin">Duration of parking in minutes</param>
 | 
						/// <param name="durationMin">Duration of parking in minutes</param>
 | 
				
			||||||
	/// <returns>Returns cost (data type: double)</returns>
 | 
						/// <returns>Returns cost (data type: double)</returns>
 | 
				
			||||||
	double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
 | 
						double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, char const* start_datetime, double durationMin, bool nextDay = false, bool prepaid = false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Daily ticket
 | 
				
			||||||
 | 
					    QString GetDailyTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // 24-hour daily ticket
 | 
				
			||||||
 | 
					    QString Get24HourTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option);
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@@ -14,4 +14,6 @@ public:
 | 
				
			|||||||
	double pop_max_time;
 | 
						double pop_max_time;
 | 
				
			||||||
	double pop_min_price;
 | 
						double pop_min_price;
 | 
				
			||||||
	int pop_carry_over;
 | 
						int pop_carry_over;
 | 
				
			||||||
 | 
					    int pop_daily_card_price;
 | 
				
			||||||
 | 
					    int pop_multi_hour_price;
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
@@ -68,5 +68,6 @@ public:
 | 
				
			|||||||
	/// </summary>
 | 
						/// </summary>
 | 
				
			||||||
	/// <param name="pra_price"></param>
 | 
						/// <param name="pra_price"></param>
 | 
				
			||||||
	/// <returns></returns>
 | 
						/// <returns></returns>
 | 
				
			||||||
	static double CalculatePricePerUnit(double pra_price);
 | 
					    static double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
TEMPLATE = lib
 | 
					TEMPLATE = lib
 | 
				
			||||||
TARGET = mobilisis_calc
 | 
					TARGET = mobilisis_calc
 | 
				
			||||||
# CONFIG += staticlib
 | 
					#CONFIG += staticlib
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QMAKE_CXXFLAGS += -std=c++17 -g -O0
 | 
					QMAKE_CXXFLAGS += -std=c++17 -g -O0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,7 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    if(zone > -1) return zone;
 | 
					    if(zone > -1) return zone;
 | 
				
			||||||
    else
 | 
					    else
 | 
				
			||||||
  {
 | 
					    {
 | 
				
			||||||
        QFile zone("/etc/zone_nr");
 | 
					        QFile zone("/etc/zone_nr");
 | 
				
			||||||
        if (zone.exists()) {
 | 
					        if (zone.exists()) {
 | 
				
			||||||
            QFileInfo finfo(zone);
 | 
					            QFileInfo finfo(zone);
 | 
				
			||||||
@@ -26,7 +26,7 @@ int CALCULATE_LIBRARY_API get_zone_nr(int zone)
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
   }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
 | 
					CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
 | 
				
			||||||
@@ -65,7 +65,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    QFile fname(confFile);
 | 
					    QFile fname(confFile);
 | 
				
			||||||
    if (fname.exists() &&
 | 
					    if (fname.exists() &&
 | 
				
			||||||
        fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
 | 
					            fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
 | 
				
			||||||
        // DEBUG
 | 
					        // DEBUG
 | 
				
			||||||
        qCritical() << "      ... confFile is open";
 | 
					        qCritical() << "      ... confFile is open";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -93,10 +93,10 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
					CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			||||||
                                    parking_tariff_t *tariff,
 | 
					        parking_tariff_t *tariff,
 | 
				
			||||||
                                    time_t start_parking_time, // in minutes
 | 
					        time_t start_parking_time, // in minutes
 | 
				
			||||||
                                    time_t end_parking_time,   // in minutes
 | 
					        time_t end_parking_time,   // in minutes
 | 
				
			||||||
                                    struct price_t *price) {
 | 
					        struct price_t *price) {
 | 
				
			||||||
    CalcState calcState;
 | 
					    CalcState calcState;
 | 
				
			||||||
    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
 | 
					    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
 | 
				
			||||||
    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 | 
					    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 | 
				
			||||||
@@ -109,7 +109,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
    int const duration = end_parking_time - start_parking_time;
 | 
					    int const duration = end_parking_time - start_parking_time;
 | 
				
			||||||
    if (duration < 0) {
 | 
					    if (duration < 0) {
 | 
				
			||||||
        calcState.setDesc(QString("end=%1, start=%2")
 | 
					        calcState.setDesc(QString("end=%1, start=%2")
 | 
				
			||||||
                            .arg(end_parking_time, start_parking_time));
 | 
					                          .arg(end_parking_time, start_parking_time));
 | 
				
			||||||
        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
 | 
					        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (duration > maxMin) {
 | 
					    if (duration > maxMin) {
 | 
				
			||||||
@@ -132,9 +132,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
    if (start.isValid()) {
 | 
					    if (start.isValid()) {
 | 
				
			||||||
        QString cs = start.toString(Qt::ISODate);
 | 
					        QString cs = start.toString(Qt::ISODate);
 | 
				
			||||||
        double cost = calculator.GetCostFromDuration(
 | 
					        double cost = calculator.GetCostFromDuration(
 | 
				
			||||||
                        tariff, PaymentOption::Option1,
 | 
					                    tariff, PaymentOption::Option1,
 | 
				
			||||||
                        cs.toLocal8Bit().constData(),
 | 
					                    cs.toLocal8Bit().constData(),
 | 
				
			||||||
                        duration, false, true);
 | 
					                    duration, false, true);
 | 
				
			||||||
        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
 | 
					        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
 | 
				
			||||||
        if (cost < minCost) {
 | 
					        if (cost < minCost) {
 | 
				
			||||||
            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
 | 
					            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
 | 
				
			||||||
@@ -150,10 +150,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
					CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			||||||
                                            parking_tariff_t *tariff,
 | 
					        parking_tariff_t *tariff,
 | 
				
			||||||
                                            QDateTime const &start_parking_time,
 | 
					        QDateTime const &start_parking_time,
 | 
				
			||||||
                                            QDateTime const &end_parking_time,
 | 
					        QDateTime const &end_parking_time,
 | 
				
			||||||
                                            struct price_t *price) {
 | 
					        struct price_t *price) {
 | 
				
			||||||
    CalcState calcState;
 | 
					    CalcState calcState;
 | 
				
			||||||
    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
 | 
					    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
 | 
				
			||||||
    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 | 
					    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 | 
				
			||||||
@@ -171,8 +171,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    if (duration < 0) {
 | 
					    if (duration < 0) {
 | 
				
			||||||
        calcState.setDesc(QString("end=%1, start=%2")
 | 
					        calcState.setDesc(QString("end=%1, start=%2")
 | 
				
			||||||
                            .arg(end_parking_time.toString(Qt::ISODate),
 | 
					                          .arg(end_parking_time.toString(Qt::ISODate),
 | 
				
			||||||
                                 start_parking_time.toString(Qt::ISODate)));
 | 
					                               start_parking_time.toString(Qt::ISODate)));
 | 
				
			||||||
        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
 | 
					        return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    if (duration > maxMin) {
 | 
					    if (duration > maxMin) {
 | 
				
			||||||
@@ -191,9 +191,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
    if (start_parking_time.isValid()) {
 | 
					    if (start_parking_time.isValid()) {
 | 
				
			||||||
        QString cs = start_parking_time.toString(Qt::ISODate);
 | 
					        QString cs = start_parking_time.toString(Qt::ISODate);
 | 
				
			||||||
        double cost = calculator.GetCostFromDuration(
 | 
					        double cost = calculator.GetCostFromDuration(
 | 
				
			||||||
                        tariff, PaymentOption::Option1,
 | 
					                    tariff, PaymentOption::Option1,
 | 
				
			||||||
                        cs.toLocal8Bit().constData(),
 | 
					                    cs.toLocal8Bit().constData(),
 | 
				
			||||||
                        duration, false, true);
 | 
					                    duration, false, true);
 | 
				
			||||||
        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
 | 
					        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
 | 
				
			||||||
        if (cost < minCost) {
 | 
					        if (cost < minCost) {
 | 
				
			||||||
            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
 | 
					            calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
 | 
				
			||||||
@@ -213,10 +213,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
				
			||||||
                                            parking_tariff_t *tariff,
 | 
					        parking_tariff_t *tariff,
 | 
				
			||||||
                                            time_t start_parking_time,
 | 
					        time_t start_parking_time,
 | 
				
			||||||
                                            double price,
 | 
					        double price,
 | 
				
			||||||
                                            QString &duration) {
 | 
					        QString &duration) {
 | 
				
			||||||
    CalcState calcState;
 | 
					    CalcState calcState;
 | 
				
			||||||
    QDate const d(1970, 1, 1);
 | 
					    QDate const d(1970, 1, 1);
 | 
				
			||||||
    QTime const t(0, 0, 0);
 | 
					    QTime const t(0, 0, 0);
 | 
				
			||||||
@@ -246,17 +246,17 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
				
			||||||
                                            parking_tariff_t *tariff,
 | 
					        parking_tariff_t *tariff,
 | 
				
			||||||
                                            QDateTime const &start_parking_time,
 | 
					        QDateTime const &start_parking_time,
 | 
				
			||||||
                                            double price,
 | 
					        double price,
 | 
				
			||||||
                                            QDateTime &ticketEndTime) {
 | 
					        QDateTime &ticketEndTime) {
 | 
				
			||||||
    CalcState calcState;
 | 
					    CalcState calcState;
 | 
				
			||||||
    if (start_parking_time.isValid()) {
 | 
					    if (start_parking_time.isValid()) {
 | 
				
			||||||
        QString cs = start_parking_time.toString(Qt::ISODate);
 | 
					        QString cs = start_parking_time.toString(Qt::ISODate);
 | 
				
			||||||
        QString endTime = calculator.GetDurationFromCost(
 | 
					        QString endTime = calculator.GetDurationFromCost(
 | 
				
			||||||
                                        tariff, PaymentOption::Option1,
 | 
					                    tariff, PaymentOption::Option1,
 | 
				
			||||||
                                        cs.toLocal8Bit().constData(),
 | 
					                    cs.toLocal8Bit().constData(),
 | 
				
			||||||
                                        price, false, true).c_str();
 | 
					                    price, false, true).c_str();
 | 
				
			||||||
        ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 | 
					        ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // DEBUG
 | 
					        // DEBUG
 | 
				
			||||||
@@ -274,3 +274,22 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    return calcState.set(CalcState::State::SUCCESS);
 | 
					    return calcState.set(CalcState::State::SUCCESS);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QString const &start_parking_time,uint8_t paymentMethod)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    CalcState calcState;
 | 
				
			||||||
 | 
					    QString result = calculator.GetDailyTicketDuration(tariff, start_parking_time, PaymentOption::Option1,false);
 | 
				
			||||||
 | 
					    qDebug() << "DailyTicket() => " + result;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return calcState.set(CalcState::State::SUCCESS);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					CalcState CALCULATE_LIBRARY_API compute_duration_for_24hour_daily_ticket(parking_tariff_t *tariff, QString const &start_parking_time,uint8_t paymentMethod)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    CalcState calcState;
 | 
				
			||||||
 | 
					    QString result = calculator.Get24HourTicketDuration(tariff, start_parking_time, PaymentOption::Option1,false);
 | 
				
			||||||
 | 
					    qDebug() << "24HourDailyTicket() => " + result;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return calcState.set(CalcState::State::SUCCESS);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,6 +10,7 @@
 | 
				
			|||||||
double total_duration_min = 0.0f;
 | 
					double total_duration_min = 0.0f;
 | 
				
			||||||
double total_cost = 0.0f;
 | 
					double total_cost = 0.0f;
 | 
				
			||||||
bool overtime = false;
 | 
					bool overtime = false;
 | 
				
			||||||
 | 
					int protection_counter = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef _WIN32
 | 
					#ifdef _WIN32
 | 
				
			||||||
inline struct tm* localtime_r(const time_t *clock, struct tm* result){
 | 
					inline struct tm* localtime_r(const time_t *clock, struct tm* result){
 | 
				
			||||||
@@ -19,6 +20,127 @@ inline struct tm* localtime_r(const time_t *clock, struct tm* result){
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Calculator::Get24HourTicketDuration(Configuration *cfg, QString start_datetime, uint8_t payment_option)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					     if(start_datetime.isNull() || start_datetime.isEmpty()) return "Invalid date-time";
 | 
				
			||||||
 | 
					      protection_counter = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      double day_price = 0.0f;
 | 
				
			||||||
 | 
					      int current_special_day_id = -1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      QDateTime inputDateTime = QDateTime::fromString(start_datetime, Qt::ISODate);
 | 
				
			||||||
 | 
					      QTime worktime_from;
 | 
				
			||||||
 | 
					      QTime worktime_to;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      int daily_24hour_card_price = cfg->PaymentOption.find(payment_option)->second.pop_multi_hour_price;
 | 
				
			||||||
 | 
					      if(daily_24hour_card_price <= 0) return "24-hour daily ticket: price zero or less";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toStdString().c_str(), ¤t_special_day_id, &day_price);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      if(is_special_day)
 | 
				
			||||||
 | 
					      {
 | 
				
			||||||
 | 
					          worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str(), Qt::ISODate);
 | 
				
			||||||
 | 
					          worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str(),Qt::ISODate);
 | 
				
			||||||
 | 
					          return "24-hour ticket cannot be bought on special day";
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      // Check next special day
 | 
				
			||||||
 | 
					      inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					      while(Utilities::CheckSpecialDay(cfg, inputDateTime.toString(Qt::ISODate).toLocal8Bit(), ¤t_special_day_id, &day_price))
 | 
				
			||||||
 | 
					      {
 | 
				
			||||||
 | 
					         protection_counter++;
 | 
				
			||||||
 | 
					         if(protection_counter >=7) return NULL;
 | 
				
			||||||
 | 
					         inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      return inputDateTime.toString(Qt::ISODate) + ", price = " + to_string(daily_24hour_card_price).c_str();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString Calculator::GetDailyTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    if(start_datetime.isNull() || start_datetime.isEmpty()) return NULL;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    double day_price = 0.0f;
 | 
				
			||||||
 | 
					    int current_special_day_id = -1;
 | 
				
			||||||
 | 
					    bool is_special_day = Utilities::CheckSpecialDay(cfg, start_datetime.toStdString().c_str(), ¤t_special_day_id, &day_price);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    QDateTime inputDateTime = QDateTime::fromString(start_datetime, Qt::ISODate);
 | 
				
			||||||
 | 
					    QTime worktime_from;
 | 
				
			||||||
 | 
					    QTime worktime_to;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    int daily_card_price = cfg->PaymentOption.find(payment_option)->second.pop_daily_card_price;
 | 
				
			||||||
 | 
					    if(daily_card_price <= 0) return "Daily ticket price zero or less";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if(is_special_day)
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str(), Qt::ISODate);
 | 
				
			||||||
 | 
					        worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str(),Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if(inputDateTime.time() < worktime_from) inputDateTime.setTime(worktime_from);
 | 
				
			||||||
 | 
					        if(carry_over) inputDateTime.setTime(worktime_from);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if(inputDateTime.time() >= worktime_to)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            // Go to next day if outside worktime
 | 
				
			||||||
 | 
					            inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if(day_price <=0)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            // Go to next day if special day price is 0
 | 
				
			||||||
 | 
					            inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int diff = abs(inputDateTime.time().secsTo(worktime_to));
 | 
				
			||||||
 | 
					        inputDateTime = inputDateTime.addSecs(diff);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
 | 
				
			||||||
 | 
					        return inputDateTime.toString(Qt::ISODate) + ", price = " + to_string(daily_card_price).c_str() + ", duration = " + to_string((diff/60)).c_str();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        // Get day of week
 | 
				
			||||||
 | 
					        int weekdayId = 0;
 | 
				
			||||||
 | 
					        weekdayId = Utilities::ZellersAlgorithm(inputDateTime.date().day(),inputDateTime.date().month(),inputDateTime.date().year());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // If no working day found, skip it (recursively call method again)
 | 
				
			||||||
 | 
					        size_t found = 0;
 | 
				
			||||||
 | 
					        found = cfg->WeekDaysWorktime.count(weekdayId);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // When no workday found, go to next available day
 | 
				
			||||||
 | 
					        if(found <=0)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					            return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        else
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str(),Qt::ISODate);
 | 
				
			||||||
 | 
					            worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str(),Qt::ISODate);
 | 
				
			||||||
 | 
					            if(inputDateTime.time() < worktime_from)
 | 
				
			||||||
 | 
					                inputDateTime.setTime(worktime_from);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if(carry_over)
 | 
				
			||||||
 | 
					                inputDateTime.setTime(worktime_from);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            if(inputDateTime.time() >= worktime_to)
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                // Go to next day if outside worktime
 | 
				
			||||||
 | 
					                inputDateTime = inputDateTime.addSecs(86400);
 | 
				
			||||||
 | 
					                return GetDailyTicketDuration(cfg,inputDateTime.toString(Qt::ISODate), payment_option,true);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            int diff = abs(inputDateTime.time().secsTo(worktime_to));
 | 
				
			||||||
 | 
					            inputDateTime = inputDateTime.addSecs(diff);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            //qDebug() << "Ticket is valid until: " << inputDateTime.toString(Qt::ISODate) << "price = " << daily_card_price << ", duration = " << diff / 60;
 | 
				
			||||||
 | 
					            return inputDateTime.toString(Qt::ISODate) + ", price = " + to_string(daily_card_price).c_str() + ", duration = " + to_string((diff/60)).c_str();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    return NULL;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
/// <inheritdoc/>
 | 
					/// <inheritdoc/>
 | 
				
			||||||
std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
					std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			||||||
                                            uint8_t payment_option,
 | 
					                                            uint8_t payment_option,
 | 
				
			||||||
@@ -27,6 +149,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			|||||||
                                            bool nextDay,
 | 
					                                            bool nextDay,
 | 
				
			||||||
                                            bool prepaid)
 | 
					                                            bool prepaid)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // Get input date
 | 
					    // Get input date
 | 
				
			||||||
    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 | 
					    QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -43,6 +166,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    double min_price = 0;
 | 
					    double min_price = 0;
 | 
				
			||||||
    min_price = cfg->PaymentOption.find(payment_option)->second.pop_min_price;
 | 
					    min_price = cfg->PaymentOption.find(payment_option)->second.pop_min_price;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if(price < min_price)
 | 
					    if(price < min_price)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        return "PARKING NOT ALLOWED";
 | 
					        return "PARKING NOT ALLOWED";
 | 
				
			||||||
@@ -90,8 +214,12 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			|||||||
    else
 | 
					    else
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        // Set new price for the normal day
 | 
					        // Set new price for the normal day
 | 
				
			||||||
        day_price = cfg->PaymentRate.find(payment_option)->second.pra_price;
 | 
					        int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
 | 
				
			||||||
        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
 | 
					        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
 | 
				
			||||||
 | 
					        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
 | 
				
			||||||
 | 
					        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // If no working day found, skip it (recursively call method again)
 | 
					        // If no working day found, skip it (recursively call method again)
 | 
				
			||||||
        size_t found = 0;
 | 
					        size_t found = 0;
 | 
				
			||||||
@@ -109,6 +237,11 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (price_per_unit < 0) price_per_unit = 1.0f;
 | 
					    if (price_per_unit < 0) price_per_unit = 1.0f;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // Commented on 07.06.2023
 | 
				
			||||||
 | 
					    //if((price/price_per_unit) < minMin)
 | 
				
			||||||
 | 
					    //   return "PARKING NOT ALLOWED";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
 | 
					    LOG_DEBUG("Calculated price per minute: ", price_per_unit);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (price_per_unit < 0)
 | 
					    if (price_per_unit < 0)
 | 
				
			||||||
@@ -151,7 +284,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    while(true)
 | 
					    while(true)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        if(money_left <= 0) break;
 | 
					        if((int)money_left <= 0) break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Check year period
 | 
					        // Check year period
 | 
				
			||||||
        bool isYearPeriodActive = false;
 | 
					        bool isYearPeriodActive = false;
 | 
				
			||||||
@@ -321,8 +454,13 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
 | 
				
			|||||||
    else
 | 
					    else
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        // Set new price for the normal day
 | 
					        // Set new price for the normal day
 | 
				
			||||||
        day_price = cfg->PaymentRate.find(payment_option)->second.pra_price;
 | 
					
 | 
				
			||||||
        price_per_unit = Utilities::CalculatePricePerUnit(day_price);
 | 
					        int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
 | 
				
			||||||
 | 
					        day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
 | 
				
			||||||
 | 
					        double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
 | 
				
			||||||
 | 
					        price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // If no working day found, skip it (recursively call method again)
 | 
					        // If no working day found, skip it (recursively call method again)
 | 
				
			||||||
        size_t found = 0;
 | 
					        size_t found = 0;
 | 
				
			||||||
@@ -417,11 +555,12 @@ double Calculator::GetCostFromDuration(Configuration* cfg, uint8_t payment_optio
 | 
				
			|||||||
            return 0.0f;
 | 
					            return 0.0f;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        int carry_over_status = 0;
 | 
				
			||||||
 | 
					        carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // Go to next day if minutes not spent
 | 
					        // Go to next day if minutes not spent
 | 
				
			||||||
        if(inputDate.time() >= worktime_to)
 | 
					        if(inputDate.time() >= worktime_to)
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            int carry_over_status = 0;
 | 
					 | 
				
			||||||
            carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
 | 
					 | 
				
			||||||
            if (carry_over_status < 1) break;
 | 
					            if (carry_over_status < 1) break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            LOG_DEBUG("Reached end of worktime, searching for the next working day");
 | 
					            LOG_DEBUG("Reached end of worktime, searching for the next working day");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -154,6 +154,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 | 
				
			|||||||
						else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
 | 
											else if (strcmp(inner_obj_name, "pop_max_time") == 0) PaymentOption.pop_max_time = k->value.GetDouble();
 | 
				
			||||||
						else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 | 
											else if (strcmp(inner_obj_name, "pop_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 | 
				
			||||||
						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
 | 
											else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
 | 
				
			||||||
 | 
					                        else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
 | 
				
			||||||
 | 
					                        else if (strcmp(inner_obj_name, "pop_multi_hour_price") == 0) PaymentOption.pop_multi_hour_price = k->value.GetInt();
 | 
				
			||||||
						break;
 | 
											break;
 | 
				
			||||||
					case MemberType::DurationType:
 | 
										case MemberType::DurationType:
 | 
				
			||||||
						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
 | 
											if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
 | 
				
			||||||
@@ -209,7 +211,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 | 
				
			|||||||
					cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 | 
										cfg->PaymentMethod.insert(pair<int, ATBPaymentMethod>(PaymentMethod.pme_id, PaymentMethod));
 | 
				
			||||||
					break;
 | 
										break;
 | 
				
			||||||
				case MemberType::PaymentRateType:
 | 
									case MemberType::PaymentRateType:
 | 
				
			||||||
					cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_unit_id, PaymentRate));
 | 
					                    cfg->PaymentRate.insert(pair<int, ATBPaymentRate>(PaymentRate.pra_payment_option_id, PaymentRate));
 | 
				
			||||||
					break;
 | 
										break;
 | 
				
			||||||
				case MemberType::PaymentOptionType:
 | 
									case MemberType::PaymentOptionType:
 | 
				
			||||||
					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
 | 
										cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,12 +8,15 @@ static int protection_counter = 0;
 | 
				
			|||||||
/// </summary>
 | 
					/// </summary>
 | 
				
			||||||
/// <param name="pra_price"></param>
 | 
					/// <param name="pra_price"></param>
 | 
				
			||||||
/// <returns></returns>
 | 
					/// <returns></returns>
 | 
				
			||||||
double Utilities::CalculatePricePerUnit(double pra_price)
 | 
					double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	try
 | 
						try
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		double price_per_unit = pra_price;
 | 
							double price_per_unit = pra_price;
 | 
				
			||||||
		price_per_unit /= 60.0f; // Divided by 60 because price per unit is set per hour and we are using minutes
 | 
					        double unit = durationUnit;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        if(unit < 0 || unit > 65535 ) unit = 60.0f;
 | 
				
			||||||
 | 
					        price_per_unit /= unit; // Divided by 60 because price per unit is set per hour and we are using minutes
 | 
				
			||||||
		//printf("Price per unit (min) is: %lf\n", price_per_unit);
 | 
							//printf("Price per unit (min) is: %lf\n", price_per_unit);
 | 
				
			||||||
		return price_per_unit;
 | 
							return price_per_unit;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										182
									
								
								main/main.cpp
									
									
									
									
									
								
							
							
						
						
									
										182
									
								
								main/main.cpp
									
									
									
									
									
								
							@@ -1,10 +1,9 @@
 | 
				
			|||||||
#include <calculate_price.h>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#ifdef WIN32
 | 
					#ifdef WIN32
 | 
				
			||||||
#include <time.h>
 | 
					#include <time.h>
 | 
				
			||||||
#include <iomanip>
 | 
					#include <iomanip>
 | 
				
			||||||
#include <sstream>
 | 
					#include <sstream>
 | 
				
			||||||
 | 
					#include <calculate_price.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern "C" char* strptime(const char* s,
 | 
					extern "C" char* strptime(const char* s,
 | 
				
			||||||
                          const char* f,
 | 
					                          const char* f,
 | 
				
			||||||
@@ -27,95 +26,102 @@ extern "C" char* strptime(const char* s,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#include <QDebug>
 | 
					#include <QDebug>
 | 
				
			||||||
#include <QDateTime>
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					 | 
				
			||||||
int main() {
 | 
					int main() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    parking_tariff_t *tariff = 0;
 | 
					    parking_tariff_t *tariff = 0;
 | 
				
			||||||
    if (init_tariff(&tariff, "C:\\Users\\MROD\\Documents\\QtCreator\\build-MOBILISIS-Calculator-Desktop_Qt_5_12_12_MSVC2017_32bit-Debug\\main\\etc\\psa_tariff\\zone1.json")) {
 | 
					    if (init_tariff(&tariff, "C:\\Users\\MROD\\Documents\\QtCreator\\Old\\build-MOBILISIS-Calculator-Desktop_Qt_5_12_12_MSVC2017_32bit-Debug\\main\\etc\\psa_tariff\\tariff01.json"))
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
        struct price_t price;
 | 
					        struct price_t price;
 | 
				
			||||||
        memset(&price, 0x00, sizeof(price));
 | 
					        memset(&price, 0x00, sizeof(price));
 | 
				
			||||||
        QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();
 | 
					        QDateTime start = QDateTime::fromString("2023-06-01T07:50:00.000Z",Qt::ISODate); //QDateTime::currentDateTime();
 | 
				
			||||||
        time_t start_parking_time = start.toSecsSinceEpoch() / 60;
 | 
					        time_t start_parking_time = start.toSecsSinceEpoch() / 60;
 | 
				
			||||||
        time_t end_parking_time = start_parking_time + 610;
 | 
					        time_t end_parking_time = start_parking_time + 1230;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (compute_price_for_parking_ticket(tariff,
 | 
					//        if (compute_price_for_parking_ticket(tariff,
 | 
				
			||||||
                                             start_parking_time,
 | 
					//                                             start_parking_time,
 | 
				
			||||||
                                             end_parking_time,
 | 
					//                                             end_parking_time,
 | 
				
			||||||
                                             &price)) {
 | 
					//                                             &price))
 | 
				
			||||||
            qDebug() << "GetCostFromDuration() => price=" << price.netto;
 | 
					//        {
 | 
				
			||||||
        }
 | 
					//            qDebug() << "GetCostFromDuration() => price=" << price.netto;
 | 
				
			||||||
 | 
					 | 
				
			||||||
        QString duration;
 | 
					 | 
				
			||||||
        if(compute_duration_for_parking_ticket(tariff,start_parking_time,1525,duration))
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            qDebug() << "GetDurationFromCost() => duration=" << duration;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//        // tests
 | 
					 | 
				
			||||||
//        struct tm now;
 | 
					 | 
				
			||||||
//        memset(&now, 0, sizeof(now));
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//        // 3.Jan 2023 -> Tuesday
 | 
					 | 
				
			||||||
//        strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
					 | 
				
			||||||
//        for (int i = 0; i < 600; ++i) {
 | 
					 | 
				
			||||||
//            start_parking_time = mktime(&now);
 | 
					 | 
				
			||||||
//            end_parking_time = start_parking_time + 240; // duration == 240
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//            if (compute_price_for_parking_ticket(tariff,
 | 
					 | 
				
			||||||
//                                                 start_parking_time,
 | 
					 | 
				
			||||||
//                                                 end_parking_time,
 | 
					 | 
				
			||||||
//                                                 &price)) {
 | 
					 | 
				
			||||||
//                int const zone = get_zone_nr(1);
 | 
					 | 
				
			||||||
//                switch (zone) {
 | 
					 | 
				
			||||||
//                case 1:
 | 
					 | 
				
			||||||
//                    assert(price.netto == 879);    // expected value: 880
 | 
					 | 
				
			||||||
//                    break;
 | 
					 | 
				
			||||||
//                case 2:
 | 
					 | 
				
			||||||
//                    /* fall through */
 | 
					 | 
				
			||||||
//                case 3:
 | 
					 | 
				
			||||||
//                    assert(price.netto == 1920);
 | 
					 | 
				
			||||||
//                    break;
 | 
					 | 
				
			||||||
//                }
 | 
					 | 
				
			||||||
//            }
 | 
					 | 
				
			||||||
//            time_t t = start_parking_time + 60;
 | 
					 | 
				
			||||||
//            now = *localtime(&t);
 | 
					 | 
				
			||||||
//        }
 | 
					//        }
 | 
				
			||||||
//        //
 | 
					 | 
				
			||||||
//        // test May 1st 2023
 | 
					 | 
				
			||||||
//        //
 | 
					 | 
				
			||||||
//        memset(&now, 0, sizeof(now));
 | 
					 | 
				
			||||||
//        strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
					 | 
				
			||||||
//        now.tm_hour -= 1; // for ctime
 | 
					 | 
				
			||||||
//        // for (int i=0; i<6*24; ++i) {
 | 
					 | 
				
			||||||
//        for (int i=0; i<1; ++i) {
 | 
					 | 
				
			||||||
//            int const duration = 120;
 | 
					 | 
				
			||||||
//            time_t t = mktime(&now);
 | 
					 | 
				
			||||||
//            start_parking_time = t / 60;
 | 
					 | 
				
			||||||
//            end_parking_time = start_parking_time + duration;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
//            if (compute_price_for_parking_ticket(tariff,
 | 
					//        QString duration;
 | 
				
			||||||
//                                                 start_parking_time,
 | 
					//        if(compute_duration_for_parking_ticket(tariff,start_parking_time,1650,duration))
 | 
				
			||||||
//                                                 end_parking_time,
 | 
					//        {
 | 
				
			||||||
//                                                 &price)) {
 | 
					//            qDebug() << "GetDurationFromCost() => duration=" << duration;
 | 
				
			||||||
//                int const zone = get_zone_nr();
 | 
					 | 
				
			||||||
//                switch (zone) {
 | 
					 | 
				
			||||||
//                case 1:
 | 
					 | 
				
			||||||
//                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
 | 
					 | 
				
			||||||
//                    assert(price.netto == 440);
 | 
					 | 
				
			||||||
//                    break;
 | 
					 | 
				
			||||||
//                case 2:
 | 
					 | 
				
			||||||
//                    /* fall through */
 | 
					 | 
				
			||||||
//                case 3:
 | 
					 | 
				
			||||||
//                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
 | 
					 | 
				
			||||||
//                    assert(price.netto == 960);
 | 
					 | 
				
			||||||
//                    break;
 | 
					 | 
				
			||||||
//                }
 | 
					 | 
				
			||||||
//            }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
//            t = (start_parking_time + 60)*60;
 | 
					 | 
				
			||||||
//            now = *localtime(&t);
 | 
					 | 
				
			||||||
//        }
 | 
					//        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        // Daily ticket
 | 
				
			||||||
 | 
					//        compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            compute_duration_for_24hour_daily_ticket(tariff,start.toString(Qt::ISODate),3);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
 | 
				
			||||||
 | 
					        //        // tests
 | 
				
			||||||
 | 
					        //        struct tm now;
 | 
				
			||||||
 | 
					        //        memset(&now, 0, sizeof(now));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //        // 3.Jan 2023 -> Tuesday
 | 
				
			||||||
 | 
					        //        strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
				
			||||||
 | 
					        //        for (int i = 0; i < 600; ++i) {
 | 
				
			||||||
 | 
					        //            start_parking_time = mktime(&now);
 | 
				
			||||||
 | 
					        //            end_parking_time = start_parking_time + 240; // duration == 240
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //            if (compute_price_for_parking_ticket(tariff,
 | 
				
			||||||
 | 
					        //                                                 start_parking_time,
 | 
				
			||||||
 | 
					        //                                                 end_parking_time,
 | 
				
			||||||
 | 
					        //                                                 &price)) {
 | 
				
			||||||
 | 
					        //                int const zone = get_zone_nr(1);
 | 
				
			||||||
 | 
					        //                switch (zone) {
 | 
				
			||||||
 | 
					        //                case 1:
 | 
				
			||||||
 | 
					        //                    assert(price.netto == 879);    // expected value: 880
 | 
				
			||||||
 | 
					        //                    break;
 | 
				
			||||||
 | 
					        //                case 2:
 | 
				
			||||||
 | 
					        //                    /* fall through */
 | 
				
			||||||
 | 
					        //                case 3:
 | 
				
			||||||
 | 
					        //                    assert(price.netto == 1920);
 | 
				
			||||||
 | 
					        //                    break;
 | 
				
			||||||
 | 
					        //                }
 | 
				
			||||||
 | 
					        //            }
 | 
				
			||||||
 | 
					        //            time_t t = start_parking_time + 60;
 | 
				
			||||||
 | 
					        //            now = *localtime(&t);
 | 
				
			||||||
 | 
					        //        }
 | 
				
			||||||
 | 
					        //        //
 | 
				
			||||||
 | 
					        //        // test May 1st 2023
 | 
				
			||||||
 | 
					        //        //
 | 
				
			||||||
 | 
					        //        memset(&now, 0, sizeof(now));
 | 
				
			||||||
 | 
					        //        strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
				
			||||||
 | 
					        //        now.tm_hour -= 1; // for ctime
 | 
				
			||||||
 | 
					        //        // for (int i=0; i<6*24; ++i) {
 | 
				
			||||||
 | 
					        //        for (int i=0; i<1; ++i) {
 | 
				
			||||||
 | 
					        //            int const duration = 120;
 | 
				
			||||||
 | 
					        //            time_t t = mktime(&now);
 | 
				
			||||||
 | 
					        //            start_parking_time = t / 60;
 | 
				
			||||||
 | 
					        //            end_parking_time = start_parking_time + duration;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //            if (compute_price_for_parking_ticket(tariff,
 | 
				
			||||||
 | 
					        //                                                 start_parking_time,
 | 
				
			||||||
 | 
					        //                                                 end_parking_time,
 | 
				
			||||||
 | 
					        //                                                 &price)) {
 | 
				
			||||||
 | 
					        //                int const zone = get_zone_nr();
 | 
				
			||||||
 | 
					        //                switch (zone) {
 | 
				
			||||||
 | 
					        //                case 1:
 | 
				
			||||||
 | 
					        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
 | 
				
			||||||
 | 
					        //                    assert(price.netto == 440);
 | 
				
			||||||
 | 
					        //                    break;
 | 
				
			||||||
 | 
					        //                case 2:
 | 
				
			||||||
 | 
					        //                    /* fall through */
 | 
				
			||||||
 | 
					        //                case 3:
 | 
				
			||||||
 | 
					        //                    qDebug() << i << zone << ctime(&t) << price.netto << " FT";
 | 
				
			||||||
 | 
					        //                    assert(price.netto == 960);
 | 
				
			||||||
 | 
					        //                    break;
 | 
				
			||||||
 | 
					        //                }
 | 
				
			||||||
 | 
					        //            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        //            t = (start_parking_time + 60)*60;
 | 
				
			||||||
 | 
					        //            now = *localtime(&t);
 | 
				
			||||||
 | 
					        //        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        free_tariff(tariff);
 | 
					        free_tariff(tariff);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -151,7 +157,7 @@ int main() {
 | 
				
			|||||||
            struct tm now; // = Utilities::DateTimeToStructTm("2023-03-01T16:00:00");
 | 
					            struct tm now; // = Utilities::DateTimeToStructTm("2023-03-01T16:00:00");
 | 
				
			||||||
            memset(&now, 0, sizeof(now));
 | 
					            memset(&now, 0, sizeof(now));
 | 
				
			||||||
            char buffer[64];
 | 
					            char buffer[64];
 | 
				
			||||||
//#if 0
 | 
					            //#if 0
 | 
				
			||||||
            // 3.Jan 2023 -> Tuesday
 | 
					            // 3.Jan 2023 -> Tuesday
 | 
				
			||||||
            strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
					            strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
 | 
				
			||||||
            for (int i = 0; i < 600; ++i) {
 | 
					            for (int i = 0; i < 600; ++i) {
 | 
				
			||||||
@@ -226,8 +232,8 @@ int main() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                int const duration = 120;
 | 
					                int const duration = 120;
 | 
				
			||||||
                double cost = calculator.GetCostFromDuration(&cfg,
 | 
					                double cost = calculator.GetCostFromDuration(&cfg,
 | 
				
			||||||
                                PaymentOption::Option1, buffer, duration,
 | 
					                                                             PaymentOption::Option1, buffer, duration,
 | 
				
			||||||
                                false, true);
 | 
					                                                             false, true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                switch (zone) {
 | 
					                switch (zone) {
 | 
				
			||||||
                case 1:
 | 
					                case 1:
 | 
				
			||||||
@@ -265,8 +271,8 @@ int main() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                int const duration = 120;
 | 
					                int const duration = 120;
 | 
				
			||||||
                double cost = calculator.GetCostFromDuration(&cfg,
 | 
					                double cost = calculator.GetCostFromDuration(&cfg,
 | 
				
			||||||
                                PaymentOption::Option1, buffer, duration,
 | 
					                                                             PaymentOption::Option1, buffer, duration,
 | 
				
			||||||
                                false, true);
 | 
					                                                             false, true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                switch (zone) {
 | 
					                switch (zone) {
 | 
				
			||||||
                case 1:
 | 
					                case 1:
 | 
				
			||||||
@@ -299,8 +305,8 @@ int main() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
                double const compCost = (duration < 15) ? 0 : duration * ((zone == 1) ? 3.6666 : 8.0);
 | 
					                double const compCost = (duration < 15) ? 0 : duration * ((zone == 1) ? 3.6666 : 8.0);
 | 
				
			||||||
                double cost = calculator.GetCostFromDuration(&cfg,
 | 
					                double cost = calculator.GetCostFromDuration(&cfg,
 | 
				
			||||||
                                PaymentOption::Option1, buffer, duration,
 | 
					                                                             PaymentOption::Option1, buffer, duration,
 | 
				
			||||||
                                false, true);
 | 
					                                                             false, true);
 | 
				
			||||||
                if (fabs(cost - compCost) > 1.0) { // zone 1 has rounding errors
 | 
					                if (fabs(cost - compCost) > 1.0) { // zone 1 has rounding errors
 | 
				
			||||||
                    cout << "ERROR ===> [" << i << "] " << asctime(&now)
 | 
					                    cout << "ERROR ===> [" << i << "] " << asctime(&now)
 | 
				
			||||||
                         << " - Total cost is: " << cost << " FT (computed="
 | 
					                         << " - Total cost is: " << cost << " FT (computed="
 | 
				
			||||||
 
 | 
				
			|||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
		Reference in New Issue
	
	Block a user