24-hour ticket

library/include/mobilisis/calculate_price.h

@@ -107,7 +107,7 @@ struct CALCULATE_LIBRARY_API CalcState {
 CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
                                             char const *config_file);
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
-int CALCULATE_LIBRARY_API get_zone_nr();
+int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
@@ -132,6 +132,16 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             QDateTime const &start_parking_time,
                                             double cost,
                                             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
 //} // extern "C"
 //#endif

library/include/mobilisis/calculator_functions.h

@@ -1,7 +1,7 @@
 #pragma once
 #include <iostream>
 #include "configuration.h"
-
+#include <QDateTime>
 using namespace std;
 
 class Calculator
@@ -26,4 +26,10 @@ public:
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <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);
+
+    // 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);
 };

library/include/mobilisis/payment_opt.h

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

library/include/mobilisis/utilities.h

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

library/library.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = mobilisis_calc
-# CONFIG += staticlib
+#CONFIG += staticlib
 
 QMAKE_CXXFLAGS += -std=c++17 -g -O0
 

library/src/calculate_price.cpp

@@ -10,24 +10,31 @@
 
 static Calculator calculator;
 
-int CALCULATE_LIBRARY_API get_zone_nr() {
-    QFile zone("/etc/zone_nr");
-    if (zone.exists()) {
-        QFileInfo finfo(zone);
-        if (finfo.size() <= 4) { // decimal 000\n
-            if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                QTextStream in(&zone);
-                return in.readLine(100).toInt();
+int CALCULATE_LIBRARY_API get_zone_nr(int zone)
+{
+    if(zone > -1) return zone;
+    else
+    {
+        QFile zone("/etc/zone_nr");
+        if (zone.exists()) {
+            QFileInfo finfo(zone);
+            if (finfo.size() <= 4) { // decimal 000\n
+                if (zone.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                    QTextStream in(&zone);
+                    return in.readLine(100).toInt();
+                }
             }
         }
+        return -1;
     }
-    return -1;
 }
 
 CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char const *config_file) {
     *tariff = new Configuration();
 
     CalcState calcState;
+#if __linux__
+
     int const zone = get_zone_nr();
 
     // DEBUG
@@ -49,13 +56,16 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
     memset(buffer, 0x00, sizeof(buffer));
     snprintf(buffer, sizeof(buffer)-1, "tariff%02d.json", zone);
     confFile += buffer;
+#else // windows
+    QString confFile(config_file);
+#endif
 
     // DEBUG
     qCritical() << "      ... confFile = " << confFile;
 
     QFile fname(confFile);
     if (fname.exists() &&
-        fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            fname.open(QIODevice::ReadOnly | QIODevice::Text)) {
         // DEBUG
         qCritical() << "      ... confFile is open";
 
@@ -83,10 +93,10 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
 }
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                    parking_tariff_t *tariff,
-                                    time_t start_parking_time, // in minutes
-                                    time_t end_parking_time,   // in minutes
-                                    struct price_t *price) {
+        parking_tariff_t *tariff,
+        time_t start_parking_time, // in minutes
+        time_t end_parking_time,   // in minutes
+        struct price_t *price) {
     CalcState calcState;
     double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
     double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
@@ -99,7 +109,7 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     int const duration = end_parking_time - start_parking_time;
     if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
-                            .arg(end_parking_time, start_parking_time));
+                          .arg(end_parking_time, start_parking_time));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
     if (duration > maxMin) {
@@ -122,9 +132,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     if (start.isValid()) {
         QString cs = start.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
-                        cs.toLocal8Bit().constData(),
-                        duration, false, true);
+                    tariff, PaymentOption::Option1,
+                    cs.toLocal8Bit().constData(),
+                    duration, false, true);
         double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost).arg(cost));
@@ -140,10 +150,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-                                            parking_tariff_t *tariff,
-                                            QDateTime const &start_parking_time,
-                                            QDateTime const &end_parking_time,
-                                            struct price_t *price) {
+        parking_tariff_t *tariff,
+        QDateTime const &start_parking_time,
+        QDateTime const &end_parking_time,
+        struct price_t *price) {
     CalcState calcState;
     double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
     double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
@@ -161,8 +171,8 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 
     if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
-                            .arg(end_parking_time.toString(Qt::ISODate),
-                                 start_parking_time.toString(Qt::ISODate)));
+                          .arg(end_parking_time.toString(Qt::ISODate),
+                               start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
     if (duration > maxMin) {
@@ -181,9 +191,9 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                        tariff, PaymentOption::Option1,
-                        cs.toLocal8Bit().constData(),
-                        duration, false, true);
+                    tariff, PaymentOption::Option1,
+                    cs.toLocal8Bit().constData(),
+                    duration, false, true);
         double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
@@ -203,10 +213,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
-                                            parking_tariff_t *tariff,
-                                            time_t start_parking_time,
-                                            double price,
-                                            QString &duration) {
+        parking_tariff_t *tariff,
+        time_t start_parking_time,
+        double price,
+        QString &duration) {
     CalcState calcState;
     QDate const d(1970, 1, 1);
     QTime const t(0, 0, 0);
@@ -236,17 +246,17 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 }
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
-                                            parking_tariff_t *tariff,
-                                            QDateTime const &start_parking_time,
-                                            double price,
-                                            QDateTime &ticketEndTime) {
+        parking_tariff_t *tariff,
+        QDateTime const &start_parking_time,
+        double price,
+        QDateTime &ticketEndTime) {
     CalcState calcState;
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = calculator.GetDurationFromCost(
-                                        tariff, PaymentOption::Option1,
-                                        cs.toLocal8Bit().constData(),
-                                        price, false, true).c_str();
+                    tariff, PaymentOption::Option1,
+                    cs.toLocal8Bit().constData(),
+                    price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
 
         // DEBUG
@@ -264,3 +274,22 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
 
     return calcState.set(CalcState::State::SUCCESS);
 }
+
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, 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);
+}
+

library/src/configuration.cpp

@@ -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_min_price") == 0) PaymentOption.pop_min_price = k->value.GetDouble();
 						else if (strcmp(inner_obj_name, "pop_carry_over") == 0) PaymentOption.pop_carry_over = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pop_daily_card_price") == 0) PaymentOption.pop_daily_card_price = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pop_multi_hour_price") == 0) PaymentOption.pop_multi_hour_price = k->value.GetInt();
 						break;
 					case MemberType::DurationType:
 						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));
 					break;
 				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;
 				case MemberType::PaymentOptionType:
 					cfg->PaymentOption.insert(pair<int, ATBPaymentOption>(PaymentOption.pop_payment_method_id, PaymentOption));

library/src/utilities.cpp

@@ -8,12 +8,15 @@ static int protection_counter = 0;
 /// </summary>
 /// <param name="pra_price"></param>
 /// <returns></returns>
-double Utilities::CalculatePricePerUnit(double pra_price)
+double Utilities::CalculatePricePerUnit(double pra_price, double durationUnit)
 {
 	try
 	{
 		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);
 		return price_per_unit;
 	}
@@ -33,7 +36,7 @@ time_t Utilities::GetCurrentLocalTime()
 		memset(&tm_curr_time, '\0', sizeof(struct tm));
 
 		tm_curr_time = *localtime(&curr_time);
-		curr_time = mktime(&tm_curr_time) - timezone;
+        curr_time = mktime(&tm_curr_time); //- timezone;
 		return curr_time;
 	}
 	catch (...)

main/main.cpp

@@ -1,10 +1,9 @@
-#include <calculate_price.h>
-
-
 #ifdef WIN32
 #include <time.h>
 #include <iomanip>
 #include <sstream>
+#include <calculate_price.h>
+
 
 extern "C" char* strptime(const char* s,
                           const char* f,
@@ -27,88 +26,101 @@ extern "C" char* strptime(const char* s,
 
 #include <QDebug>
 #include <QDateTime>
-
 int main() {
 
     parking_tariff_t *tariff = 0;
-    if (init_tariff(&tariff, "/etc/psa_tariff/")) {
+    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;
         memset(&price, 0x00, sizeof(price));
-        QDateTime start = 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 end_parking_time = start_parking_time + 60;
+        time_t end_parking_time = start_parking_time + 1230;
 
-        if (compute_price_for_parking_ticket(tariff,
-                                             start_parking_time,
-                                             end_parking_time,
-                                             &price)) {
-            qDebug() << "price=" << price.netto;
-        }
+//        if (compute_price_for_parking_ticket(tariff,
+//                                             start_parking_time,
+//                                             end_parking_time,
+//                                             &price))
+//        {
+//            qDebug() << "GetCostFromDuration() => price=" << price.netto;
+//        }
 
-        // tests
-        struct tm now;
-        memset(&now, 0, sizeof(now));
+//        QString duration;
+//        if(compute_duration_for_parking_ticket(tariff,start_parking_time,1650,duration))
+//        {
+//            qDebug() << "GetDurationFromCost() => duration=" << duration;
+//        }
 
-        // 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
+        // Daily ticket
+//        compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
 
-            if (compute_price_for_parking_ticket(tariff,
-                                                 start_parking_time,
-                                                 end_parking_time,
-                                                 &price)) {
-                int const zone = get_zone_nr();
-                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;
+            compute_duration_for_24hour_daily_ticket(tariff,start.toString(Qt::ISODate),3);
 
-            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;
-                }
-            }
+        //Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
+        //        // tests
+        //        struct tm now;
+        //        memset(&now, 0, sizeof(now));
 
-            t = (start_parking_time + 60)*60;
-            now = *localtime(&t);
-        }
+        //        // 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);
     }
@@ -145,7 +157,7 @@ int main() {
             struct tm now; // = Utilities::DateTimeToStructTm("2023-03-01T16:00:00");
             memset(&now, 0, sizeof(now));
             char buffer[64];
-//#if 0
+            //#if 0
             // 3.Jan 2023 -> Tuesday
             strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
             for (int i = 0; i < 600; ++i) {
@@ -220,8 +232,8 @@ int main() {
 
                 int const duration = 120;
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                PaymentOption::Option1, buffer, duration,
-                                false, true);
+                                                             PaymentOption::Option1, buffer, duration,
+                                                             false, true);
 
                 switch (zone) {
                 case 1:
@@ -259,8 +271,8 @@ int main() {
 
                 int const duration = 120;
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                PaymentOption::Option1, buffer, duration,
-                                false, true);
+                                                             PaymentOption::Option1, buffer, duration,
+                                                             false, true);
 
                 switch (zone) {
                 case 1:
@@ -293,8 +305,8 @@ int main() {
 
                 double const compCost = (duration < 15) ? 0 : duration * ((zone == 1) ? 3.6666 : 8.0);
                 double cost = calculator.GetCostFromDuration(&cfg,
-                                PaymentOption::Option1, buffer, duration,
-                                false, true);
+                                                             PaymentOption::Option1, buffer, duration,
+                                                             false, true);
                 if (fabs(cost - compCost) > 1.0) { // zone 1 has rounding errors
                     cout << "ERROR ===> [" << i << "] " << asctime(&now)
                          << " - Total cost is: " << cost << " FT (computed="