Compare commits
37 Commits
4c268e6693
...
neuhauser-
Author | SHA1 | Date | |
---|---|---|---|
d0e0699906 | |||
3006e64b37 | |||
c8218bd7af | |||
ba3dfcd3d6 | |||
c51d350618 | |||
a95a39a557 | |||
67b12f4b33 | |||
60002404da | |||
d4e03a51dd | |||
723b3530cc | |||
63f508fb95 | |||
6e0a74c8cc | |||
d11cffb8bd | |||
15f552a973 | |||
52ad1c3ba8 | |||
43b8a8d3bf | |||
ceef73195d | |||
282a412ef5 | |||
9dcf7a8f30 | |||
4187598edf | |||
88e92dddb9 | |||
0f05a1a784 | |||
2d696941a5 | |||
5598b02816 | |||
548447af1f | |||
b9a7c04db9 | |||
5b8d9c62cc | |||
56e2843ddb | |||
6b76c4c2dd | |||
54e9a0f86d | |||
d7beb3b41b | |||
9d220df52e | |||
de7a63bc2a | |||
73b1c1459e | |||
a599e47a47 | |||
e97ad17b09 | |||
19428ce46c |
@@ -109,6 +109,8 @@ 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( // deprecated
|
||||
parking_tariff_t *tariff,
|
||||
time_t start_parking_time,
|
||||
|
@@ -45,6 +45,20 @@ public:
|
||||
// (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)
|
||||
@@ -52,11 +66,6 @@ private:
|
||||
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, quint64 durationMinutes) const;
|
||||
uint32_t GetCostFromDuration(Configuration *cfg, QDateTime const &start, QDateTime const &end) const;
|
||||
|
||||
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);
|
||||
|
||||
Ticket private_GetCostFromDuration(Configuration const* cfg,
|
||||
QDateTime const &start,
|
||||
int durationMinutes,
|
||||
@@ -71,7 +80,13 @@ private:
|
||||
|
||||
//
|
||||
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,
|
||||
@@ -79,9 +94,6 @@ private:
|
||||
int findNextWorkTimeRange(QDateTime const &dt,
|
||||
QScopedArrayPointer<TariffTimeRange> const &worktime,
|
||||
size_t size);
|
||||
|
||||
uint32_t computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const;
|
||||
double computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const;
|
||||
};
|
||||
|
||||
#endif // CALCULATOR_FUNCTIONS_H_INCLUDED
|
||||
|
@@ -4,6 +4,8 @@
|
||||
class ATBPaymentOption
|
||||
{
|
||||
public:
|
||||
ATBPaymentOption() = default;
|
||||
|
||||
int pop_id;
|
||||
std::string pop_label;
|
||||
int pop_payment_method_id;
|
||||
@@ -15,4 +17,5 @@ public:
|
||||
double pop_min_price;
|
||||
int pop_carry_over;
|
||||
int pop_daily_card_price;
|
||||
int pop_business_hours;
|
||||
};
|
||||
|
21
library/include/mobilisis/tariff_business_hours.h
Normal file
21
library/include/mobilisis/tariff_business_hours.h
Normal file
@@ -0,0 +1,21 @@
|
||||
#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
|
@@ -16,6 +16,12 @@ public:
|
||||
: m_time_from(QTime())
|
||||
, 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;
|
||||
|
@@ -1,6 +1,5 @@
|
||||
#pragma once
|
||||
#include <cstring>
|
||||
#include <string.h>
|
||||
#include <ctime>
|
||||
#include <iostream>
|
||||
#include <cmath>
|
||||
@@ -9,6 +8,7 @@
|
||||
#include "configuration.h"
|
||||
#include "time_range.h"
|
||||
#include "payment_method.h"
|
||||
#include "tariff_business_hours.h"
|
||||
|
||||
#include <QDateTime>
|
||||
|
||||
@@ -82,4 +82,12 @@ namespace Utilities {
|
||||
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);
|
||||
}
|
||||
|
@@ -2,7 +2,7 @@ TEMPLATE = lib
|
||||
TARGET = mobilisis_calc
|
||||
#CONFIG += staticlib
|
||||
|
||||
QMAKE_CXXFLAGS += -std=c++17 -g -O0
|
||||
QMAKE_CXXFLAGS += -std=c++17 -g -O
|
||||
|
||||
INCLUDEPATH += $$_PRO_FILE_PWD_/include
|
||||
INCLUDEPATH += $$_PRO_FILE_PWD_/include/mobilisis
|
||||
@@ -68,7 +68,8 @@ HEADERS += \
|
||||
include/mobilisis/tariff_log.h \
|
||||
include/mobilisis/calculate_price.h \
|
||||
include/mobilisis/atb_project.h \
|
||||
include/mobilisis/ticket.h
|
||||
include/mobilisis/ticket.h \
|
||||
include/mobilisis/tariff_business_hours.h
|
||||
|
||||
OTHER_FILES += src/main.cpp
|
||||
|
||||
|
@@ -2,6 +2,7 @@
|
||||
#include "configuration.h"
|
||||
#include "calculator_functions.h"
|
||||
#include "payment_option.h"
|
||||
#include "utilities.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
@@ -92,6 +93,97 @@ 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(
|
||||
|
@@ -122,235 +122,54 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
||||
bool nextDay,
|
||||
bool prepaid)
|
||||
{
|
||||
Q_UNUSED(payment_option);
|
||||
Q_UNUSED(nextDay);
|
||||
|
||||
// Get input date
|
||||
QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
|
||||
|
||||
// use tariff with structure as for instance Schnau, Koenigsee:
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
if (tariffIs24_7(cfg)) {
|
||||
// use tariff with structure as for instance Schoenau, Koenigsee:
|
||||
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
|
||||
if (cfg->YearPeriod.size() == 0
|
||||
&& cfg->SpecialDays.size() == 0
|
||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||
{
|
||||
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
|
||||
|
||||
return inputDate.toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
} else {
|
||||
QDateTime const &start = QDateTime::fromString(start_datetime, Qt::ISODate);
|
||||
if (Utilities::IsYearPeriodActive(cfg, start)) {
|
||||
if (!prepaid) {
|
||||
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
|
||||
if (businessHours == BusinessHours::OnlyWeekDays) {
|
||||
int const weekdayId = start.date().dayOfWeek();
|
||||
|
||||
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
|
||||
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
|
||||
|
||||
// Get day of week
|
||||
int weekdayId = 0;
|
||||
weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
|
||||
for (WTIterator itr = p.first; itr != p.second; ++itr) {
|
||||
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
|
||||
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
|
||||
QTime const& startTime = start.time();
|
||||
|
||||
//Get min and max time defined in JSON
|
||||
double minMin = 0;
|
||||
minMin = cfg->getPaymentOptions().pop_min_time;
|
||||
|
||||
double maxMin = 0;
|
||||
maxMin = cfg->getPaymentOptions().pop_max_time;
|
||||
|
||||
double min_price = 0;
|
||||
min_price = cfg->getPaymentOptions().pop_min_price;
|
||||
|
||||
if(price < min_price)
|
||||
{
|
||||
return "PARKING NOT ALLOWED";
|
||||
}
|
||||
|
||||
if (minMin < 0) minMin = 0;
|
||||
if (maxMin < 0) maxMin = 0;
|
||||
if (minMin >= maxMin)
|
||||
{
|
||||
LOG_ERROR("Error: min_min cannot be greater or equal to max_min");
|
||||
return "PARKING NOT ALLOWED";
|
||||
}
|
||||
|
||||
if (maxMin <= minMin)
|
||||
{
|
||||
LOG_ERROR("Error: max_min cannot be lower or equal than min_min");
|
||||
return "PARKING NOT ALLOWED";
|
||||
}
|
||||
|
||||
|
||||
// Get payment method
|
||||
uint8_t p_method = PaymentMethod::Undefined;
|
||||
p_method = payment_option;
|
||||
LOG_DEBUG("Payment method id: ", (unsigned)p_method);
|
||||
|
||||
// Check special day
|
||||
double day_price = 0.0f;
|
||||
int current_special_day_id = -1;
|
||||
bool is_special_day = Utilities::CheckSpecialDay(cfg, inputDate.toString(Qt::ISODate).toStdString().c_str(), ¤t_special_day_id, &day_price);
|
||||
LOG_DEBUG("Special day: ", is_special_day);
|
||||
|
||||
double money_left = price;
|
||||
double price_per_unit = 0.0f;
|
||||
|
||||
QTime worktime_from;
|
||||
QTime worktime_to;
|
||||
|
||||
if(is_special_day)
|
||||
{
|
||||
// Set special day price
|
||||
price_per_unit = Utilities::CalculatePricePerUnit(day_price);
|
||||
worktime_from = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_from.c_str());
|
||||
worktime_to = QTime::fromString(cfg->SpecialDaysWorktime.find(current_special_day_id)->second.pedwt_time_to.c_str());
|
||||
}
|
||||
else
|
||||
{
|
||||
// Set new price for the normal day
|
||||
int pop_id = cfg->PaymentOption.find(payment_option)->second.pop_id;
|
||||
day_price = cfg->PaymentRate.find(pop_id)->second.pra_price;
|
||||
|
||||
int durationId = cfg->PaymentRate.find(pop_id)->second.pra_payment_unit_id;
|
||||
double durationUnit = cfg->Duration.find(durationId)->second.pun_duration;
|
||||
price_per_unit = Utilities::CalculatePricePerUnit(day_price,durationUnit);
|
||||
|
||||
// If no working day found, skip it (recursively call method again)
|
||||
size_t found = 0;
|
||||
found = cfg->WeekDaysWorktime.count(weekdayId);
|
||||
|
||||
// When no workday found, go to next available day
|
||||
if(found <=0)
|
||||
{
|
||||
LOG_DEBUG("- No workday found, trying to find next available day");
|
||||
inputDate = inputDate.addDays(1);
|
||||
return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left,true,prepaid);
|
||||
}
|
||||
worktime_from = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_from.c_str());
|
||||
worktime_to = QTime::fromString(cfg->WeekDaysWorktime.find(weekdayId)->second.pwd_time_to.c_str());
|
||||
}
|
||||
|
||||
if (price_per_unit < 0) price_per_unit = 1.0f;
|
||||
|
||||
// if((price/price_per_unit) < minMin) return "PARKING NOT ALLOWED";
|
||||
LOG_DEBUG("Calculated price per minute: ", price_per_unit);
|
||||
|
||||
// If overtime flag is set
|
||||
if (overtime || nextDay)
|
||||
{
|
||||
inputDate.setTime(worktime_from);
|
||||
overtime = false;
|
||||
}
|
||||
|
||||
// Check prepaid
|
||||
if (!prepaid)
|
||||
{
|
||||
if ((inputDate.time() < worktime_from) || (inputDate.time() > worktime_to))
|
||||
{
|
||||
LOG_DEBUG("[STOP] * Ticket is not valid * ");
|
||||
return "PARKING NOT ALLOWED";
|
||||
if (from <= startTime && startTime <= until) {
|
||||
return inputDate.addSecs(GetDurationForPrice(cfg, price) * 60).toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_DEBUG("* PREPAID MODE ACTIVE *");
|
||||
if (inputDate.time() < worktime_from)
|
||||
{
|
||||
inputDate.setTime(worktime_from);
|
||||
}
|
||||
else if(inputDate.time() > worktime_to)
|
||||
{
|
||||
LOG_DEBUG(" *** PREPAID *** Current time is past the time range end, searching for next available day");
|
||||
inputDate = inputDate.addDays(1);
|
||||
return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left, true);
|
||||
}
|
||||
}
|
||||
|
||||
while(true)
|
||||
{
|
||||
if((int)money_left <= 0) break;
|
||||
|
||||
// Check year period
|
||||
bool isYearPeriodActive = false;
|
||||
|
||||
//// Parse input date
|
||||
int dayCurrent = inputDate.date().day();
|
||||
int monthCurrent = inputDate.date().month();
|
||||
|
||||
// Current date time
|
||||
int cdt = (monthCurrent * 100) + dayCurrent;
|
||||
|
||||
multimap<int, ATBPeriodYear>::iterator year_period_itr;
|
||||
for (year_period_itr = cfg->YearPeriod.begin(); year_period_itr != cfg->YearPeriod.end(); ++year_period_itr)
|
||||
{
|
||||
int dStart = year_period_itr->second.pye_start_day;
|
||||
int dEnd = year_period_itr->second.pye_end_day;
|
||||
|
||||
int mStart = year_period_itr->second.pye_start_month;
|
||||
int mEnd = year_period_itr->second.pye_end_month;
|
||||
|
||||
int start = (mStart * 100) + dStart;
|
||||
int end = (mEnd * 100) + dEnd;
|
||||
|
||||
if (cdt >= start && cdt <= end) {
|
||||
isYearPeriodActive = true;
|
||||
break;
|
||||
qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (!isYearPeriodActive)
|
||||
{
|
||||
LOG_DEBUG("Year period is not valid");
|
||||
return "PARKING NOT ALLOWED";
|
||||
}
|
||||
|
||||
if(total_duration_min > maxMin)
|
||||
{
|
||||
total_duration_min = maxMin;
|
||||
break;
|
||||
}
|
||||
Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
|
||||
|
||||
// If reached end of worktime go to next day
|
||||
if(inputDate.time() >= worktime_to)
|
||||
{
|
||||
int carry_over_status = 0;
|
||||
carry_over_status = cfg->PaymentOption.find(payment_option)->second.pop_carry_over;
|
||||
if (carry_over_status < 1) break;
|
||||
// qCritical().noquote() << t;
|
||||
|
||||
inputDate = inputDate.addDays(1);
|
||||
overtime = true;
|
||||
return GetDurationFromCost(cfg, payment_option, inputDate.toString(Qt::ISODate).toStdString().c_str(), money_left ,true, prepaid);
|
||||
}
|
||||
|
||||
if(money_left > 1)
|
||||
inputDate = inputDate.addSecs(60);
|
||||
|
||||
if(price_per_unit > 0) total_duration_min +=1;
|
||||
money_left -= price_per_unit;
|
||||
|
||||
//qDebug() <<"Timestamp:" << inputDate << ", total duration min: " << total_duration_min << ", money left = " << money_left;
|
||||
}
|
||||
|
||||
// if ((total_duration_min < minMin) || (price / price_per_unit) < minMin)
|
||||
// {
|
||||
// LOG_DEBUG("Total duration is lower than min_min");
|
||||
// inputDate.time() = worktime_from;
|
||||
// total_duration_min = 0;
|
||||
// }
|
||||
|
||||
double ret_val = 0;
|
||||
// double calc_price = (int)total_duration_min - (int)price / price_per_unit;
|
||||
|
||||
//if (calc_price > 0 && total_duration_min > 0)
|
||||
//{
|
||||
// inputDate = inputDate.addSecs(-(int)ceil(calc_price) * 60);
|
||||
//}
|
||||
|
||||
if(price >= min_price && total_duration_min >= minMin)
|
||||
qDebug() << "GetDurationFromCost(): Valid until: " << inputDate.toString(Qt::ISODate);
|
||||
else
|
||||
{
|
||||
qDebug() << "Parking not allowed";
|
||||
total_duration_min = 0;
|
||||
}
|
||||
|
||||
ret_val = total_duration_min;
|
||||
if(ret_val < 0) ret_val = 0;
|
||||
qDebug() << "Duration: " << ret_val;
|
||||
if (ret_val <= 0) return "PARKING NOT ALLOWED";
|
||||
|
||||
total_duration_min = 0;
|
||||
return inputDate.toString(Qt::ISODate).toStdString();
|
||||
// TODO: im fehlerfall
|
||||
return t.getValidUntil().toString(Qt::ISODate).toStdString();
|
||||
}
|
||||
|
||||
///////////////////////////////////////
|
||||
@@ -363,9 +182,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
|
||||
quint64 timeStepInMinutes) const {
|
||||
// for instance, a tariff as used in Schoenau, Koenigssee: only steps, no
|
||||
// special days, nonstop.
|
||||
if (cfg->YearPeriod.size() == 0
|
||||
&& cfg->SpecialDays.size() == 0
|
||||
&& cfg->SpecialDaysWorktime.size() == 0) {
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
QDateTime const end = start.addSecs(timeStepInMinutes*60);
|
||||
return GetCostFromDuration(cfg, start, end);
|
||||
}
|
||||
@@ -375,9 +193,8 @@ uint32_t Calculator::GetCostFromDuration(Configuration *cfg,
|
||||
uint32_t Calculator::GetCostFromDuration(Configuration * cfg,
|
||||
QDateTime const &start,
|
||||
QDateTime const &end) const {
|
||||
if (cfg->YearPeriod.size() == 0
|
||||
&& cfg->SpecialDays.size() == 0
|
||||
&& cfg->SpecialDaysWorktime.size() == 0) {
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
int const timeStepInMinutes = start.secsTo(end) / 60;
|
||||
return GetPriceForTimeStep(cfg, timeStepInMinutes);
|
||||
}
|
||||
@@ -397,12 +214,42 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
||||
int durationMinutes,
|
||||
bool nextDay,
|
||||
bool prepaid) {
|
||||
if (cfg->YearPeriod.size() == 0
|
||||
&& cfg->SpecialDays.size() == 0
|
||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||
{
|
||||
Q_UNUSED(payment_option);
|
||||
Q_UNUSED(nextDay);
|
||||
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
if (paymentMethodId == PaymentMethod::Steps) {
|
||||
if (tariffIs24_7(cfg)) {
|
||||
end_datetime = start_datetime.addSecs(durationMinutes*60);
|
||||
return GetCostFromDuration(cfg, start_datetime, end_datetime);
|
||||
} else {
|
||||
if (Utilities::IsYearPeriodActive(cfg, start_datetime)) {
|
||||
if (!prepaid) {
|
||||
BusinessHours businessHours = Utilities::getBusinessHours(cfg, paymentMethodId);
|
||||
if (businessHours == BusinessHours::OnlyWeekDays) {
|
||||
int const weekdayId = start_datetime.date().dayOfWeek();
|
||||
|
||||
using WTIterator = std::multimap<int, ATBWeekDaysWorktime>::const_iterator;
|
||||
std::pair<WTIterator, WTIterator> p = cfg->WeekDaysWorktime.equal_range(weekdayId);
|
||||
|
||||
for (WTIterator itr = p.first; itr != p.second; ++itr) {
|
||||
QTime const &from = Utilities::WeekDaysWorkTimeFrom(itr);
|
||||
QTime const &until = Utilities::WeekDaysWorkTimeUntil(itr);
|
||||
QTime const &startTime = start_datetime.time();
|
||||
|
||||
if (from <= startTime && startTime <= until) {
|
||||
end_datetime = start_datetime.addSecs(durationMinutes*60);
|
||||
return GetCostFromDuration(cfg, start_datetime, end_datetime);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
qCritical() << __PRETTY_FUNCTION__ << "NOT YET IMPLEMENTED";
|
||||
end_datetime = QDateTime();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QDateTime start = start_datetime;
|
||||
@@ -411,7 +258,7 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
||||
durationMinutes,
|
||||
prepaid);
|
||||
if (t) {
|
||||
qCritical().noquote() << t;
|
||||
// qCritical().noquote() << t;
|
||||
}
|
||||
|
||||
end_datetime = t.getValidUntil();
|
||||
@@ -419,18 +266,6 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
||||
return t.getPrice();
|
||||
}
|
||||
|
||||
int Calculator::getMinimalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
|
||||
return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_time, 0);
|
||||
}
|
||||
|
||||
int Calculator::getMaximalParkingTime(Configuration const *cfg, PaymentMethod methodId) {
|
||||
return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_max_time, 0);
|
||||
}
|
||||
|
||||
uint32_t Calculator::getMinimalParkingPrice(Configuration const *cfg, PaymentMethod methodId) {
|
||||
return std::max((int)cfg->PaymentOption.find(methodId)->second.pop_min_price, 0);
|
||||
}
|
||||
|
||||
bool Calculator::checkDurationMinutes(int minParkingTime,
|
||||
int maxParkingTime,
|
||||
int durationMinutes) {
|
||||
@@ -469,23 +304,12 @@ int Calculator::findNextWorkTimeRange(QDateTime const &dt,
|
||||
|
||||
if (dt.time() < worktime_from) {
|
||||
nextWorkTimeRange = w;
|
||||
continue;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return nextWorkTimeRange;
|
||||
}
|
||||
|
||||
uint32_t Calculator::computeWeekDaysPrice(Configuration const *cfg, PaymentMethod id) const {
|
||||
int pop_id = cfg->PaymentOption.find(id)->second.pop_id;
|
||||
return cfg->PaymentRate.find(pop_id)->second.pra_price;
|
||||
}
|
||||
|
||||
double Calculator::computeWeekDaysDurationUnit(Configuration const *cfg, PaymentMethod id) const {
|
||||
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);
|
||||
}
|
||||
|
||||
using namespace Utilities;
|
||||
|
||||
Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
@@ -495,12 +319,12 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
|
||||
static const int minParkingTimeMinutes = getMinimalParkingTime(cfg, paymentMethodId);
|
||||
static const int maxParkingTimeMinutes = getMaximalParkingTime(cfg, paymentMethodId);
|
||||
static const int minParkingTimeMinutes = Utilities::getMinimalParkingTime(cfg, paymentMethodId);
|
||||
static const int maxParkingTimeMinutes = Utilities::getMaximalParkingTime(cfg, paymentMethodId);
|
||||
static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
|
||||
static const int durationMinutesNetto = durationMinutes;
|
||||
static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
|
||||
static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
||||
static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
|
||||
static const double weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
||||
static const double specialDaysDurationUnit = 60.0;
|
||||
|
||||
if (!checkMinMaxMinutes) {
|
||||
@@ -568,27 +392,33 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
|
||||
QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
|
||||
|
||||
// find worktime range to start with
|
||||
// qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
// << "current" << current.toString(Qt::ISODate) << lastWorktimeTo;
|
||||
|
||||
// find worktime range to start with
|
||||
int currentRange = 0;
|
||||
if (!isSpecialDay) {
|
||||
if (start != current) { // on next day
|
||||
current.setTime(worktime[currentRange].getTimeFrom());
|
||||
} else {
|
||||
// check if inputDate is located inside a valid worktime-range...
|
||||
currentRange = findWorkTimeRange(current, worktime, ranges);
|
||||
if (currentRange == -1) { // no...
|
||||
if (!prepaid) { // parking is not allowed
|
||||
if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
|
||||
if (!prepaid && carryOverNotSet) { // parking is not allowed
|
||||
return Ticket(start, QDateTime(), durationMinutesNetto, 0,
|
||||
0, Ticket::s[INVALID_FROM_DATETIME]);
|
||||
}
|
||||
// find the next worktime-range (on the same day), and start from there
|
||||
currentRange = findNextWorkTimeRange(current, worktime, ranges);
|
||||
if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
|
||||
end = current;
|
||||
continue;
|
||||
}
|
||||
current.setTime(worktime[currentRange].getTimeFrom());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// qCritical() << "current" << current.toString(Qt::ISODate);
|
||||
|
||||
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
|
||||
if (durationMinutes > 0) {
|
||||
QTime const &worktime_from = worktime[w].getTimeFrom();
|
||||
@@ -601,8 +431,6 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
}
|
||||
|
||||
if (price == 0) {
|
||||
// inputDate = inputDate.addDays(1);
|
||||
// inputDate.setTime(worktime_from);
|
||||
end = current;
|
||||
current.setTime(QTime());
|
||||
continue;
|
||||
@@ -621,12 +449,13 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
return Ticket();
|
||||
}
|
||||
} else {
|
||||
qDebug() << "* PREPAID MODE ACTIVE *";
|
||||
//qDebug() << "* PREPAID MODE ACTIVE *";
|
||||
//qCritical() << "current" << current.toString(Qt::ISODate) << worktime_from << lastWorktimeTo;
|
||||
if (current.time() < worktime_from) {
|
||||
current.setTime(worktime_from);
|
||||
end = current;
|
||||
} else if(current.time() > lastWorktimeTo) {
|
||||
qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
|
||||
//qDebug() << " *** PREPAID *** Current time is past the time range end, searching for next available day";
|
||||
end = current;
|
||||
current.setTime(QTime());
|
||||
continue;
|
||||
@@ -647,6 +476,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
current.setTime(QTime());
|
||||
break; // stop while, and continue in outer loop
|
||||
} else {
|
||||
//qCritical() << "current" << current.toString(Qt::ISODate) << worktime_to;
|
||||
if(current.time() < worktime_to) {
|
||||
// Increment input date minutes for each monetary unit
|
||||
current = current.addSecs(60);
|
||||
@@ -654,6 +484,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
durationMinutes -= 1;
|
||||
//costFromDuration += price_per_unit;
|
||||
costFromDuration += price;
|
||||
//qCritical() << "current" << current.toString(Qt::ISODate);
|
||||
} else break;
|
||||
}
|
||||
} // while(durationMinutes > 0) {
|
||||
@@ -665,47 +496,32 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
||||
|
||||
return
|
||||
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
||||
llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
|
||||
ceil(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
|
||||
Ticket::s[VALID]);
|
||||
}
|
||||
|
||||
|
||||
Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
QDateTime const &start,
|
||||
uint32_t price,
|
||||
uint32_t cost,
|
||||
bool prepaid) {
|
||||
// Get input date
|
||||
QDateTime current = start;
|
||||
|
||||
// use tariff with structure as for instance Schnau, Koenigsee:
|
||||
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
|
||||
if (cfg->YearPeriod.size() == 0
|
||||
&& cfg->SpecialDays.size() == 0
|
||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||
{
|
||||
uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
|
||||
uint64_t const durationSeconds = durationMinutes * 60;
|
||||
current = current.addSecs(durationSeconds);
|
||||
|
||||
return
|
||||
Ticket(start, current, durationMinutes, durationMinutes,
|
||||
price, Ticket::s[VALID]);
|
||||
}
|
||||
|
||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||
static const bool carryOverNotSet = isCarryOverNotSet(cfg, paymentMethodId);
|
||||
static const uint32_t minParkingTimeMinutes = std::max(getMinimalParkingTime(cfg, paymentMethodId), 0);
|
||||
static const uint32_t maxParkingTimeMinutes = std::max(getMaximalParkingTime(cfg, paymentMethodId), 0);
|
||||
static const uint32_t minParkingTimeMinutes = std::max(Utilities::getMinimalParkingTime(cfg, paymentMethodId), 0);
|
||||
static const uint32_t maxParkingTimeMinutes = std::max(Utilities::getMaximalParkingTime(cfg, paymentMethodId), 0);
|
||||
static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
|
||||
static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
|
||||
static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
|
||||
static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
||||
static const double specialDaysDurationUnit = 60.0;
|
||||
// static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
|
||||
static const uint32_t weekDaysPrice = Utilities::computeWeekDaysPrice(cfg, paymentMethodId);
|
||||
static const uint32_t weekDaysDurationUnit = Utilities::computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
||||
static const uint32_t specialDaysDurationUnit = 60;
|
||||
|
||||
if(price < minParkingPrice) {
|
||||
uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
|
||||
if(cost < minParkingPrice) {
|
||||
uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
|
||||
return Ticket(start, current, durationMinutes, durationMinutes,
|
||||
price, Ticket::s[INVALID_PRICE]);
|
||||
cost, Ticket::s[INVALID_PRICE]);
|
||||
}
|
||||
if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
|
||||
// TODO
|
||||
@@ -717,14 +533,15 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
}
|
||||
|
||||
uint32_t durationMinutesNetto = 0;
|
||||
int moneyLeft = price;
|
||||
//double durationUnit = 0.0;
|
||||
double moneyLeft = cost;
|
||||
double durationUnit = 1;
|
||||
int specialDayId = -1;
|
||||
bool isSpecialDay = false;
|
||||
QDateTime end = start;
|
||||
int totalTimeRanges = 0;
|
||||
double price = 0;
|
||||
|
||||
for (current = start; moneyLeft > 0; current = current.addDays(1)) {
|
||||
for (current = start; moneyLeft > 0 && moneyLeft >= price; current = current.addDays(1)) {
|
||||
int const weekdayId = current.date().dayOfWeek();
|
||||
|
||||
specialDayId = -1;
|
||||
@@ -734,9 +551,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
QScopedArrayPointer<TariffTimeRange> worktime(new TariffTimeRange[timeRanges]);
|
||||
int ranges = 0;
|
||||
|
||||
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
|
||||
uint32_t p = 0;
|
||||
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &p))) {
|
||||
// Set special day price:
|
||||
// durationUnit = specialDaysDurationUnit;
|
||||
durationUnit = specialDaysDurationUnit;
|
||||
price = p / durationUnit;
|
||||
price = std::round(price * 1000.0) / 1000.0;
|
||||
worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
|
||||
SpecialDaysWorkTimeUntil(cfg, specialDayId));
|
||||
ranges = 1;
|
||||
@@ -745,11 +565,13 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
// for the price, rather compute with integers. Only at the very end of
|
||||
// the computation the price is divided by durationUnit.
|
||||
price = weekDaysPrice;
|
||||
// durationUnit = weekDaysDurationUnit;
|
||||
durationUnit = weekDaysDurationUnit;
|
||||
price /= durationUnit;
|
||||
price = std::round(price * 1000.0) / 1000.0; // round to 3 decimals
|
||||
|
||||
// If no working day found, skip it (epsecially Sundays!)
|
||||
if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
|
||||
qDebug() << "No workday found, trying to find next available day";
|
||||
// qDebug() << "No workday found, trying to find next available day";
|
||||
end = current;
|
||||
current.setTime(QTime()); // start at midnight on the next day
|
||||
continue;
|
||||
@@ -768,21 +590,22 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
|
||||
|
||||
// find worktime range to start with
|
||||
|
||||
int currentRange = 0;
|
||||
if (!isSpecialDay) {
|
||||
if (start != current) { // on next day
|
||||
current.setTime(worktime[currentRange].getTimeFrom());
|
||||
} else {
|
||||
// check if inputDate is located inside a valid worktime-range...
|
||||
currentRange = findWorkTimeRange(current, worktime, ranges);
|
||||
if (currentRange == -1) { // no...
|
||||
if (!prepaid) { // parking is not allowed
|
||||
if ((currentRange = findWorkTimeRange(current, worktime, ranges)) == -1) {
|
||||
if (!prepaid && carryOverNotSet) { // parking is not allowed
|
||||
return Ticket(start, QDateTime(), durationMinutesNetto, 0,
|
||||
0, Ticket::s[INVALID_FROM_DATETIME]);
|
||||
}
|
||||
// find the next worktime-range (on the same day), and start from there
|
||||
currentRange = findNextWorkTimeRange(current, worktime, ranges);
|
||||
if ((currentRange = findNextWorkTimeRange(current, worktime, ranges)) == -1) {
|
||||
end = current;
|
||||
continue;
|
||||
}
|
||||
current.setTime(worktime[currentRange].getTimeFrom());
|
||||
}
|
||||
}
|
||||
@@ -832,7 +655,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
}
|
||||
}
|
||||
|
||||
while(moneyLeft > 0) {
|
||||
while(moneyLeft >= price) {
|
||||
// Check for active year period
|
||||
if (!IsYearPeriodActive(cfg, current)) {
|
||||
return Ticket();
|
||||
@@ -852,14 +675,11 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
} else {
|
||||
if(current.time() < worktime_to) {
|
||||
// Increment input date minutes for each monetary unit
|
||||
if(moneyLeft > 1) {
|
||||
current = current.addSecs(60);
|
||||
}
|
||||
end = current;
|
||||
if(price > 0) {
|
||||
durationMinutesNetto +=1;
|
||||
}
|
||||
moneyLeft -= price;
|
||||
moneyLeft = std::round(moneyLeft * 1000.0) / 1000.0;
|
||||
current = current.addSecs(60);
|
||||
end = current;
|
||||
} else break;
|
||||
}
|
||||
} // while(durationMinutes > 0) {
|
||||
@@ -869,9 +689,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||
|
||||
int durationMinutesBrutto = start.secsTo(end) / 60;
|
||||
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate) << "end"
|
||||
// << end.toString(Qt::ISODate) << durationMinutesBrutto;
|
||||
|
||||
return
|
||||
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
||||
price, Ticket::s[VALID]);
|
||||
cost, Ticket::s[VALID]);
|
||||
}
|
||||
|
||||
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||
|
@@ -78,7 +78,7 @@ bool Configuration::ParseJson(Configuration* cfg, const char* json)
|
||||
ATBWeekDaysWorktime WeekDaysWorktime;
|
||||
ATBPaymentOption PaymentOption;
|
||||
ATBPeriodYear YearPeriod;
|
||||
MemberType mb_type;
|
||||
MemberType mb_type = MemberType::UnknownType;
|
||||
|
||||
// Get all JSON object members
|
||||
// This code should run only once (to load JSON variables into memory)
|
||||
@@ -169,6 +169,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();
|
||||
this->currentPaymentOptions = PaymentOption;
|
||||
break;
|
||||
case MemberType::DurationType:
|
||||
|
@@ -48,7 +48,7 @@ QDateTime Ticket::getValidFrom() const {
|
||||
|
||||
QDateTime Ticket::getValidUntil() const {
|
||||
if (std::get<CODE>(m_status) == VALID) {
|
||||
return m_validFrom;
|
||||
return m_validUntil;
|
||||
}
|
||||
return QDateTime();
|
||||
}
|
||||
|
@@ -197,7 +197,8 @@ bool Utilities::IsYearPeriodActive(Configuration* cfg, struct tm* currentDateTim
|
||||
}
|
||||
|
||||
bool Utilities::IsYearPeriodActive(Configuration const *cfg, QDateTime const &dt) {
|
||||
if (std::none_of(cfg->YearPeriod.cbegin(),
|
||||
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
|
||||
@@ -373,3 +374,56 @@ PaymentMethod Utilities::getPaymentMethodId(Configuration const *cfg) {
|
||||
|
||||
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);
|
||||
}
|
||||
|
277
main/main.cpp
277
main/main.cpp
@@ -33,10 +33,15 @@ extern "C" char* strptime(const char* s,
|
||||
#include "calculator_functions.h"
|
||||
#include <calculate_price.h>
|
||||
|
||||
#define SZEGED (0)
|
||||
#define NEUHAUSER_KORNEUBURG (0)
|
||||
#define NEUHAUSER_LINSINGER_MASCHINENBAU (1)
|
||||
|
||||
|
||||
int main() {
|
||||
#if NEUHAUSER_LINSINGER_MASCHINENBAU==1
|
||||
std::ifstream input("/tmp/tariff_linsinger_maschinenbau.json");
|
||||
|
||||
std::ifstream input("/tmp/tariff_korneuburg.json");
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
std::string json(sstr.str());
|
||||
@@ -47,121 +52,173 @@ int main() {
|
||||
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
bool nextDay = false;
|
||||
bool prePaid = false;
|
||||
|
||||
if (isParsed)
|
||||
// zone 1 (lila)
|
||||
QDateTime s(QDate(2023, 11, 30), QTime());
|
||||
QDateTime end;
|
||||
int marken[] = { 3*60, 5*60, 10*60};
|
||||
for (int duration = 0; duration < 3; ++duration) {
|
||||
for (int offset = 360; offset <= 1080; ++offset) {
|
||||
QDateTime start = s.addSecs(offset * 60);
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate);
|
||||
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 4, start, end, marken[duration], nextDay, prePaid);
|
||||
//qCritical() << "";
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
// << "end" << end.toString(Qt::ISODate)
|
||||
// << "duration" << marken[duration]
|
||||
// << "cost" << cost;
|
||||
|
||||
std::string d = calculator.GetDurationFromCost(&cfg, 4, start.toString(Qt::ISODate).toStdString().c_str(), cost);
|
||||
qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
<< "cost" << cost
|
||||
<< "until" << d.c_str() << start.secsTo(QDateTime::fromString(d.c_str(), Qt::ISODate)) / 60;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
#if NEUHAUSER_KORNEUBURG==1
|
||||
std::ifstream input("/tmp/tariff_korneuburg.json");
|
||||
int pop_max_time;
|
||||
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
std::string json(sstr.str());
|
||||
|
||||
Calculator calculator;
|
||||
Configuration cfg;
|
||||
|
||||
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
{
|
||||
QDateTime start = QDateTime::fromString("2023-11-27T17:50:00",Qt::ISODate);
|
||||
//QDateTime start = QDateTime::currentDateTime();
|
||||
QDateTime end = start.addSecs(120);
|
||||
uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
|
||||
qCritical() << "cost=" << cost;
|
||||
qCritical() << "end=" << end;
|
||||
pop_max_time = 3*60;
|
||||
bool nextDay = false;
|
||||
bool prePaid = true;
|
||||
// zone 1 (lila)
|
||||
QDateTime s(QDate(2023, 11, 30), QTime());
|
||||
QDateTime end;
|
||||
for (int duration = 30; duration <= pop_max_time; duration += 5) {
|
||||
for (int offset = 420; offset < 1140; ++offset) {
|
||||
if (offset > 720 && offset < 840) {
|
||||
continue;
|
||||
}
|
||||
QDateTime start = s.addSecs(offset * 60);
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate);
|
||||
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration, nextDay, prePaid);
|
||||
//Q_ASSERT(cost == duration*2.5);
|
||||
//qCritical() << "";
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
// << "end" << end.toString(Qt::ISODate)
|
||||
// << "duration" << duration
|
||||
// << "cost" << cost;
|
||||
|
||||
std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
|
||||
//Q_ASSERT(cost == duration*2.5);
|
||||
qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
<< "cost" << cost
|
||||
<< "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
||||
#elif SZEGED==1
|
||||
std::ifstream input;
|
||||
int pop_max_time;
|
||||
|
||||
for (int t=6; t < 7; t+=20) {
|
||||
switch (t) {
|
||||
case 1: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff01.json");
|
||||
pop_max_time = 6*60;
|
||||
} break;
|
||||
case 2: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff02.json");
|
||||
pop_max_time = 5*60;
|
||||
} break;
|
||||
case 3: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff03.json");
|
||||
pop_max_time = 6*60;
|
||||
} break;
|
||||
case 4: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff04.json");
|
||||
pop_max_time = 4*60;
|
||||
} break;
|
||||
case 5: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff05.json");
|
||||
pop_max_time = 6*60;
|
||||
} break;
|
||||
case 6: {
|
||||
input.open("/opt/ptu5/opt/customer_281/etc/psa_tariff/tariff06.json");
|
||||
pop_max_time = 4*60;
|
||||
} break;
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
std::stringstream sstr;
|
||||
while(input >> sstr.rdbuf());
|
||||
std::string json(sstr.str());
|
||||
|
||||
Calculator calculator;
|
||||
Configuration cfg;
|
||||
|
||||
bool isParsed = cfg.ParseJson(&cfg, json.c_str());
|
||||
cout << endl;
|
||||
|
||||
if (isParsed) {
|
||||
{
|
||||
// zone 1 (lila)
|
||||
QDateTime s(QDate(2023, 11, 30), QTime());
|
||||
QDateTime end;
|
||||
for (int duration = 15; duration <= pop_max_time; duration += 5) {
|
||||
for (int offset = 480; offset < 1080; ++offset) {
|
||||
QDateTime start = s.addSecs(offset * 60);
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate);
|
||||
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, duration);
|
||||
//Q_ASSERT(cost == duration*2.5);
|
||||
//qCritical() << "";
|
||||
//qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
// << "end" << end.toString(Qt::ISODate)
|
||||
// << "duration" << duration
|
||||
// << "cost" << cost;
|
||||
|
||||
std::string duration = calculator.GetDurationFromCost(&cfg, 3, start.toString(Qt::ISODate).toStdString().c_str(), cost);
|
||||
//Q_ASSERT(cost == duration*2.5);
|
||||
qCritical() << "start" << start.toString(Qt::ISODate)
|
||||
<< "cost" << cost
|
||||
<< "until" << duration.c_str() << start.secsTo(QDateTime::fromString(duration.c_str(), Qt::ISODate)) / 60;
|
||||
}
|
||||
}
|
||||
}
|
||||
{
|
||||
QDateTime start(QDate(2023, 12, 1), QTime(18, 0));
|
||||
QDateTime end;
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
|
||||
// Q_ASSERT(cost == 150);
|
||||
qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
|
||||
}
|
||||
{
|
||||
QDateTime start(QDate(2023, 10, 31), QTime(18, 0));
|
||||
QDateTime end;
|
||||
double cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
|
||||
//Q_ASSERT(cost == 150);
|
||||
qCritical() << "end" << end.toString(Qt::ISODate) << "cost" << cost;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
parking_tariff_t *tariff = 0;
|
||||
if (init_tariff(&tariff, "/etc/psa_tariff/")) {
|
||||
struct price_t price;
|
||||
memset(&price, 0x00, sizeof(price));
|
||||
|
||||
QDateTime start = QDateTime::fromString("2023-05-11T07:50:00",Qt::ISODate); //QDateTime::currentDateTime();
|
||||
time_t start_parking_time = start.toSecsSinceEpoch() / 60;
|
||||
time_t end_parking_time = start_parking_time + 615;
|
||||
|
||||
if (compute_price_for_parking_ticket(tariff,
|
||||
start_parking_time,
|
||||
end_parking_time,
|
||||
&price))
|
||||
{
|
||||
qDebug() << "GetCostFromDuration() => price=" << price.netto;
|
||||
}
|
||||
|
||||
QString duration;
|
||||
if(compute_duration_for_parking_ticket(tariff,start_parking_time,3090,duration))
|
||||
{
|
||||
qDebug() << "GetDurationFromCost() => duration=" << duration;
|
||||
}
|
||||
|
||||
// Daily ticket
|
||||
//compute_duration_for_daily_ticket(tariff,start.toString(Qt::ISODate),3);
|
||||
|
||||
//Configuration* cfg, QString start_datetime, uint8_t payment_option, bool carry_over
|
||||
// // tests
|
||||
// struct tm now;
|
||||
// memset(&now, 0, sizeof(now));
|
||||
|
||||
// // 3.Jan 2023 -> Tuesday
|
||||
// strptime("2023-01-03T14:00:00", "%Y-%m-%dT%H:%M:%S", &now);
|
||||
// for (int i = 0; i < 600; ++i) {
|
||||
// start_parking_time = mktime(&now);
|
||||
// end_parking_time = start_parking_time + 240; // duration == 240
|
||||
|
||||
// if (compute_price_for_parking_ticket(tariff,
|
||||
// start_parking_time,
|
||||
// end_parking_time,
|
||||
// &price)) {
|
||||
// int const zone = get_zone_nr(1);
|
||||
// switch (zone) {
|
||||
// case 1:
|
||||
// assert(price.netto == 879); // expected value: 880
|
||||
// break;
|
||||
// case 2:
|
||||
// /* fall through */
|
||||
// case 3:
|
||||
// assert(price.netto == 1920);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// time_t t = start_parking_time + 60;
|
||||
// now = *localtime(&t);
|
||||
// }
|
||||
// //
|
||||
// // test May 1st 2023
|
||||
// //
|
||||
// memset(&now, 0, sizeof(now));
|
||||
// strptime("2023-04-30T06:00:00", "%Y-%m-%dT%H:%M:%S", &now);
|
||||
// now.tm_hour -= 1; // for ctime
|
||||
// // for (int i=0; i<6*24; ++i) {
|
||||
// for (int i=0; i<1; ++i) {
|
||||
// int const duration = 120;
|
||||
// time_t t = mktime(&now);
|
||||
// start_parking_time = t / 60;
|
||||
// end_parking_time = start_parking_time + duration;
|
||||
|
||||
// if (compute_price_for_parking_ticket(tariff,
|
||||
// start_parking_time,
|
||||
// end_parking_time,
|
||||
// &price)) {
|
||||
// int const zone = get_zone_nr();
|
||||
// switch (zone) {
|
||||
// case 1:
|
||||
// qDebug() << i << zone << ctime(&t) << price.netto << " FT";
|
||||
// assert(price.netto == 440);
|
||||
// break;
|
||||
// case 2:
|
||||
// /* fall through */
|
||||
// case 3:
|
||||
// qDebug() << i << zone << ctime(&t) << price.netto << " FT";
|
||||
// assert(price.netto == 960);
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
|
||||
// t = (start_parking_time + 60)*60;
|
||||
// now = *localtime(&t);
|
||||
// }
|
||||
|
||||
free_tariff(tariff);
|
||||
}
|
||||
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
#if 0
|
||||
|
||||
|
805
tariffs/tariff_new_01.json
Normal file
805
tariffs/tariff_new_01.json
Normal file
@@ -0,0 +1,805 @@
|
||||
{
|
||||
"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
|
||||
}
|
||||
]
|
||||
}
|
Reference in New Issue
Block a user