24-hour ticket

library/include/mobilisis/atb_project.h

@@ -1,13 +0,0 @@
-#ifndef ATB_PROJECT_H_INCLUDED
-#define ATB_PROJECT_H_INCLUDED
-
-#include <QString>
-
-class ATBProject {
-  public:
-    QString project;
-    QString version;
-    QString info;
-};
-
-#endif // ATB_PROJECT_H_INCLUDED

library/include/mobilisis/calculate_price.h

@@ -109,9 +109,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff,
 void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff);
 int CALCULATE_LIBRARY_API get_zone_nr(int zone = -1);
 
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown);
+CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
-
-CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // deprecated
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             time_t end_parking_time,
@@ -120,11 +118,10 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(       // depre
 CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
-                                            int netto_parking_time,
+                                            QDateTime const &end_parking_time,
-                                            QDateTime &end_parking_time,    // return value
+                                            struct price_t *price);
-                                            struct price_t *price);         // return value
 
-CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(        // deprecated
+CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             time_t start_parking_time,
                                             double cost,
@@ -134,12 +131,17 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
                                             parking_tariff_t *tariff,
                                             QDateTime const &start_parking_time,
                                             double cost,
-                                            QDateTime &ticketEndTime);      // return value
+                                            QDateTime &ticketEndTime);
 
 CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(
                                             parking_tariff_t *tariff,
-                                            QDateTime const &start_parking_time,
+                                            QString const &start_parking_time,
-                                            QDateTime &ticketEndTime);
+                                            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,21 +1,12 @@
-#ifndef CALCULATOR_FUNCTIONS_H_INCLUDED
+#pragma once
-#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;
 
 class Calculator
 {
 public:
-
 	/// <summary>
 	/// Gets duration in seconds from cost
 	/// </summary>
@@ -32,68 +23,13 @@ public:
 	/// <param name="tariff_cfg">Pointer to configuration</param>
 	/// <param name="vehicle_type">Type of vehicle</param>
 	/// <param name="start_datetime">Date/time of payment to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
-    /// <param name="end_datetime">Date/time of park end to be conducted in ISO8601 format (e.g. 2022-12-25T08:00:00Z) </param>
 	/// <param name="durationMin">Duration of parking in minutes</param>
 	/// <returns>Returns cost (data type: double)</returns>
-    double GetCostFromDuration(Configuration* cfg, uint8_t vehicle_type, const QDateTime start_datetime, QDateTime & end_datetime, int 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
-    QDateTime GetDailyTicketDuration(Configuration* cfg, const QDateTime start_datetime, uint8_t payment_option, bool carry_over);
+    QString GetDailyTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over);
 
-    //
+    // 24-hour daily ticket
-    // helper function to find time steps for a tariff with PaymentMethod::Steps
+    QString Get24HourTicketDuration(Configuration* cfg, QString start_datetime, uint8_t payment_option);
-    // (e.g. Schoenau/Koenigsee)
-    //
-    QList<int> GetTimeSteps(Configuration *cfg) const;
-    QList<int> GetSteps(Configuration *cfg) const { return GetTimeSteps(cfg); }
-
-    // additional helper functions
-    bool noSpecialDays(Configuration const *cfg) const {
-        return (cfg->SpecialDays.size() == 0) && (cfg->SpecialDaysWorktime.size() == 0);
-    }
-    bool specialDays(Configuration const *cfg) const {
-        return !noSpecialDays(cfg);
-    }
-    bool tariffIs24_7(Configuration const *cfg) const {
-        return (cfg->YearPeriod.size() == 0 &&
-                cfg->SpecialDays.size() == 0 &&
-                cfg->SpecialDaysWorktime.size() == 0);
-    }
-
-private:
-    // Introduced for PaymentMethod::Steps (e.g. Schoenau)
-    // For tariff of following structure: only steps, no special days, nonstop.
-    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
-    uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
-
-    Ticket private_GetCostFromDuration(Configuration const* cfg,
-                                       QDateTime const &start,
-                                       int durationMinutes,
-                                       bool prepaid = false);
-    Ticket private_GetDurationFromCost(Configuration *cfg,
-                                       QDateTime const &start,
-                                       uint32_t price,
-                                       bool prepaid = false);
-
-    bool checkDurationMinutes(int minParkingTime, int maxParkingTime,
-                              int durationMinutes);
-
-    //
-    uint32_t GetPriceForTimeStep(Configuration *cfg, int timeStep) const;
-    uint32_t GetPriceForStep(Configuration *cfg, int step) const {
-        return GetPriceForTimeStep(cfg, step);
-    }
-    uint32_t GetDurationForPrice(Configuration *cfg, int price) const;
-    uint32_t GetStepForPrice(Configuration *cfg, int price) const {
-        return GetDurationForPrice(cfg, price);
-    }
-
-    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/configuration.h

@@ -20,7 +20,6 @@
 #include "member_type.h"
 #include "period_year.h"
 #include "payment_rate.h"
-#include "atb_project.h"
 
 using namespace std;
 using namespace rapidjson;
@@ -28,7 +27,7 @@ using namespace rapidjson;
 class Configuration
 {
 public:
-    ATBProject project;
+
 	ATBCurrency Currency;
 	ATBDuration duration;
 
@@ -49,8 +48,6 @@ public:
 	/// <returns>Returns operation status bool (OK | FAIL) </returns>
 	bool ParseJson(Configuration* cfg, const char* json);
 
-    ATBPaymentOption const & getPaymentOptions();
-
 private:
 	/// <summary>
 	/// Identify type of JSON member
@@ -58,6 +55,4 @@ private:
 	/// <param name="member_name"></param>
 	/// <returns></returns>
 	MemberType IdentifyJsonMember(const char* member_name);
-
-    ATBPaymentOption currentPaymentOptions;
 };

library/include/mobilisis/day_of_week.h

@@ -2,12 +2,12 @@
 
 enum DayOfWeek
 {
-    Monday = 0x01,
+	Saturday = 0x06,
+	Sunday = 0x01,
+	Monday = 0x02,
 	Tuesday = 0x02,
 	Wednesday = 0x03,
 	Thursday = 0x04,
 	Friday = 0x05,
-    Saturday = 0x06,
-    Sunday = 0x07,
 	UndefinedDay = 0xFF
 };

library/include/mobilisis/payment_method.h

@@ -1,12 +1,10 @@
-#ifndef PAYMENT_METHOD_H_INCLUDED
+#pragma once
-#define PAYMENT_METHOD_H_INCLUDED
 
-enum PaymentMethod {
+enum PaymentMethod
+{
 	Undefined = 0xFF,
 	Progressive = 0x01,
 	Degressive = 0x02,
 	Linear = 0x03,
 	Steps = 0x04
 };
-
-#endif // PAYMENT_METHOD_H_INCLUDED

library/include/mobilisis/payment_opt.h

@@ -4,8 +4,6 @@
 class ATBPaymentOption
 {
 public:
-    ATBPaymentOption() = default;
-
 	int pop_id;
 	std::string pop_label;
 	int pop_payment_method_id;
@@ -17,5 +15,5 @@ public:
 	double pop_min_price;
 	int pop_carry_over;
     int pop_daily_card_price;
-    int pop_business_hours;
+    int pop_multi_hour_price;
 };

library/include/mobilisis/tariff_business_hours.h

@@ -1,21 +0,0 @@
-#ifndef TARIFF_BUSINESS_HOURS_H_INCLUDED
-#define TARIFF_BUSINESS_HOURS_H_INCLUDED
-
-/// <summary>
-/// Business hours (byte represents payment option id)
-/// </summary>
-enum BusinessHours
-{
-    NoRestriction_24_7          = 0,
-    OnlyWorkingDays             = 1,    // [Monday-Friday]
-    OnlyWeekDays                = 2,    // [Monday-Saturday]
-    OnlyWeekEnd                 = 4,    // [Saturday+Sunday]
-    OnlyOfficialHolidays        = 8,
-    OnlySpecialDays             = 16,
-    OnlySchoolHolidays          = 32,
-    SpecialAndSchoolHolidays    = 48,
-    OnlyOpenForBusinessDays     = 64,   // verkaufsoffen
-    NoBusinessHoursDefined      = 255
-};
-
-#endif // TARIFF_BUSINESS_HOURS_H_INCLUDED

library/include/mobilisis/tariff_time_range.h

@@ -1,34 +1,17 @@
+// #pragma once
 #ifndef TARIFF_TIME_RANGE_H_INCLUDED
 #define TARIFF_TIME_RANGE_H_INCLUDED
 
-#include <QTime>
+#include <ctime>
 
 /// <summary>
 /// Time range definition
 /// </summary>
 class TariffTimeRange {
-    QTime m_time_from;
-    QTime m_time_until;
-
 public:
-
+	time_t time_from;
-    TariffTimeRange()
+    time_t time_to;
-    : m_time_from(QTime())
+    TariffTimeRange() : time_from(0), time_to(0) {}
-    , m_time_until(QTime()) {}
-
-    TariffTimeRange(QTime const& from, QTime const &until)
-      : m_time_from(from)
-      , m_time_until(until) {
-
-    }
-
-    void setTimeRange(QTime const& from, QTime const &until) {
-        m_time_from = from;
-        m_time_until = until;
-    }
-
-    QTime const &getTimeFrom() const { return m_time_from; }
-    QTime const &getTimeUntil() const { return m_time_until; }
 };
 
 #endif // TARIFF_TIME_RANGE_H_INCLUDED

library/include/mobilisis/ticket.h

@@ -1,66 +0,0 @@
-#ifndef TICKET_H_INCLUDED
-#define TICKET_H_INCLUDED
-
-#include <tuple>
-#include <vector>
-
-#include <QDebug>
-#include <QDebugStateSaver>
-#include <QStringList>
-#include <QDateTime>
-
-#define NOT_INITIALIZED         (0)
-#define VALID                   (1)
-#define INVALID_FROM_DATETIME   (2)
-#define INVALID_UNTIL_DATETIME  (3)
-#define INVALID_PRICE           (4)
-#define STATUS_END              (5)
-
-class Ticket {
-    enum {CODE=0, CODE_STR=1, CODE_DESC=3};
-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();
-
-    Status getStatus() const;
-    QDateTime getValidFrom() const;
-    QDateTime getValidUntil() const;
-    uint32_t getPrice() const;
-
-    Status setStatus(Status status);
-    void setValidFrom(QDateTime const &validFrom);
-    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"  },
-        {INVALID_PRICE         , "INVALID_PRICE"         , "PARKING NOT ALLOWED: Ticket has invalid price" }
-    };
-
-private:
-    Status m_status;
-
-    QDateTime m_validFrom;
-    QDateTime m_validUntil;
-    
-    int m_durationMinutesNetto;
-    int m_durationMinutesBrutto;
-
-    uint32_t m_price;
-};
-    
-QDebug operator<<(QDebug debug, Ticket::Status const &status);
-
-#endif // TICKET_H_INCLUDED

library/include/mobilisis/utilities.h

@@ -1,5 +1,6 @@
 #pragma once
 #include <cstring>
+#include <string.h>
 #include <ctime>
 #include <iostream>
 #include <cmath>
@@ -7,49 +8,47 @@
 #include "day_of_week.h"
 #include "configuration.h"
 #include "time_range.h"
-#include "payment_method.h"
-#include "tariff_business_hours.h"
-
-#include <QDateTime>
 
 using namespace std;
 
-namespace Utilities {
+class Utilities {
+public:
+
 	/// <summary>
 	/// Get day of week from current date (Zeller's Algorithm), starting day is Sunday
 	/// </summary>
 	/// <param name="date"></param>
 	/// <returns></returns>
-	DayOfWeek GetDayOfWeek(struct tm* tm);
+	static DayOfWeek GetDayOfWeek(struct tm* tm);
 
 	/// <summary>
 	/// Date and time parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	struct tm DateTimeToStructTm(const char* dateTimeStr);
+	static struct tm DateTimeToStructTm(const char* dateTimeStr);
 
 	/// <summary>
 	/// Date parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	struct tm DateToStructTm(const char* dateStr);
+	static struct tm DateToStructTm(const char* dateStr);
 
 	/// <summary>
 	/// Time parse helper function
 	/// </summary>
 	/// <returns>Returns time (tm) structure</returns>
-	struct tm TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday);
+	static struct tm TimeToStructTm(const char* timeStr, int year, int mon, int mday, int wday);
 
 	/// <summary>
 	/// Get current local time
 	/// </summary>
 	/// <returns>Returns time_t structure</returns>
-	time_t GetCurrentLocalTime();
+	static time_t GetCurrentLocalTime();
 
 	/// <summary>
 	/// Zeller's algorithm for determining day of week
 	/// </summary>
-	int ZellersAlgorithm(int day, int month, int year);
+	static int ZellersAlgorithm(int day, int month, int year);
 
 	/// <summary>
 	///  Checks if current datetime is in range between start and end month of parking worktime
@@ -57,37 +56,18 @@ namespace Utilities {
 	/// <param name="tariff_cfg"></param>
 	/// <param name="currentDateTime"></param>
 	/// <returns></returns>
-	bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
+	static bool IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTime);
-    bool IsYearPeriodActive(Configuration const *cfg, QDateTime const &currentDateTime);
 
 	/// <summary>
 	/// Check permissions
 	/// </summary>
-	bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
+	static bool CheckSpecialDay(Configuration* cfg, const char* currentDateTimeStr, int* specialDayId, double* specialDayPrice);
-	bool CheckSpecialDay(Configuration const *cfg,
-						 QDateTime const &currentDateTimeS,
-						 int* specialDayId, uint32_t *specialDayPrice);
 
 	/// <summary>
 	/// Calculates price per unit
 	/// </summary>
 	/// <param name="pra_price"></param>
 	/// <returns></returns>
-	double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
+    static double CalculatePricePerUnit(double pra_price, double durationUnit = -1);
 
-    QTime SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId);
+};
-    QTime SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId);
-    QTime WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    QTime WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr);
-    bool isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId);
-    bool isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId);
-    PaymentMethod getPaymentMethodId(Configuration const *cfg);
-
-    int getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId);
-    int getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId);
-    uint32_t getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId);
-    uint32_t getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId);
-    BusinessHours getBusinessHours(Configuration const *cfg, PaymentMethod methodId);
-    uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id);
-    double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id);
-}

library/library.pro

@@ -2,7 +2,7 @@ TEMPLATE = lib
 TARGET = mobilisis_calc
 #CONFIG += staticlib
 
-QMAKE_CXXFLAGS += -std=c++17 -g -O
+QMAKE_CXXFLAGS += -std=c++17 -g -O0
 
 INCLUDEPATH += $$_PRO_FILE_PWD_/include
 INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
@@ -25,8 +25,7 @@ SOURCES += \
     src/utilities.cpp \
     src/configuration.cpp \
     src/tariff_log.cpp \
-    src/calculate_price.cpp \
+    src/calculate_price.cpp
-    src/ticket.cpp
 
 HEADERS += \
 	include/mobilisis/calculator_functions.h \
@@ -66,10 +65,7 @@ HEADERS += \
     include/mobilisis/tariff_period_year.h \
     include/mobilisis/tariff_payment_rate.h \
     include/mobilisis/tariff_log.h \
-    include/mobilisis/calculate_price.h \
+    include/mobilisis/calculate_price.h
-    include/mobilisis/atb_project.h \
-    include/mobilisis/ticket.h \
-    include/mobilisis/tariff_business_hours.h
 
 OTHER_FILES += src/main.cpp
 

library/src/calculate_price.cpp

@@ -2,7 +2,6 @@
 #include "configuration.h"
 #include "calculator_functions.h"
 #include "payment_option.h"
-#include "utilities.h"
 
 #include <QFile>
 #include <QFileInfo>
@@ -93,107 +92,14 @@ void CALCULATE_LIBRARY_API free_tariff(parking_tariff_t *tariff) {
     }
 }
 
-//
-// UpDown 1 -> up; 0 -> down
-int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int currentTimeMinutes, int UpDown)
-{
-    qCritical() << "   compute_next_timestep()  currentTimeMinutes: " << currentTimeMinutes;
-    Configuration const *cfg = tariff;
-
-    // compute payment method id (e.g. Linear=3, Steps=4)
-    PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg);
-    switch (paymentMethodId) {
-    case PaymentMethod::Progressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Progressive";
-        break;
-    case PaymentMethod::Degressive:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Degressive";
-        break;
-    case PaymentMethod::Linear:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Linear";
-        break;
-    case PaymentMethod::Steps:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Steps";
-        break;
-    case PaymentMethod::Undefined:
-        qCritical() << "   compute_next_timestep()     paymentMethodId: Undefined";
-        break;
-    }
-
-    // use tariff with structure as for instance Schnau, Koenigsee:
-    // without given YearPeriod, SpecialDays and SpecialDaysWorktime
-    if (paymentMethodId == PaymentMethod::Steps)
-    {
-        static const QList<int> stepList = calculator.GetTimeSteps(tariff);
-
-        int currentStepIndex = stepList.indexOf(currentTimeMinutes);
-
-        if (currentStepIndex == -1) {
-            qCritical() << "compute_next_timestep() *NO STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-            return  currentTimeMinutes;
-        }
-
-        if (UpDown == 1) { // UP
-            if (stepList[currentStepIndex] == stepList.last()) {
-                qCritical() << "compute_next_timestep() *NO NEXT STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-                return  currentTimeMinutes;
-            }
-            else {
-                return stepList[currentStepIndex + 1];
-            }
-        }
-        if (UpDown == 0) { // DOWN
-            if (stepList[currentStepIndex] == stepList.first()) {
-                qCritical() << "compute_next_timestep() *NO PREVIOUS STEP* for currentTimeMinutes (" << currentTimeMinutes << ")";
-                return  currentTimeMinutes;
-            }
-            else {
-                return stepList[currentStepIndex - 1];
-            }
-        }
-    } else
-    if (paymentMethodId == PaymentMethod::Linear) {
-
-        // currentTimeMinutes is the number of minutes actually used. This
-        // value is an offset from the start time and cannot be used as a
-        // QDateTime.
-
-        qCritical() << "compute_next_timestep() up/down (1=up, 0=down):" << UpDown;
-
-        // get minimal and maximal parking times
-        int const minParkingTime = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
-        int const maxParkingTime = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
-
-        qCritical() << "        compute_next_timestep() maxParkingTime:" << maxParkingTime;
-        qCritical() << "        compute_next_timestep() minParkingTime:" << minParkingTime;
-
-        // use the first (i.e. main duration step contained in the tariff json-file)
-        int firstDurationStep = Utilities::getFirstDurationStep(cfg, paymentMethodId);
-        firstDurationStep = ((UpDown == 1) ? firstDurationStep : -firstDurationStep);
-
-        qCritical() << "     compute_next_timestep() firstDurationStep:" << firstDurationStep;
-
-        int const nextTimeStep = currentTimeMinutes + firstDurationStep;
-
-        if (nextTimeStep >= minParkingTime && nextTimeStep <= maxParkingTime) {
-            qCritical() << "          compute_next_timestep() nextTimeStep:" << nextTimeStep;
-            return nextTimeStep;
-        }
-    }
-
-    qCritical() << "compute_next_timestep() *CAN NOT COMPUTE* for currentTimeMinutes (" << currentTimeMinutes << ")";
-    return  currentTimeMinutes;
-}
-
-// this is currently not used
 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,   // netto time in minutes
+        time_t end_parking_time,   // in minutes
         struct price_t *price) {
     CalcState calcState;
-    double minMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_time;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_max_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 
     if (minMin < 0 || maxMin < 0 || maxMin < minMin) {
         calcState.setDesc(QString("minMin=%1, maxMin=%2").arg(minMin).arg(maxMin));
@@ -223,15 +129,13 @@ CalcState CALCULATE_LIBRARY_API compute_price_for_parking_ticket(
     QTime const t(0, 0, 0);
     QDateTime start(d, t, Qt::UTC);
     start = start.toLocalTime().addSecs(start_parking_time * 60);
-    QDateTime end(start);
     if (start.isValid()) {
+        QString cs = start.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                    tariff,
+                    tariff, PaymentOption::Option1,
-                    tariff->getPaymentOptions().pop_payment_method_id,
+                    cs.toLocal8Bit().constData(),
-                    start,
-                    end,
                     duration, false, true);
-        double minCost = tariff->PaymentOption.find(tariff->getPaymentOptions().pop_payment_method_id)->second.pop_min_price;
+        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));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -248,50 +152,49 @@ 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,
-        int netto_parking_time,
+        QDateTime const &end_parking_time,
-        QDateTime &end_parking_time,
+        struct price_t *price) {
-        struct price_t *price)
-{
     CalcState calcState;
-    double minMin = tariff->getPaymentOptions().pop_min_time;
+    double minMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_time;
-    double maxMin = tariff->getPaymentOptions().pop_max_time;
+    double maxMin = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_max_time;
 
     // DEBUG
     qCritical() << "compute_price_for_parking_ticket() " << endl
                 << "          start_parking_time: " << start_parking_time << endl
-                << "          netto_parking_time: " << netto_parking_time << endl
+                << "            end_parking_time: " << end_parking_time   << endl
                 << "                      minMin: " << minMin << endl
                 << "                      maxMin: " << maxMin;
 
 
-    if (netto_parking_time < 0) {
+    int const duration = (end_parking_time.toSecsSinceEpoch() -
+                          start_parking_time.toSecsSinceEpoch()) / 60;
+
+    if (duration < 0) {
         calcState.setDesc(QString("end=%1, start=%2")
                           .arg(end_parking_time.toString(Qt::ISODate),
                                start_parking_time.toString(Qt::ISODate)));
         return calcState.set(CalcState::State::NEGATIVE_PARING_TIME);
     }
-    if (netto_parking_time > maxMin) {
+    if (duration > maxMin) {
-        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(netto_parking_time).arg(maxMin));
+        calcState.setDesc(QString("duration=%1, maxMin=%2").arg(duration, maxMin));
         return calcState.set(CalcState::State::ABOVE_MAX_PARKING_TIME);
     }
-    if (netto_parking_time < minMin) {
+    if (duration < minMin) {
-        calcState.setDesc(QString("duration=%1, minMin=%2").arg(netto_parking_time).arg(minMin));
+        calcState.setDesc(QString("duration=%1, minMin=%2").arg(duration, minMin));
         return calcState.set(CalcState::State::BELOW_MIN_PARKING_TIME);
     }
-    if (netto_parking_time == 0) {
+    if (duration == 0) {
         memset(price, 0x00, sizeof(*price));
         return calcState.set(CalcState::State::SUCCESS);
     }
 
     if (start_parking_time.isValid()) {
+        QString cs = start_parking_time.toString(Qt::ISODate);
         double cost = calculator.GetCostFromDuration(
-                        tariff,
+                    tariff, PaymentOption::Option1,
-                        tariff->getPaymentOptions().pop_payment_method_id,
+                    cs.toLocal8Bit().constData(),
-                        start_parking_time,         // starting time
+                    duration, false, true);
-                        end_parking_time,           // return value: end time
+        double minCost = tariff->PaymentOption.find(PaymentOption::Option1)->second.pop_min_price;
-                        netto_parking_time,         // minutes, netto
-                        false, true);
-        double minCost = tariff->getPaymentOptions().pop_min_price;
         if (cost < minCost) {
             calcState.setDesc(QString("minCost=%1, cost=%2").arg(minCost, cost));
             return calcState.set(CalcState::State::BELOW_MIN_PARKING_PRICE);
@@ -327,11 +230,10 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         qCritical() << "      start (cs): " << cs;
         qCritical() << "           price: " << price;
 
-        duration = calculator.GetDurationFromCost(tariff,
+        duration = calculator.GetDurationFromCost(tariff, PaymentOption::Option1,
-                                                  tariff->getPaymentOptions().pop_payment_method_id,
                                                   cs.toLocal8Bit().constData(),
                                                   price, false, true).c_str();
-        QDateTime d = QDateTime::fromString(duration, Qt::ISODate);
+        QDateTime d = QDateTime::fromString(duration);
         if (!d.isValid()) {
             calcState.setDesc(QString("ticketEndTime=%1").arg(duration));
             return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
@@ -347,14 +249,12 @@ CalcState CALCULATE_LIBRARY_API compute_duration_for_parking_ticket(
         parking_tariff_t *tariff,
         QDateTime const &start_parking_time,
         double price,
-        QDateTime &ticketEndTime)
+        QDateTime &ticketEndTime) {
-{
     CalcState calcState;
     if (start_parking_time.isValid()) {
         QString cs = start_parking_time.toString(Qt::ISODate);
         QString endTime = calculator.GetDurationFromCost(
-                    tariff,
+                    tariff, PaymentOption::Option1,
-                    tariff->getPaymentOptions().pop_payment_method_id,
                     cs.toLocal8Bit().constData(),
                     price, false, true).c_str();
         ticketEndTime = QDateTime::fromString(endTime,Qt::ISODate);
@@ -375,28 +275,20 @@ 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, QDateTime const &start_parking_time, QDateTime &ticketEndTime)
+CalcState CALCULATE_LIBRARY_API compute_duration_for_daily_ticket(parking_tariff_t *tariff, QString const &start_parking_time,uint8_t paymentMethod)
 {
     CalcState calcState;
-    if (start_parking_time.isValid()) {
+    QString result = calculator.GetDailyTicketDuration(tariff, start_parking_time, PaymentOption::Option1,false);
-
+    qDebug() << "DailyTicket() => " + result;
-        ticketEndTime = calculator.GetDailyTicketDuration(tariff,
+
-                                                            start_parking_time,
+    return calcState.set(CalcState::State::SUCCESS);
-                                                            tariff->getPaymentOptions().pop_payment_method_id,
+}
-                                                            false);    // carry over
+
-
+CalcState CALCULATE_LIBRARY_API compute_duration_for_24hour_daily_ticket(parking_tariff_t *tariff, QString const &start_parking_time,uint8_t paymentMethod)
-        // DEBUG
+{
-        qCritical() << "compute_duration_for_daily_ticket(): ";
+    CalcState calcState;
-        qCritical() << "           ticketEndTime: " << ticketEndTime;
+    QString result = calculator.Get24HourTicketDuration(tariff, start_parking_time, PaymentOption::Option1,false);
-
+    qDebug() << "24HourDailyTicket() => " + result;
-        if (!ticketEndTime.isValid()) {
-            calcState.setDesc(QString("ticketEndTime=%1").arg(ticketEndTime.toString(Qt::ISODate)));
-            return calcState.set(CalcState::State::WRONG_ISO_TIME_FORMAT);
-        }
-
-    } else {
-        return calcState.set(CalcState::State::INVALID_START_DATE);
-    }
 
     return calcState.set(CalcState::State::SUCCESS);
 }

library/src/configuration.cpp

@@ -59,9 +59,8 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			|| !document.HasMember("PaymentRate")
 			|| !document.HasMember("Duration")
 			//|| !document.HasMember("WeekDays")
-            //|| !document.HasMember("SpecialDaysWorktime")
+			|| !document.HasMember("SpecialDaysWorktime")
-            //|| !document.HasMember("SpecialDays")
+			|| !document.HasMember("SpecialDays"))
-            )
 		{
 			printf("%s", "Error: not a valid configuration JSON\n");
 			return false;
@@ -78,7 +77,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		ATBWeekDaysWorktime  WeekDaysWorktime;
 		ATBPaymentOption PaymentOption;
 		ATBPeriodYear YearPeriod;
-        MemberType mb_type = MemberType::UnknownType;
+		MemberType mb_type;
 
 		// Get all JSON object members
 		// This code should run only once (to load JSON variables into memory)
@@ -88,26 +87,13 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 			const char* mb_name = i->name.GetString();
             if (mb_name == NULL) continue;
 
-            if (document[mb_name].IsString()) {
+            // if (!document[mb_name].IsArray()) {
-                QString const _mb_name(mb_name);
+                std::string const _mb_name(mb_name);
-                if (_mb_name.startsWith("Project", Qt::CaseInsensitive)) {
+                if (_mb_name == "version" || _mb_name == "project" ||
-                    cfg->project.project = document[mb_name].GetString();
+                    _mb_name == "zone" || _mb_name == "info") {
-                    continue;
-                 }
-                if (_mb_name.startsWith("Version", Qt::CaseInsensitive)) {
-                    cfg->project.version = document[mb_name].GetString();
-                    continue;
-                }
-                if (_mb_name.startsWith("Info", Qt::CaseInsensitive)) {
-                    cfg->project.info = document[mb_name].GetString();
-                    continue;
-                }
-            }
-
-            // ... everything else should be an array
-            if (!document[mb_name].IsArray()) {
                     continue;
                 }
+            // }
 
 			//printf(" -%s\n", mb_name);
 
@@ -169,8 +155,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 						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_business_hours") == 0) PaymentOption.pop_business_hours = k->value.GetInt();
+                        else if (strcmp(inner_obj_name, "pop_multi_hour_price") == 0) PaymentOption.pop_multi_hour_price = k->value.GetInt();
-                        this->currentPaymentOptions = PaymentOption;
 						break;
 					case MemberType::DurationType:
 						if (strcmp(inner_obj_name, "pun_id") == 0) Duration.pun_id = k->value.GetInt();
@@ -261,10 +246,3 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
 		return false;
 	}
 }
-
-
-
-const ATBPaymentOption & Configuration::getPaymentOptions()
-{
-    return this->currentPaymentOptions;
-}

library/src/ticket.cpp

@@ -1,85 +0,0 @@
-#include "ticket.h"
-
-Ticket::Ticket() 
-  : m_status(Ticket::s[NOT_INITIALIZED])
-  , m_validFrom()
-  , m_validUntil()
-  , m_durationMinutesNetto(0)
-  , m_durationMinutesBrutto(0)
-  , m_price() {
-}
-
-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;
-    return old;
-}
-    
-Ticket::Status Ticket::getStatus() const {
-    return m_status;
-}
-    
-void Ticket::setValidFrom(QDateTime const &validFrom) {
-    m_validFrom = validFrom;
-}
-    
-void Ticket::setValidUntil(QDateTime const &validUntil) {
-    m_validUntil = validUntil;
-}
-
-QDateTime Ticket::getValidFrom() const {
-    if (std::get<CODE>(m_status) == VALID) {
-        return m_validFrom;
-    }
-    return QDateTime();
-}
-    
-QDateTime Ticket::getValidUntil() const {
-    if (std::get<CODE>(m_status) == VALID) {
-        return m_validUntil;
-    }
-    return QDateTime();
-}
-
-uint32_t Ticket::getPrice() const {
-    return m_price;
-}
-    
-void Ticket::setPrice(uint32_t price) {
-    m_price = price;
-}
-    
-Ticket::operator QString() {
-    QStringList status;
-    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("**********************");
-
-    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

@@ -1,9 +1,6 @@
 #include "utilities.h"
 #include "tariff_log.h"
 
-#include <QDebug>
-#include <algorithm>
-
 static int protection_counter = 0;
 
 /// <summary>
@@ -196,24 +193,6 @@ bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTim
 	}
 }
 
-bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
-    if ((cfg->YearPeriod.size() > 0) &&
-        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)
 {
@@ -292,138 +271,3 @@ bool Utilities::CheckSpecialDay(Configuration* cfg, const char* currentDateTimeS
 		return false;
 	}
 }
-
-bool Utilities::CheckSpecialDay(Configuration const *cfg,
-                                QDateTime const &currentDateTime,
-                                int* specialDayId,
-                                uint32_t *specialDayPrice) {
-    *specialDayId = -1;
-    *specialDayPrice = 0;
-
-    std::multimap<int, ATBSpecialDays>::const_iterator spec_days_itr;
-
-    for (spec_days_itr = cfg->SpecialDays.cbegin(); spec_days_itr != cfg->SpecialDays.cend(); ++spec_days_itr) {
-        int repeat_every_year = spec_days_itr->second.ped_year;
-        QDate start = QDate::fromString(spec_days_itr->second.ped_date_start.c_str(), Qt::ISODate);
-        QDate end = QDate::fromString(spec_days_itr->second.ped_date_end.c_str(), Qt::ISODate);
-        if (start.isValid() && end.isValid()) {
-            if ((currentDateTime.date().month() >= start.month()) &&
-                (currentDateTime.date().month() <= end.month())) {
-                if ((currentDateTime.date().day() >= start.day()) &&
-                    (currentDateTime.date().day() <= end.day())) {
-                    if (repeat_every_year <= 0) {
-                        if ((currentDateTime.date().year() != start.year()) ||
-                            (currentDateTime.date().year() != end.year())) {
-                            continue;
-                        }
-                    }
-                    qDebug() << "CheckSpecialDay() => SPECIAL DAY";
-                    *specialDayId = spec_days_itr->second.ped_id;
-                    *specialDayPrice = cfg->SpecialDaysWorktime.find(*specialDayId)->second.pedwt_price;
-                    return true;
-                }
-            }
-        }
-    }
-
-    return false;
-}
-
-QTime Utilities::SpecialDaysWorkTimeFrom(Configuration const *cfg, int specialDayId) {
-    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_from.c_str(), Qt::ISODate);
-}
-
-QTime Utilities::SpecialDaysWorkTimeUntil(Configuration const *cfg, int specialDayId) {
-    return QTime::fromString(cfg->SpecialDaysWorktime.find(specialDayId)->second.pedwt_time_to.c_str(), Qt::ISODate);
-}
-
-QTime Utilities::WeekDaysWorkTimeFrom(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
-    return QTime::fromString(itr->second.pwd_time_from.c_str(), Qt::ISODate);
-}
-
-QTime Utilities::WeekDaysWorkTimeUntil(std::multimap<int, ATBWeekDaysWorktime>::const_iterator itr) {
-    return QTime::fromString(itr->second.pwd_time_to.c_str(), Qt::ISODate);
-}
-
-bool Utilities::isCarryOverSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
-    return !isCarryOverNotSet(cfg, paymentMethodId);
-}
-
-bool Utilities::isCarryOverNotSet(Configuration const *cfg, PaymentMethod paymentMethodId) {
-    return (cfg->PaymentOption.find(paymentMethodId)->second.pop_carry_over < 1);
-}
-
-PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
-    if (cfg->PaymentOption.size() != 1) {
-        return PaymentMethod::Undefined;
-    }
-
-    std::multimap<int, ATBPaymentOption>::const_iterator it =
-        cfg->PaymentOption.cbegin();
-
-    switch (it->first) {
-    case PaymentMethod::Linear:
-        return PaymentMethod::Linear;
-    case PaymentMethod::Steps:
-        return PaymentMethod::Steps;
-    case PaymentMethod::Degressive:
-        return PaymentMethod::Degressive;
-    case PaymentMethod::Progressive:
-        return PaymentMethod::Progressive;
-    }
-
-    return PaymentMethod::Undefined;
-}
-
-int Utilities::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
-}
-
-int Utilities::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
-}
-
-uint32_t Utilities::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) {
-    return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0);
-}
-
-uint32_t Utilities::getFirstDurationStep(Configuration const *cfg, PaymentMethod methodId) {
-
-    int const popId = cfg->PaymentOption.find(methodId)->second.pop_id;
-    int const punId = cfg->PaymentRate.find(popId)->second.pra_payment_unit_id;
-    uint32_t const firstDurationStep= cfg->Duration.find(punId)->second.pun_duration;
-
-    qCritical() << "getFirstDurationStep() payment-method-id:" << (int)methodId;
-    qCritical() << "getFirstDurationStep()            pop-id:" << popId;
-    qCritical() << "getFirstDurationStep()            pun-id:" << punId;
-    qCritical() << "getFirstDurationStep()        first-step:" << firstDurationStep;
-
-    return firstDurationStep;
-}
-
-BusinessHours Utilities::getBusinessHours(Configuration const *cfg, PaymentMethod methodId) {
-    int businessHours = cfg->PaymentOption.find(methodId)->second.pop_business_hours;
-    switch (businessHours) {
-    case NoRestriction_24_7: return NoRestriction_24_7;
-    case OnlyWorkingDays: return OnlyWorkingDays;
-    case OnlyWeekDays: return OnlyWeekDays;
-    case OnlyWeekEnd: return OnlyWeekEnd;
-    case OnlyOfficialHolidays: return OnlyOfficialHolidays;
-    case OnlySpecialDays: return OnlySpecialDays;
-    case OnlySchoolHolidays: return OnlySchoolHolidays;
-    case SpecialAndSchoolHolidays: return SpecialAndSchoolHolidays;
-    case OnlyOpenForBusinessDays: return OnlyOpenForBusinessDays;
-    }
-    return NoBusinessHoursDefined;
-}
-
-uint32_t Utilities::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) {
-    int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
-    return cfg->PaymentRate.find(pop_id)->second.pra_price;
-}
-
-double Utilities::computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) {
-    int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
-    int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
-    return (double)(cfg->Duration.find(durationId)->second.pun_duration);
-}

main/main.pro

@@ -7,8 +7,6 @@ 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 {

tariffs/tariff01.json

@@ -1,12 +1,9 @@
 {
-  "Project" :   "Korneuburg",
-  "Version" :   "1.0.0",
-  "Info"    :   "",
   "Currency": [
     {
       "pcu_id": 2,
-      "pcu_sign": "€",
+      "pcu_sign": "Ft",
-      "pcu_major": "EUR",
+      "pcu_major": "HUF",
       "pcu_minor": "",
       "pcu_active": true
     }
@@ -32,30 +29,32 @@
   "PaymentOption": [
     {
       "pop_id": 1049,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone Lila",
       "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
+      "pop_day_end_time": "16:25:00",
-      "pop_day_night_end_time": "00:00:00",
+      "pop_day_night_end_time": "16:25:00",
       "pop_price_night": 0,
-      "pop_min_time": 30,
+      "pop_min_time": 15,
-      "pop_max_time": 180,
+      "pop_max_time": 300,
-      "pop_min_price": 60,
+      "pop_min_price": 0,
       "pop_carry_over": 1,
-      "pop_daily_card_price": 0
+      "pop_daily_card_price": 900,
+	  "pop_multi_hour_price":500
+
     }
   ],
   "PaymentRate": [
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
-      "pra_price": 10
+      "pra_price": 150
     }
   ],
   "Duration": [
     {
       "pun_id": 1,
-      "pun_label": "5 min",
+      "pun_label": "1h",
-      "pun_duration": 5 
+      "pun_duration": 60
     },
     {
       "pun_id": 3,
@@ -74,13 +73,6 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 1,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -88,13 +80,6 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 2,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -102,13 +87,6 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 3,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -116,13 +94,6 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 4,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
     },
     {
@@ -130,21 +101,73 @@
       "pwd_period_week_day_id": 36,
       "pwd_period_day_in_week_id": 5,
       "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "14:00:00",
       "pwd_time_to": "18:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
     },
     {
-      "pwd_id": 626,
+      "pye_id": 9,
-      "pwd_period_week_day_id": 36,
+      "pye_label": "Whole year",
-      "pwd_period_day_in_week_id": 6,
+      "pye_start_month": 1,
-      "pwd_time_from": "08:00:00",
+      "pye_start_day": 1,
-      "pwd_time_to": "12:00:00"
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 10,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 11,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 12,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 13,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 14,
+      "pye_label": "Whole Year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    },
+    {
+      "pye_id": 15,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
     }
   ],
   "SpecialDaysWorktime": [
@@ -364,266 +387,421 @@
       "pedwt_time_from": "00:00:00",
       "pedwt_time_to": "00:00:00",
       "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2260,
+      "pedwt_period_exc_day_id": 2061,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2261,
+      "pedwt_period_exc_day_id": 2062,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2262,
+      "pedwt_period_exc_day_id": 2063,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2263,
+      "pedwt_period_exc_day_id": 2064,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2264,
+      "pedwt_period_exc_day_id": 2065,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2265,
+      "pedwt_period_exc_day_id": 2066,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2266,
+      "pedwt_period_exc_day_id": 2067,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2267,
+      "pedwt_period_exc_day_id": 2068,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2268,
+      "pedwt_period_exc_day_id": 2069,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2269,
+      "pedwt_period_exc_day_id": 2070,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+    {
+      "pedwt_id": 2270,
+      "pedwt_period_exc_day_id": 2071,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
     }
   ],
   "SpecialDays": [
     {
       "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2023-12-08",
+      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2023-12-08",
+      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 13,
-      "ped_label": "Christtag",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2023-12-25",
+      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2023-12-25",
+      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 14,
-      "ped_label": "Stefanitag",
+      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2023-12-26",
+      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2023-12-26",
+      "ped_date_end": "2022-10-23",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2016,
-      "ped_label": "Neujahr",
+      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2024-01-01",
+      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
+      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2024-01-06",
+      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2024-01-06",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2022,
-      "ped_label": "Ostermontag",
+      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-04",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2024-01-04",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 0
     },
     {
       "ped_id": 2024,
-      "ped_label": "Staatsfeiertag",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-05-01",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2024-05-01",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
     },
     {
       "ped_id": 2025,
-      "ped_label": "Christi Himmelfahrt",
+      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-05-09",
+      "ped_date_start": "2023-04-09",
-      "ped_date_end": "2024-05-09",
+      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2023
     },
     {
       "ped_id": 2026,
-      "ped_label": "Pfingst Montag",
+      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2023
     },
     {
       "ped_id": 2027,
-      "ped_label": "Fronleichnam",
+      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-30",
+      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2024-05-30",
+      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2023
     },
     {
       "ped_id": 2028,
-      "ped_label": "Maria Himmelfahrt",
+      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-08-15",
+      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2024-08-15",
+      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
     },
     {
       "ped_id": 2029,
-      "ped_label": "Nationalfeiertag",
+      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-10-26",
+      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2024-10-26",
+      "ped_date_end": "2023-03-15",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2030,
-      "ped_label": "Allerheiligen",
+      "ped_label": "Labour Day",
-      "ped_date_start": "2024-11-01",
+      "ped_date_start": "2023-05-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2023-05-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2031,
-      "ped_label": "Mariae Empfaengnis",
+      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-12",
+      "ped_date_start": "2023-08-20",
-      "ped_date_end": "2024-08-12",
+      "ped_date_end": "2023-08-20",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2032,
-      "ped_label": "Christtag",
+      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-12-25",
+      "ped_date_start": "2023-11-01",
-      "ped_date_end": "2024-12-25",
+      "ped_date_end": "2023-11-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2034,
-      "ped_label": "Stefanitag",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2024-12-26",
+      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-12-26",
+      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2024
     },
     {
       "ped_id": 2035,
-      "ped_label": "Neujahr",
+      "ped_label": "Easter",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0 
+      "ped_year": 2024
     },
     {
       "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
+      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-06-01",
+      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2025-06-01",
+      "ped_date_end": "2024-04-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2037,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2038,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2050,
+      "ped_label": "Uskrs",
+      "ped_date_start": "2023-04-16",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
     {
       "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
+      "ped_label": "Uskrs",
-      "ped_date_start": "2025-06-09",
+      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2025-06-09",
+      "ped_date_end": "2023-04-16",
       "ped_period_special_day_id": 1,
-      "ped_year": 2025
+      "ped_year": 0
     },
     {
       "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-06-19",
+      "ped_date_start": "2022-12-25",
-      "ped_date_end": "2025-06-19",
+      "ped_date_end": "2022-12-25",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 0
     },
     {
       "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-08-15",
+      "ped_date_start": "2022-12-26",
-      "ped_date_end": "2025-08-15",
+      "ped_date_end": "2022-12-26",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
+      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-26",
+      "ped_date_start": "2022-10-23",
-      "ped_date_end": "2025-10-26",
+      "ped_date_end": "2022-10-23",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2055,
-      "ped_label": "Allerheiligen",
+      "ped_label": "Christmas (Sunday)",
-      "ped_date_start": "2025-11-01",
+      "ped_date_start": "2022-12-24",
-      "ped_date_end": "2025-11-01",
+      "ped_date_end": "2022-12-24",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
+      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2025-12-08",
+      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2025-12-08",
+      "ped_date_end": "2022-12-31",
       "ped_period_special_day_id": 1,
       "ped_year": 0
     },
     {
       "ped_id": 2057,
-      "ped_label": "Christtag",
+      "ped_label": "NewYear",
-      "ped_date_start": "2025-12-25",
+      "ped_date_start": "2023-01-01",
-      "ped_date_end": "2025-12-25",
+      "ped_date_end": "2023-01-01",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
       "ped_year": 0
     },
     {
       "ped_id": 2058,
-      "ped_label": "Stefanitag",
+      "ped_label": "Good Friday",
-      "ped_date_start": "2025-12-26",
+      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2025-12-26",
+      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
     },
     {
       "ped_id": 2059,
-      "ped_label": "Neujahr",
+      "ped_label": "Easter Sunday",
-      "ped_date_start": "2026-01-01",
+      "ped_date_start": "2023-04-09",
-      "ped_date_end": "2026-01-01",
+      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
     },
     {
       "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
+      "ped_label": "Easter Monday",
-      "ped_date_start": "2026-01-06",
+      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2026-01-06",
+      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 1,
+      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
-    }
+    },
-  ],
-  "PeriodYear": [
     {
-      "pye_id": 8,
+      "ped_id": 2061,
-      "pye_label": "Whole year",
+      "ped_label": "Whit Sunday",
-      "pye_start_month": 1,
+      "ped_date_start": "2023-05-28",
-      "pye_start_day": 1,
+      "ped_date_end": "2023-05-28",
-      "pye_end_month": 12,
+      "ped_period_special_day_id": 2,
-      "pye_end_day": 31
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2062,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2023-05-29",
+      "ped_date_end": "2023-05-29",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2023
+    },
+    {
+      "ped_id": 2063,
+      "ped_label": "Revolution Day (Hungary)",
+      "ped_date_start": "2023-03-15",
+      "ped_date_end": "2023-03-15",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2023-05-01",
+      "ped_date_end": "2023-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2065,
+      "ped_label": "Saint Stephens Day (Hungary)",
+      "ped_date_start": "2023-08-20",
+      "ped_date_end": "2023-08-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2066,
+      "ped_label": "All Saints Day",
+      "ped_date_start": "2023-11-01",
+      "ped_date_end": "2023-11-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2067,
+      "ped_label": "Good Friday",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2068,
+      "ped_label": "Easter",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2069,
+      "ped_label": "Easter Monday",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2070,
+      "ped_label": "Whit Monday",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
+    },
+    {
+      "ped_id": 2071,
+      "ped_label": "Whit Sunday",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
+      "ped_period_special_day_id": 2,
+      "ped_year": 2024
     }
   ]
 }

tariffs/tariff_new_01.json

@@ -1,805 +0,0 @@
-{
-  "Currency": [
-    {
-      "pcu_id": 2,
-      "pcu_sign": "Ft",
-      "pcu_major": "HUF",
-      "pcu_minor": "",
-      "pcu_active": true
-    }
-  ],
-  "PaymentMethod": [
-    {
-      "pme_id": 1,
-      "pme_label": "progressive"
-    },
-    {
-      "pme_id": 2,
-      "pme_label": "degressive"
-    },
-    {
-      "pme_id": 3,
-      "pme_label": "linear"
-    },
-    {
-      "pme_id": 4,
-      "pme_label": "steps"
-    }
-  ],
-  "PaymentOption": [
-    {
-      "pop_id": 1049,
-      "pop_label": "Zone Lila",
-      "pop_payment_method_id": 3,
-      "pop_day_end_time": "16:25:00",
-      "pop_day_night_end_time": "16:25:00",
-      "pop_price_night": 0,
-      "pop_min_time": 15,
-      "pop_max_time": 300,
-      "pop_min_price": 0,
-      "pop_carry_over": 1,
-      "pop_daily_card_price": 900
-    }
-  ],
-  "PaymentRate": [
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
-      "pra_price": 150
-    }
-  ],
-  "Duration": [
-    {
-      "pun_id": 1,
-      "pun_label": "1h",
-      "pun_duration": 60
-    },
-    {
-      "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
-    },
-    {
-      "pun_id": 4,
-      "pun_label": "1 min",
-      "pun_duration": 1
-    }
-  ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 9,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 10,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 11,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 12,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 13,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 14,
-      "pye_label": "Whole Year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    },
-    {
-      "pye_id": 15,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    }
-  ],
-  "SpecialDaysWorktime": [
-    {
-      "pedwt_id": 2156,
-      "pedwt_period_exc_day_id": 2024,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2158,
-      "pedwt_period_exc_day_id": 2025,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2160,
-      "pedwt_period_exc_day_id": 2026,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2162,
-      "pedwt_period_exc_day_id": 2027,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2164,
-      "pedwt_period_exc_day_id": 2028,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2170,
-      "pedwt_period_exc_day_id": 2030,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2172,
-      "pedwt_period_exc_day_id": 2032,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2174,
-      "pedwt_period_exc_day_id": 11,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2175,
-      "pedwt_period_exc_day_id": 13,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2178,
-      "pedwt_period_exc_day_id": 2022,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2179,
-      "pedwt_period_exc_day_id": 14,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2184,
-      "pedwt_period_exc_day_id": 2021,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2188,
-      "pedwt_period_exc_day_id": 2031,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2189,
-      "pedwt_period_exc_day_id": 2029,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2194,
-      "pedwt_period_exc_day_id": 2034,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2200,
-      "pedwt_period_exc_day_id": 2037,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2202,
-      "pedwt_period_exc_day_id": 2038,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2226,
-      "pedwt_period_exc_day_id": 2016,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2245,
-      "pedwt_period_exc_day_id": 2035,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2246,
-      "pedwt_period_exc_day_id": 2036,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2249,
-      "pedwt_period_exc_day_id": 2050,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2250,
-      "pedwt_period_exc_day_id": 2051,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2251,
-      "pedwt_period_exc_day_id": 2052,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2252,
-      "pedwt_period_exc_day_id": 2053,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2253,
-      "pedwt_period_exc_day_id": 2054,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2254,
-      "pedwt_period_exc_day_id": 2055,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2255,
-      "pedwt_period_exc_day_id": 2056,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2256,
-      "pedwt_period_exc_day_id": 2057,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2257,
-      "pedwt_period_exc_day_id": 2058,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2258,
-      "pedwt_period_exc_day_id": 2059,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2259,
-      "pedwt_period_exc_day_id": 2060,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2260,
-      "pedwt_period_exc_day_id": 2061,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2261,
-      "pedwt_period_exc_day_id": 2062,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2262,
-      "pedwt_period_exc_day_id": 2063,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2263,
-      "pedwt_period_exc_day_id": 2064,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2264,
-      "pedwt_period_exc_day_id": 2065,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2265,
-      "pedwt_period_exc_day_id": 2066,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2266,
-      "pedwt_period_exc_day_id": 2067,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2267,
-      "pedwt_period_exc_day_id": 2068,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2268,
-      "pedwt_period_exc_day_id": 2069,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2269,
-      "pedwt_period_exc_day_id": 2070,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2270,
-      "pedwt_period_exc_day_id": 2071,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    }
-  ],
-  "SpecialDays": [
-    {
-      "ped_id": 2016,
-      "ped_label": "Christmas",
-      "ped_date_start": "2023-12-24",
-      "ped_date_end": "2023-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 11,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "1848 Revolution Memorial Day",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2024,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2025,
-      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2026,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2030,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2027,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2028,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2031,
-      "ped_label": "National Day",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "1956 Revolution Memorial Day",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2032,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2024-12-24",
-      "ped_date_end": "2024-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2024-12-25",
-      "ped_date_end": "2024-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2024-12-26",
-      "ped_date_end": "2024-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2029,
-      "ped_label": "1848 Revolution Memorial Day",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2034,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Easter",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2064,
-      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-06-08",
-      "ped_date_end": "2024-06-08",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2065,
-      "ped_label": "<<<<< Hungary National Day >>>>>",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2023-12-31",
-      "ped_date_end": "2023-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Uskrs",
-      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2023-04-16",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Uskrs",
-      "ped_date_start": "2023-04-16",
-      "ped_date_end": "2023-04-16",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Holiday (Hungary)",
-      "ped_date_start": "2022-12-31",
-      "ped_date_end": "2022-12-31",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2023-04-07",
-      "ped_date_end": "2023-04-07",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
-      "ped_date_start": "2023-04-09",
-      "ped_date_end": "2023-04-09",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2023-04-10",
-      "ped_date_end": "2023-04-10",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2023-05-28",
-      "ped_date_end": "2023-05-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2062,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2023-05-29",
-      "ped_date_end": "2023-05-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2023
-    },
-    {
-      "ped_id": 2063,
-      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2023-03-15",
-      "ped_date_end": "2023-03-15",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2066,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2067,
-      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2068,
-      "ped_label": "Easter",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2069,
-      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2070,
-      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2071,
-      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
-      "ped_period_special_day_id": 2,
-      "ped_year": 2024
-    }
-  ]
-}

test-files/tariff_korneuburg.json

@@ -1,629 +0,0 @@
-{
-  "Project" :   "Korneuburg",
-  "Version" :   "1.0.0",
-  "Info"    :   "",
-  "Currency": [
-    {
-      "pcu_id": 2,
-      "pcu_sign": "€",
-      "pcu_major": "EUR",
-      "pcu_minor": "",
-      "pcu_active": true
-    }
-  ],
-  "PaymentMethod": [
-    {
-      "pme_id": 1,
-      "pme_label": "progressive"
-    },
-    {
-      "pme_id": 2,
-      "pme_label": "degressive"
-    },
-    {
-      "pme_id": 3,
-      "pme_label": "linear"
-    },
-    {
-      "pme_id": 4,
-      "pme_label": "steps"
-    }
-  ],
-  "PaymentOption": [
-    {
-      "pop_id": 1049,
-      "pop_label": "Zone 1",
-      "pop_payment_method_id": 3,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
-      "pop_min_time": 30,
-      "pop_max_time": 180,
-      "pop_min_price": 60,
-      "pop_carry_over": 1,
-      "pop_daily_card_price": 0
-    }
-  ],
-  "PaymentRate": [
-    {
-      "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
-      "pra_price": 10
-    }
-  ],
-  "Duration": [
-    {
-      "pun_id": 1,
-      "pun_label": "5 min",
-      "pun_duration": 5 
-    },
-    {
-      "pun_id": 3,
-      "pun_label": "15 min",
-      "pun_duration": 15
-    },
-    {
-      "pun_id": 4,
-      "pun_label": "1 min",
-      "pun_duration": 1
-    }
-  ],
-  "WeekDaysWorktime": [
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 621,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 1,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 622,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 2,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 623,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 3,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 624,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 4,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    },
-    {
-      "pwd_id": 625,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 5,
-      "pwd_time_from": "14:00:00",
-      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
-    }
-  ],
-  "SpecialDaysWorktime": [
-    {
-      "pedwt_id": 2156,
-      "pedwt_period_exc_day_id": 2024,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2158,
-      "pedwt_period_exc_day_id": 2025,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2160,
-      "pedwt_period_exc_day_id": 2026,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2162,
-      "pedwt_period_exc_day_id": 2027,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2164,
-      "pedwt_period_exc_day_id": 2028,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2170,
-      "pedwt_period_exc_day_id": 2030,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2172,
-      "pedwt_period_exc_day_id": 2032,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2174,
-      "pedwt_period_exc_day_id": 11,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2175,
-      "pedwt_period_exc_day_id": 13,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2178,
-      "pedwt_period_exc_day_id": 2022,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2179,
-      "pedwt_period_exc_day_id": 14,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2184,
-      "pedwt_period_exc_day_id": 2021,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2188,
-      "pedwt_period_exc_day_id": 2031,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2189,
-      "pedwt_period_exc_day_id": 2029,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2194,
-      "pedwt_period_exc_day_id": 2034,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2200,
-      "pedwt_period_exc_day_id": 2037,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2202,
-      "pedwt_period_exc_day_id": 2038,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2226,
-      "pedwt_period_exc_day_id": 2016,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2245,
-      "pedwt_period_exc_day_id": 2035,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2246,
-      "pedwt_period_exc_day_id": 2036,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2249,
-      "pedwt_period_exc_day_id": 2050,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2250,
-      "pedwt_period_exc_day_id": 2051,
-      "pedwt_time_from": "08:00:00",
-      "pedwt_time_to": "16:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2251,
-      "pedwt_period_exc_day_id": 2052,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2252,
-      "pedwt_period_exc_day_id": 2053,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2253,
-      "pedwt_period_exc_day_id": 2054,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2254,
-      "pedwt_period_exc_day_id": 2055,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2255,
-      "pedwt_period_exc_day_id": 2056,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2256,
-      "pedwt_period_exc_day_id": 2057,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2257,
-      "pedwt_period_exc_day_id": 2058,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2258,
-      "pedwt_period_exc_day_id": 2059,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    },
-    {
-      "pedwt_id": 2259,
-      "pedwt_period_exc_day_id": 2060,
-      "pedwt_time_from": "00:00:00",
-      "pedwt_time_to": "00:00:00",
-      "pedwt_price": 0
-    }
-  ],
-  "SpecialDays": [
-    {
-      "ped_id": 11,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2023-12-08",
-      "ped_date_end": "2023-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 13,
-      "ped_label": "Christtag",
-      "ped_date_start": "2023-12-25",
-      "ped_date_end": "2023-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 14,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2023-12-26",
-      "ped_date_end": "2023-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2016,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2021,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2024-01-06",
-      "ped_date_end": "2024-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2022,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2024-01-04",
-      "ped_date_end": "2024-01-04",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2024,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2025,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2024-05-09",
-      "ped_date_end": "2024-05-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2026,
-      "ped_label": "Pfingst Montag",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2027,
-      "ped_label": "Fronleichnam",
-      "ped_date_start": "2024-05-30",
-      "ped_date_end": "2024-05-30",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2024
-    },
-    {
-      "ped_id": 2028,
-      "ped_label": "Maria Himmelfahrt",
-      "ped_date_start": "2024-08-15",
-      "ped_date_end": "2024-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2029,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2024-10-26",
-      "ped_date_end": "2024-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2030,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2031,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2024-08-12",
-      "ped_date_end": "2024-08-12",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2032,
-      "ped_label": "Christtag",
-      "ped_date_start": "2024-12-25",
-      "ped_date_end": "2024-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2034,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2024-12-26",
-      "ped_date_end": "2024-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2035,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0 
-    },
-    {
-      "ped_id": 2036,
-      "ped_label": "Heilig Drei Koenige",
-      "ped_date_start": "2025-06-01",
-      "ped_date_end": "2025-06-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2037,
-      "ped_label": "Ostermontag",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2038,
-      "ped_label": "Staatsfeiertag",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2050,
-      "ped_label": "Christi Himmelfahrt",
-      "ped_date_start": "2025-05-29",
-      "ped_date_end": "2025-05-29",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2051,
-      "ped_label": "Pfingstmontag",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2052,
-      "ped_label": "Fronlaeichnam",
-      "ped_date_start": "2025-06-19",
-      "ped_date_end": "2025-06-19",
-      "ped_period_special_day_id": 1,
-      "ped_year": 2025
-    },
-    {
-      "ped_id": 2053,
-      "ped_label": "Mariae Himmelfahrt",
-      "ped_date_start": "2025-08-15",
-      "ped_date_end": "2025-08-15",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2054,
-      "ped_label": "Nationalfeiertag",
-      "ped_date_start": "2025-10-26",
-      "ped_date_end": "2025-10-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Allerheiligen",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Mariae Empfaengnis",
-      "ped_date_start": "2025-12-08",
-      "ped_date_end": "2025-12-08",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christtag",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Stefanitag",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Neujahr",
-      "ped_date_start": "2026-01-01",
-      "ped_date_end": "2026-01-01",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Heilige Drei Koenige",
-      "ped_date_start": "2026-01-06",
-      "ped_date_end": "2026-01-06",
-      "ped_period_special_day_id": 1,
-      "ped_year": 0
-    }
-  ],
-  "PeriodYear": [
-    {
-      "pye_id": 8,
-      "pye_label": "Whole year",
-      "pye_start_month": 1,
-      "pye_start_day": 1,
-      "pye_end_month": 12,
-      "pye_end_day": 31
-    }
-  ]
-}