Merge branch 'moransBranch'

library/src/calculate_price.cpp

@@ -233,7 +233,7 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
-        QDateTime d = QDateTime::fromString(duration);
+        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
             return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);

library/src/calculator_functions.cpp

@@ -225,7 +225,7 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
 
     if (calc_price > 0 && total_duration_min > 0)
     {
-        inputDate.addSecs(-(int)ceil(calc_price) * 60);
+        inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
     }
 
     if(price >= min_price && total_duration_min >= minMin)

main/main.cpp

@@ -27,11 +27,45 @@ extern "C" char* strptime(const char* s,
 
 #include <QDebug>
 #include <QDateTime>
+#include <QDir>
+
+#include <fstream>
+#include <sstream>
+#include "calculator_functions.h"
 
 int main() {
 
+    std::ifstream input(QDir::homePath().append("/tariff01.json").toStdString());
+    std::stringstream sstr;
+    while(input >> sstr.rdbuf());
+    std::string json(sstr.str());
+
+    Calculator calculator;
+    Configuration cfg;
+
+    bool isParsed = cfg.ParseJson(&cfg, json.c_str());
+    cout << endl;
+
+    char const *startDate = "";
+
+    if (isParsed)
+    {
+        startDate = "2023-05-10T13:52:18.665Z";
+        std::string duration = calculator.GetDurationFromCost(&cfg, 3, (char *)startDate, 33, false, true);
+        cout << "---> startDate " << startDate << " _price_ = " << 33
+             << " Total duration is: " << duration << endl;
+    }
+
+    return 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, "/etc/psa_tariff/")) {      
         struct price_t price;
         memset(&price, 0x00, sizeof(price));
         QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();

main/main.pro

@@ -7,6 +7,8 @@ QMAKE_CFLAGS = -c -pipe -std=c11 -g -O0 -Wall -Wno-attributes -W -DDEBUG -D_REEN
 QMAKE_CXX_FLAGS += -std=c11
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/mobilisis/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/rapidjson/
+INCLUDEPATH += $$_PRO_FILE_PWD_/../../MOBILISIS-Calculator/library/include/
 INCLUDEPATH += .
 
 unix {