Compare commits
4 Commits
4c268e6693
...
73b1c1459e
Author | SHA1 | Date | |
---|---|---|---|
73b1c1459e | |||
a599e47a47 | |||
e97ad17b09 | |||
19428ce46c |
@ -122,6 +122,8 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
|||||||
bool nextDay,
|
bool nextDay,
|
||||||
bool prepaid)
|
bool prepaid)
|
||||||
{
|
{
|
||||||
|
Q_UNUSED(payment_option);
|
||||||
|
Q_UNUSED(nextDay);
|
||||||
|
|
||||||
// Get input date
|
// Get input date
|
||||||
QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
|
QDateTime inputDate = QDateTime::fromString(start_datetime,Qt::ISODate);
|
||||||
@ -133,224 +135,15 @@ std::string Calculator::GetDurationFromCost(Configuration* cfg,
|
|||||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||||
{
|
{
|
||||||
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
|
inputDate = inputDate.addSecs(GetDurationForPrice(cfg, price) * 60);
|
||||||
|
|
||||||
return inputDate.toString(Qt::ISODate).toStdString();
|
return inputDate.toString(Qt::ISODate).toStdString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Ticket t = private_GetDurationFromCost(cfg, inputDate, price, prepaid);
|
||||||
|
|
||||||
// Get day of week
|
qCritical().noquote() << t;
|
||||||
int weekdayId = 0;
|
|
||||||
weekdayId = Utilities::ZellersAlgorithm(inputDate.date().day(),inputDate.date().month(),inputDate.date().year());
|
|
||||||
|
|
||||||
//Get min and max time defined in JSON
|
// TODO: im fehlerfall
|
||||||
double minMin = 0;
|
return t.getValidUntil().toString(Qt::ISODate).toStdString();
|
||||||
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";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!isYearPeriodActive)
|
|
||||||
{
|
|
||||||
LOG_DEBUG("Year period is not valid");
|
|
||||||
return "PARKING NOT ALLOWED";
|
|
||||||
}
|
|
||||||
|
|
||||||
if(total_duration_min > maxMin)
|
|
||||||
{
|
|
||||||
total_duration_min = maxMin;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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;
|
|
||||||
|
|
||||||
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();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
///////////////////////////////////////
|
///////////////////////////////////////
|
||||||
@ -397,6 +190,9 @@ double Calculator::GetCostFromDuration(Configuration* cfg,
|
|||||||
int durationMinutes,
|
int durationMinutes,
|
||||||
bool nextDay,
|
bool nextDay,
|
||||||
bool prepaid) {
|
bool prepaid) {
|
||||||
|
Q_UNUSED(payment_option);
|
||||||
|
Q_UNUSED(nextDay);
|
||||||
|
|
||||||
if (cfg->YearPeriod.size() == 0
|
if (cfg->YearPeriod.size() == 0
|
||||||
&& cfg->SpecialDays.size() == 0
|
&& cfg->SpecialDays.size() == 0
|
||||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||||
@ -528,6 +324,8 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
for (current = start; durationMinutes > 0; current = current.addDays(1)) {
|
for (current = start; durationMinutes > 0; current = current.addDays(1)) {
|
||||||
int const weekdayId = current.date().dayOfWeek();
|
int const weekdayId = current.date().dayOfWeek();
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << weekdayId;
|
||||||
|
|
||||||
specialDayId = -1;
|
specialDayId = -1;
|
||||||
|
|
||||||
// find worktime ranges for the current day
|
// find worktime ranges for the current day
|
||||||
@ -589,6 +387,8 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << currentRange;
|
||||||
|
|
||||||
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
|
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
|
||||||
if (durationMinutes > 0) {
|
if (durationMinutes > 0) {
|
||||||
QTime const &worktime_from = worktime[w].getTimeFrom();
|
QTime const &worktime_from = worktime[w].getTimeFrom();
|
||||||
@ -600,6 +400,10 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
current.setTime(worktime_from);
|
current.setTime(worktime_from);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "worktime_from" << worktime_from;
|
||||||
|
qCritical() << "worktime_to" << worktime_to;
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate);
|
||||||
|
|
||||||
if (price == 0) {
|
if (price == 0) {
|
||||||
// inputDate = inputDate.addDays(1);
|
// inputDate = inputDate.addDays(1);
|
||||||
// inputDate.setTime(worktime_from);
|
// inputDate.setTime(worktime_from);
|
||||||
@ -654,6 +458,7 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
durationMinutes -= 1;
|
durationMinutes -= 1;
|
||||||
//costFromDuration += price_per_unit;
|
//costFromDuration += price_per_unit;
|
||||||
costFromDuration += price;
|
costFromDuration += price;
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << durationMinutes << costFromDuration;
|
||||||
} else break;
|
} else break;
|
||||||
}
|
}
|
||||||
} // while(durationMinutes > 0) {
|
} // while(durationMinutes > 0) {
|
||||||
@ -663,6 +468,9 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
|
|
||||||
int durationMinutesBrutto = start.secsTo(end) / 60;
|
int durationMinutesBrutto = start.secsTo(end) / 60;
|
||||||
|
|
||||||
|
qCritical() << "start" << start.toString(Qt::ISODate) << "end" << end
|
||||||
|
<< llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit));
|
||||||
|
|
||||||
return
|
return
|
||||||
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
||||||
llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
|
llround(Utilities::CalculatePricePerUnit(costFromDuration, durationUnit)),
|
||||||
@ -672,24 +480,26 @@ Ticket Calculator::private_GetCostFromDuration(Configuration const* cfg,
|
|||||||
|
|
||||||
Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
||||||
QDateTime const &start,
|
QDateTime const &start,
|
||||||
uint32_t price,
|
uint32_t cost,
|
||||||
bool prepaid) {
|
bool prepaid) {
|
||||||
// Get input date
|
// Get input date
|
||||||
QDateTime current = start;
|
QDateTime current = start;
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate);
|
||||||
|
|
||||||
// use tariff with structure as for instance Schnau, Koenigsee:
|
// use tariff with structure as for instance Schnau, Koenigsee:
|
||||||
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
|
// without given YearPeriod, SpecialDays and SpecialDaysWorktime
|
||||||
if (cfg->YearPeriod.size() == 0
|
if (cfg->YearPeriod.size() == 0
|
||||||
&& cfg->SpecialDays.size() == 0
|
&& cfg->SpecialDays.size() == 0
|
||||||
&& cfg->SpecialDaysWorktime.size() == 0)
|
&& cfg->SpecialDaysWorktime.size() == 0)
|
||||||
{
|
{
|
||||||
uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
|
uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
|
||||||
uint64_t const durationSeconds = durationMinutes * 60;
|
uint64_t const durationSeconds = durationMinutes * 60;
|
||||||
current = current.addSecs(durationSeconds);
|
current = current.addSecs(durationSeconds);
|
||||||
|
|
||||||
return
|
return
|
||||||
Ticket(start, current, durationMinutes, durationMinutes,
|
Ticket(start, current, durationMinutes, durationMinutes,
|
||||||
price, Ticket::s[VALID]);
|
cost, Ticket::s[VALID]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
static const PaymentMethod paymentMethodId = Utilities::getPaymentMethodId(cfg);
|
||||||
@ -697,15 +507,15 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
static const uint32_t minParkingTimeMinutes = std::max(getMinimalParkingTime(cfg, paymentMethodId), 0);
|
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 maxParkingTimeMinutes = std::max(getMaximalParkingTime(cfg, paymentMethodId), 0);
|
||||||
static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
|
static const uint32_t minParkingPrice = getMinimalParkingPrice(cfg, paymentMethodId);
|
||||||
static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
|
// static const bool checkMinMaxMinutes = (minParkingTimeMinutes < maxParkingTimeMinutes);
|
||||||
static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
|
static const uint32_t weekDaysPrice = computeWeekDaysPrice(cfg, paymentMethodId);
|
||||||
static const double weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
static const uint32_t weekDaysDurationUnit = computeWeekDaysDurationUnit(cfg, paymentMethodId);
|
||||||
static const double specialDaysDurationUnit = 60.0;
|
static const uint32_t specialDaysDurationUnit = 60;
|
||||||
|
|
||||||
if(price < minParkingPrice) {
|
if(cost < minParkingPrice) {
|
||||||
uint64_t const durationMinutes = GetDurationForPrice(cfg, price);
|
uint64_t const durationMinutes = GetDurationForPrice(cfg, cost);
|
||||||
return Ticket(start, current, durationMinutes, durationMinutes,
|
return Ticket(start, current, durationMinutes, durationMinutes,
|
||||||
price, Ticket::s[INVALID_PRICE]);
|
cost, Ticket::s[INVALID_PRICE]);
|
||||||
}
|
}
|
||||||
if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
|
if (minParkingTimeMinutes >= maxParkingTimeMinutes) {
|
||||||
// TODO
|
// TODO
|
||||||
@ -716,17 +526,22 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
return Ticket();
|
return Ticket();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate);
|
||||||
|
|
||||||
uint32_t durationMinutesNetto = 0;
|
uint32_t durationMinutesNetto = 0;
|
||||||
int moneyLeft = price;
|
int moneyLeft = cost;
|
||||||
//double durationUnit = 0.0;
|
uint32_t durationUnit = 1;
|
||||||
int specialDayId = -1;
|
int specialDayId = -1;
|
||||||
bool isSpecialDay = false;
|
bool isSpecialDay = false;
|
||||||
QDateTime end = start;
|
QDateTime end = start;
|
||||||
int totalTimeRanges = 0;
|
int totalTimeRanges = 0;
|
||||||
|
uint32_t price = 0;
|
||||||
|
|
||||||
for (current = start; moneyLeft > 0; current = current.addDays(1)) {
|
for (current = start; moneyLeft > 0; current = current.addDays(1), moneyLeft /= durationUnit) {
|
||||||
int const weekdayId = current.date().dayOfWeek();
|
int const weekdayId = current.date().dayOfWeek();
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << weekdayId;
|
||||||
|
|
||||||
specialDayId = -1;
|
specialDayId = -1;
|
||||||
|
|
||||||
// find worktime ranges for the current day
|
// find worktime ranges for the current day
|
||||||
@ -736,7 +551,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
|
|
||||||
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
|
if((isSpecialDay = Utilities::CheckSpecialDay(cfg, current, &specialDayId, &price))) {
|
||||||
// Set special day price:
|
// Set special day price:
|
||||||
// durationUnit = specialDaysDurationUnit;
|
durationUnit = specialDaysDurationUnit;
|
||||||
worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
|
worktime[ranges].setTimeRange(SpecialDaysWorkTimeFrom(cfg, specialDayId),
|
||||||
SpecialDaysWorkTimeUntil(cfg, specialDayId));
|
SpecialDaysWorkTimeUntil(cfg, specialDayId));
|
||||||
ranges = 1;
|
ranges = 1;
|
||||||
@ -745,7 +560,7 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
// for the price, rather compute with integers. Only at the very end of
|
// for the price, rather compute with integers. Only at the very end of
|
||||||
// the computation the price is divided by durationUnit.
|
// the computation the price is divided by durationUnit.
|
||||||
price = weekDaysPrice;
|
price = weekDaysPrice;
|
||||||
// durationUnit = weekDaysDurationUnit;
|
durationUnit = weekDaysDurationUnit;
|
||||||
|
|
||||||
// If no working day found, skip it (epsecially Sundays!)
|
// If no working day found, skip it (epsecially Sundays!)
|
||||||
if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
|
if (cfg->WeekDaysWorktime.count(weekdayId) <= 0) {
|
||||||
@ -765,6 +580,8 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
moneyLeft *= durationUnit;
|
||||||
|
|
||||||
QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
|
QTime const &lastWorktimeTo = worktime[ranges-1].getTimeUntil();
|
||||||
|
|
||||||
// find worktime range to start with
|
// find worktime range to start with
|
||||||
@ -788,6 +605,8 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << currentRange;
|
||||||
|
|
||||||
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
|
for (int w = currentRange; w < ranges; ++w, ++totalTimeRanges) {
|
||||||
if (moneyLeft > 0) {
|
if (moneyLeft > 0) {
|
||||||
QTime const &worktime_from = worktime[w].getTimeFrom();
|
QTime const &worktime_from = worktime[w].getTimeFrom();
|
||||||
@ -799,6 +618,10 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
current.setTime(worktime_from);
|
current.setTime(worktime_from);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qCritical() << "worktime_from" << worktime_from;
|
||||||
|
qCritical() << "worktime_to" << worktime_to;
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate);
|
||||||
|
|
||||||
if (price == 0) {
|
if (price == 0) {
|
||||||
// inputDate = inputDate.addDays(1);
|
// inputDate = inputDate.addDays(1);
|
||||||
// inputDate.setTime(worktime_from);
|
// inputDate.setTime(worktime_from);
|
||||||
@ -852,14 +675,13 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
} else {
|
} else {
|
||||||
if(current.time() < worktime_to) {
|
if(current.time() < worktime_to) {
|
||||||
// Increment input date minutes for each monetary unit
|
// Increment input date minutes for each monetary unit
|
||||||
if(moneyLeft > 1) {
|
current = current.addSecs(60);
|
||||||
current = current.addSecs(60);
|
|
||||||
}
|
|
||||||
end = current;
|
end = current;
|
||||||
if(price > 0) {
|
if(price > 0) {
|
||||||
durationMinutesNetto +=1;
|
durationMinutesNetto +=1;
|
||||||
}
|
}
|
||||||
moneyLeft -= price;
|
moneyLeft -= price;
|
||||||
|
qCritical() << "current" << current.toString(Qt::ISODate) << "moneyLeft" << moneyLeft;
|
||||||
} else break;
|
} else break;
|
||||||
}
|
}
|
||||||
} // while(durationMinutes > 0) {
|
} // while(durationMinutes > 0) {
|
||||||
@ -869,9 +691,12 @@ Ticket Calculator::private_GetDurationFromCost(Configuration *cfg,
|
|||||||
|
|
||||||
int durationMinutesBrutto = start.secsTo(end) / 60;
|
int durationMinutesBrutto = start.secsTo(end) / 60;
|
||||||
|
|
||||||
|
qCritical() << "start" << start.toString(Qt::ISODate) << "end"
|
||||||
|
<< end.toString(Qt::ISODate) << durationMinutesBrutto;
|
||||||
|
|
||||||
return
|
return
|
||||||
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
Ticket(start, end, durationMinutesNetto, durationMinutesBrutto,
|
||||||
price, Ticket::s[VALID]);
|
cost, Ticket::s[VALID]);
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
QList<int> Calculator::GetTimeSteps(Configuration *cfg) const {
|
||||||
|
@ -48,7 +48,7 @@ QDateTime Ticket::getValidFrom() const {
|
|||||||
|
|
||||||
QDateTime Ticket::getValidUntil() const {
|
QDateTime Ticket::getValidUntil() const {
|
||||||
if (std::get<CODE>(m_status) == VALID) {
|
if (std::get<CODE>(m_status) == VALID) {
|
||||||
return m_validFrom;
|
return m_validUntil;
|
||||||
}
|
}
|
||||||
return QDateTime();
|
return QDateTime();
|
||||||
}
|
}
|
||||||
|
@ -50,12 +50,20 @@ int main() {
|
|||||||
|
|
||||||
if (isParsed)
|
if (isParsed)
|
||||||
{
|
{
|
||||||
QDateTime start = QDateTime::fromString("2023-11-27T17:50:00",Qt::ISODate);
|
QDateTime start = QDateTime::fromString("2023-12-08T17:50:00",Qt::ISODate);
|
||||||
//QDateTime start = QDateTime::currentDateTime();
|
//QDateTime start = QDateTime::currentDateTime();
|
||||||
QDateTime end = start.addSecs(120);
|
QDateTime end = start.addSecs(120);
|
||||||
uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 60);
|
uint32_t cost = calculator.GetCostFromDuration(&cfg, 3, start, end, 30);
|
||||||
|
|
||||||
qCritical() << "cost=" << cost;
|
qCritical() << "cost=" << cost;
|
||||||
qCritical() << "end=" << end;
|
qCritical() << "end=" << end;
|
||||||
|
|
||||||
|
std::string duration = calculator.GetDurationFromCost(&cfg, 3,
|
||||||
|
start.toString(Qt::ISODate).toStdString().c_str(),
|
||||||
|
60);
|
||||||
|
|
||||||
|
qCritical() << "duration=" << duration.c_str();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 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
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user